mirrors/legendary
1
0
Fork 0
mirror of https://github.com/derrod/legendary.git synced 2025-08-27 12:21:00 +00:00
Code Issues Projects Releases Wiki Activity

2021-02-05_11-37-10

Browse source
This commit is contained in:
koraynilay 2021-02-05 11:37:10 +01:00
parent 7558a8f60c
commit 71f24ba4e1
2 changed files with 59 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
legendary/downloader/log_dlm.py
View file

@ -9,31 +9,31 @@ class log_dlm:
return "cli" return "cli"
else: else:
print(main_window) print(main_window)
self_log_dlm.update_gui_setup(self_log_dlm=self_log_dlm, self=self) self_log_dlm.update_gui_setup(self_log_dlm=self_log_dlm, self=self, bar=main_window.progress_bar)
return main_window.progress_bar #return main_window.progress_bar
def update(self_log_dlm, self, perc, processed_chunks, num_chunk_tasks, rt_hours, rt_minutes, rt_seconds, hours, minutes, seconds, total_dl, total_write, total_used, dl_speed, dl_unc_speed, w_speed, r_speed, obj_out): def update(self_log_dlm, self):
#perc, processed_chunks, num_chunk_tasks, rt_hours, rt_minutes, rt_seconds, hours, minutes, seconds, total_dl, total_write, total_used, dl_speed, dl_unc_speed, w_speed, r_speed, obj_out):
print("update_choose") print("update_choose")
if obj_out == "cli": if self.obj_out == "cli":
print("update_cli") print("update_cli")
self_log_dlm.update_cli( self_log_dlm.update_cli(self)
self, #perc,
perc, #processed_chunks,
processed_chunks, #num_chunk_tasks,
num_chunk_tasks, #rt_hours,
rt_hours, #rt_minutes,
rt_minutes, #rt_seconds,
rt_seconds, #hours,
hours, #minutes,
minutes, #seconds,
seconds, #total_dl,
total_dl, #total_write,
total_write, #total_used,
total_used, #dl_speed,
dl_speed, #dl_unc_speed,
dl_unc_speed, #w_speed,
w_speed, #r_speed)
r_speed)
else: else:
print("update_gui") print("update_gui")
#self_log_dlm.update_gui( #self_log_dlm.update_gui(
@ -56,53 +56,49 @@ class log_dlm:
# r_speed, # r_speed,
# obj_out) # obj_out)
def update_gui_setup( self_log_dlm = None, self = None, perc = 0, def update_gui_setup(self_log_dlm = None, self = None, bar = None):
processed_chunks = 0, num_chunk_tasks = 0,
rt_hours = 0, rt_minutes = 0, rt_seconds = 0,
hours = 0, minutes = 0, seconds = 0,
total_dl = 0, total_write = 0, total_used = 0,
dl_speed = 0, dl_unc_speed = 0, w_speed = 0, r_speed = 0,
bar = None):
GLib.timeout_add(1000, self_log_dlm.update_gui, GLib.timeout_add(1000, self_log_dlm.update_gui,
self, perc, self.self, self.perc,
processed_chunks, num_chunk_tasks, self.processed_chunks, self.num_chunk_tasks,
rt_hours, rt_minutes, rt_seconds, self.rt_hours, self.rt_minutes, self.rt_seconds,
hours, minutes, seconds, self.hours, self.minutes, self.seconds,
total_dl, total_write, total_used, self.total_dl, self.total_write, self.total_used,
dl_speed, dl_unc_speed, w_speed, r_speed, self.dl_speed, self.dl_unc_speed, self.w_speed, self.r_speed,
bar) bar)
def update_gui(self_log_dlm, self, perc, def update_gui(self_log_dlm, self,
processed_chunks, num_chunk_tasks, # perc,
rt_hours, rt_minutes, rt_seconds, # processed_chunks, num_chunk_tasks,
hours, minutes, seconds, # rt_hours, rt_minutes, rt_seconds,
total_dl, total_write, total_used, # hours, minutes, seconds,
dl_speed, dl_unc_speed, w_speed, r_speed, # total_dl, total_write, total_used,
# dl_speed, dl_unc_speed, w_speed, r_speed,
bar): bar):
bar.set_fraction(perc) bar.set_fraction(perc)
bar.set_text(f"{dl_speed / 1024 / 1024:.02f} MiB/s - {(perc*100):.02f}% - ETA: {hours:02d}:{minutes:02d}:{seconds:02d}") bar.set_text(f"{self.dl_speed / 1024 / 1024:.02f} MiB/s - {(self.perc*100):.02f}% - ETA: {self.hours:02d}:{self.minutes:02d}:{self.seconds:02d}")
bar.set_tooltip_text("tooltip") # show all infos that are also in update_cli() bar.set_tooltip_text("tooltip") # show all infos that are also in update_cli()
print(bar.get_text()) print(bar.get_text())
return True # since this is a timeout function return True # since this is a timeout function
def update_cli(self_log_dlm, self, perc, def update_cli(self_log_dlm, self)
processed_chunks, num_chunk_tasks, #perc,
rt_hours, rt_minutes, rt_seconds, #processed_chunks, num_chunk_tasks,
hours, minutes, seconds, #rt_hours, rt_minutes, rt_seconds,
total_dl, total_write, total_used, #hours, minutes, seconds,
dl_speed, dl_unc_speed, w_speed, r_speed): #total_dl, total_write, total_used,
perc *= 100 #dl_speed, dl_unc_speed, w_speed, r_speed):
perc = self.perc * 100
print(f"perc: {perc}%") print(f"perc: {perc}%")
self.log.info(f'= Progress: {perc:.02f}% ({processed_chunks}/{num_chunk_tasks}), ' self.log.info(f'= Progress: {perc:.02f}% ({self.processed_chunks}/{self.num_chunk_tasks}), '
f'Running for {rt_hours:02d}:{rt_minutes:02d}:{rt_seconds:02d}, ' f'Running for {self.rt_hours:02d}:{self.rt_minutes:02d}:{self.rt_seconds:02d}, '
f'ETA: {hours:02d}:{minutes:02d}:{seconds:02d}') f'ETA: {self.hours:02d}:{self.minutes:02d}:{self.seconds:02d}')
self.log.info(f' - Downloaded: {total_dl / 1024 / 1024:.02f} MiB, ' self.log.info(f' - Downloaded: {self.total_dl / 1024 / 1024:.02f} MiB, '
f'Written: {total_write / 1024 / 1024:.02f} MiB') f'Written: {self.total_write / 1024 / 1024:.02f} MiB')
self.log.info(f' - Cache usage: {total_used} MiB, active tasks: {self.active_tasks}') self.log.info(f' - Cache usage: {self.total_used} MiB, active tasks: {self.active_tasks}')
self.log.info(f' + Download\t- {dl_speed / 1024 / 1024:.02f} MiB/s (raw) ' self.log.info(f' + Download\t- {self.dl_speed / 1024 / 1024:.02f} MiB/s (raw) '
f'/ {dl_unc_speed / 1024 / 1024:.02f} MiB/s (decompressed)') f'/ {self.dl_unc_speed / 1024 / 1024:.02f} MiB/s (decompressed)')
self.log.info(f' + Disk\t- {w_speed / 1024 / 1024:.02f} MiB/s (write) / ' self.log.info(f' + Disk\t- {self.w_speed / 1024 / 1024:.02f} MiB/s (write) / '
f'{r_speed / 1024 / 1024:.02f} MiB/s (read)') f'{self.r_speed / 1024 / 1024:.02f} MiB/s (read)')

