mirror of
https://github.com/Faraphel/Atlas-Install.git
synced 2025-07-03 19:28:25 +02:00
splitted the code into 2 function, and added a last clean process to wait for last track conversion.
This commit is contained in:
parent
31de91f082
commit
c155131b9b
1 changed files with 79 additions and 64 deletions
|
|
@ -34,73 +34,88 @@ def patch_track(self, tracks, total_track="?"):
|
||||||
process_list = {}
|
process_list = {}
|
||||||
error_count, error_max = 0, 3
|
error_count, error_max = 0, 3
|
||||||
|
|
||||||
|
def add_process(track_file):
|
||||||
|
nonlocal error_count, error_max, process_list
|
||||||
|
|
||||||
|
process_list[track_file] = None # Used for
|
||||||
|
self.Progress(statut=self.translate("Conversion des courses") + f"\n({i + 1}/{total_track})\n" +
|
||||||
|
"\n".join(process_list.keys()), add=1)
|
||||||
|
|
||||||
|
for _track in [get_track_szs(track_file), get_track_wu8(track_file)]:
|
||||||
|
if os.path.exists(_track):
|
||||||
|
if os.path.getsize(_track) < 1000: # File under this size are corrupted
|
||||||
|
os.remove(_track)
|
||||||
|
|
||||||
|
download_returncode = self.get_github_file(get_track_wu8(track_file))
|
||||||
|
if download_returncode == -1: # can't download
|
||||||
|
error_count += 1
|
||||||
|
if error_count > error_max: # Too much track wasn't correctly converted
|
||||||
|
messagebox.showerror(
|
||||||
|
self.translate("Erreur"),
|
||||||
|
self.translate("Trop de course ont eu une erreur du téléchargement."))
|
||||||
|
return -1
|
||||||
|
else:
|
||||||
|
messagebox.showwarning(self.translate("Attention"),
|
||||||
|
self.translate("Impossible de télécharger cette course ! (") +
|
||||||
|
str(error_count) + "/" + str(error_max) + ")")
|
||||||
|
|
||||||
|
if not (os.path.exists(
|
||||||
|
get_track_szs(track_file))) or download_returncode == 3: # returncode 3 is track has been updated
|
||||||
|
if os.path.exists(get_track_wu8(track_file)):
|
||||||
|
process_list[track_file] = subprocess.Popen([
|
||||||
|
"./tools/szs/wszst", "NORMALIZE", get_track_wu8(track_file), "--DEST",
|
||||||
|
"./file/Track/%N.szs", "--szs", "--overwrite", "--autoadd-path",
|
||||||
|
"./file/auto-add/"], creationflags=CREATE_NO_WINDOW, stderr=subprocess.PIPE)
|
||||||
|
else:
|
||||||
|
messagebox.showerror(self.translate("Erreur"),
|
||||||
|
self.translate("Impossible de convertir la course.\n"
|
||||||
|
"Réactiver le téléchargement des courses et réessayer."))
|
||||||
|
return -1
|
||||||
|
elif self.boolvar_del_track_after_conv.get(): os.remove(get_track_wu8(track_file))
|
||||||
|
return 0
|
||||||
|
|
||||||
|
def clean_process():
|
||||||
|
nonlocal error_count, error_max, process_list
|
||||||
|
|
||||||
|
for track_file, process in process_list.items():
|
||||||
|
if process is not None:
|
||||||
|
if process.poll() is None:
|
||||||
|
pass # if the process is still running
|
||||||
|
else: # process ended
|
||||||
|
process_list.pop(track_file)
|
||||||
|
stderr = process.stderr.read()
|
||||||
|
if b"wszst: ERROR" in stderr: # Error occured
|
||||||
|
os.remove(get_track_szs(track_file))
|
||||||
|
error_count += 1
|
||||||
|
if error_count > error_max: # Too much track wasn't correctly converted
|
||||||
|
messagebox.showerror(
|
||||||
|
self.translate("Erreur"),
|
||||||
|
self.translate("Trop de course ont eu une erreur de conversion."))
|
||||||
|
return -1
|
||||||
|
else: # if the error max hasn't been reach
|
||||||
|
messagebox.showwarning(
|
||||||
|
self.translate("Attention"),
|
||||||
|
self.translate("La course ") +
|
||||||
|
get_track_wu8(track_file) +
|
||||||
|
self.translate(" n'a pas été correctement converti. (") +
|
||||||
|
str(error_count) + "/" + str(error_max) + ")")
|
||||||
|
return 0
|
||||||
|
|
||||||
|
else:
|
||||||
|
if self.boolvar_del_track_after_conv.get(): os.remove(get_track_wu8(track_file))
|
||||||
|
return 0
|
||||||
|
else:
|
||||||
|
process_list.pop(track_file)
|
||||||
|
|
||||||
|
if any(process_list.values()): return 0 # si il y a encore des processus
|
||||||
|
else: return 1 # si il n'y a plus de processus
|
||||||
|
|
||||||
for i, track in enumerate(tracks):
|
for i, track in enumerate(tracks):
|
||||||
track_file = get_trackname(track=track)
|
track_file = get_trackname(track=track)
|
||||||
while True:
|
while True:
|
||||||
if len(process_list) < max_process:
|
if len(process_list) < max_process:
|
||||||
process_list[track_file] = None # Used for
|
if add_process(track_file) == 0: break
|
||||||
self.Progress(statut=self.translate("Conversion des courses") + f"\n({i + 1}/{total_track})\n" +
|
else: clean_process()
|
||||||
"\n".join(process_list.keys()), add=1)
|
while clean_process() != 1: pass # End the process if all process ended
|
||||||
|
|
||||||
for _track in [get_track_szs(track_file), get_track_wu8(track_file)]:
|
|
||||||
if os.path.exists(_track):
|
|
||||||
if os.path.getsize(_track) < 1000: # File under this size are corrupted
|
|
||||||
os.remove(_track)
|
|
||||||
|
|
||||||
download_returncode = self.get_github_file(get_track_wu8(track_file))
|
|
||||||
if download_returncode == -1: # can't download
|
|
||||||
error_count += 1
|
|
||||||
if error_count > error_max: # Too much track wasn't correctly converted
|
|
||||||
messagebox.showerror(
|
|
||||||
self.translate("Erreur"),
|
|
||||||
self.translate("Trop de course ont eu une erreur du téléchargement."))
|
|
||||||
return -1
|
|
||||||
else:
|
|
||||||
messagebox.showwarning(self.translate("Attention"),
|
|
||||||
self.translate("Impossible de télécharger cette course ! (") +
|
|
||||||
str(error_count) + "/" + str(error_max) + ")")
|
|
||||||
|
|
||||||
if not (os.path.exists(get_track_szs(track_file))) or download_returncode == 3: # returncode 3 is track has been updated
|
|
||||||
if os.path.exists(get_track_wu8(track_file)):
|
|
||||||
process_list[track_file] = subprocess.Popen([
|
|
||||||
"./tools/szs/wszst", "NORMALIZE", get_track_wu8(track_file), "--DEST",
|
|
||||||
"./file/Track/%N.szs", "--szs", "--overwrite", "--autoadd-path",
|
|
||||||
"./file/auto-add/"], creationflags=CREATE_NO_WINDOW, stderr=subprocess.PIPE)
|
|
||||||
else:
|
|
||||||
messagebox.showerror(self.translate("Erreur"),
|
|
||||||
self.translate("Impossible de convertir la course.\n"
|
|
||||||
"Réactiver le téléchargement des courses et réessayer."))
|
|
||||||
return -1
|
|
||||||
elif self.boolvar_del_track_after_conv.get(): os.remove(get_track_wu8(track_file))
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
for _track_file, process in process_list.items():
|
|
||||||
if process is not None:
|
|
||||||
if process.poll() is None: pass # if the process is still running
|
|
||||||
else: # process ended
|
|
||||||
process_list.pop(_track_file)
|
|
||||||
stderr = process.stderr.read()
|
|
||||||
if b"wszst: ERROR" in stderr: # Error occured
|
|
||||||
os.remove(get_track_szs(_track_file))
|
|
||||||
error_count += 1
|
|
||||||
if error_count > error_max: # Too much track wasn't correctly converted
|
|
||||||
messagebox.showerror(
|
|
||||||
self.translate("Erreur"),
|
|
||||||
self.translate("Trop de course ont eu une erreur de conversion."))
|
|
||||||
return
|
|
||||||
else: # if the error max hasn't been reach
|
|
||||||
messagebox.showwarning(
|
|
||||||
self.translate("Attention"),
|
|
||||||
self.translate("La course ") +
|
|
||||||
get_track_wu8(_track_file) +
|
|
||||||
self.translate(" n'a pas été correctement converti. (") +
|
|
||||||
str(error_count) + "/" + str(error_max) + ")")
|
|
||||||
break
|
|
||||||
|
|
||||||
else:
|
|
||||||
if self.boolvar_del_track_after_conv.get(): os.remove(get_track_wu8(_track_file))
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
process_list.pop(_track_file)
|
|
||||||
break
|
|
||||||
return 0
|
return 0
|
||||||
Loading…
Reference in a new issue