6
legendary/gui/manager2.py
View file

@ -697,7 +697,7 @@ class DLManager(Process):
self.bytes_decompressed_since_last = self.num_tasks_processed_since_last = 0 self.bytes_decompressed_since_last = self.num_tasks_processed_since_last = 0
last_update = time.time() last_update = time.time()
perc = (self.processed_chunks / self.num_chunk_tasks) self.perc = (self.processed_chunks / self.num_chunk_tasks)
runtime = time.time() - s_time runtime = time.time() - s_time
self.total_avail = len(self.sms) self.total_avail = len(self.sms)
self.total_used = (num_shared_memory_segments - self.total_avail) * (self.analysis.biggest_chunk / 1024 / 1024) self.total_used = (num_shared_memory_segments - self.total_avail) * (self.analysis.biggest_chunk / 1024 / 1024)
@ -716,7 +716,7 @@ class DLManager(Process):
#debug print("loop") #debug print("loop")
log_dlm.update( self, log_dlm.update( self,
perc, self.perc,
self.processed_chunks, self.processed_chunks,
self.num_chunk_tasks, self.num_chunk_tasks,
self.rt_hours, self.rt_hours,
@ -740,7 +740,7 @@ class DLManager(Process):
if self.status_queue: if self.status_queue:
try: try:
self.status_queue.put(UIUpdate( self.status_queue.put(UIUpdate(
progress=perc, download_speed=self.dl_unc_speed, write_speed=self.w_speed, read_speed=self.r_speed, progress=self.perc, download_speed=self.dl_unc_speed, write_speed=self.w_speed, read_speed=self.r_speed,
memory_usage=self.total_used * 1024 * 1024 memory_usage=self.total_used * 1024 * 1024
), timeout=1.0) ), timeout=1.0)
except Exception as e: except Exception as e: