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-24_13-20-48

Browse source
This commit is contained in:
koraynilay 2021-02-24 13:20:48 +01:00
parent aa74875151
commit a0cbbbd23a
2 changed files with 77 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
legendary/gui/gui.py
View file

@ -19,7 +19,7 @@ import legendary.cli
core = legendary.core.LegendaryCore() core = legendary.core.LegendaryCore()
cli = legendary.cli.LegendaryCLI() cli = legendary.cli.LegendaryCLI()
def update_gui(parent, bar): def update_gui(dlm, bar):
# perc, # perc,
# processed_chunks, num_chunk_tasks, # processed_chunks, num_chunk_tasks,
# rt_hours, rt_minutes, rt_seconds, # rt_hours, rt_minutes, rt_seconds,
@ -29,10 +29,10 @@ def update_gui(parent, bar):
print(f"update_gui_{bar}") print(f"update_gui_{bar}")
#print(f"{dlm}") #print(f"{dlm}")
#print(f"dhexid:{hex(id(dlm.perc))}") #print(f"dhexid:{hex(id(dlm.perc))}")
bar.set_fraction(parent.values_dlm[0]) bar.set_fraction(dlm.perc)
#bar.set_fraction(perc) #bar.set_fraction(perc)
bar.set_text(f"{parent.values_dlm[0] / 1024 / 1024:.02f} MiB/s - {(parent.values_dlm[0]*100):.02f}% - ETA: {parent.values_dlm[6]:02d}:{parent.values_dlm[7]:02d}:{parent.values_dlm[8]:02d}") bar.set_text(f"{dlm.dl_speed / 1024 / 1024:.02f} MiB/s - {(dlm.perc*100):.02f}% - ETA: {dlm.hours:02d}:{dlm.minutes:02d}:{dlm.seconds:02d}")
#bar.set_text(f"{dlm.dl_speed / 1024 / 1024:.02f} MiB/s - {(dlm.perc*100):.02f}% - ETA: {dlm.hours:02d}:{dlm.minutes:02d}:{dlm.seconds:02d}") ##a## bar.set_text(f"{parent.values_dlm[0] / 1024 / 1024:.02f} MiB/s - {(parent.values_dlm[0]*100):.02f}% - ETA: {parent.values_dlm[6]:02d}:{parent.values_dlm[7]:02d}:{parent.values_dlm[8]: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
@ -776,26 +776,26 @@ def install_gtk(app_name, app_title, parent):
dlm.start() dlm.start()
#time.sleep(4) #time.sleep(4)
#perch = 0 #perch = 0
parent.values_dlm = [ ##a## parent.values_dlm = [
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0, ##a## 0,
0 ##a## 0
] ##a## ]
parent.timeout_id = GLib.timeout_add(500, update_gui, parent, parent.progress_bar) parent.timeout_id = GLib.timeout_add(500, update_gui, dlm, parent.progress_bar)
print("timeout_add -",parent.timeout_id) print("timeout_add -",parent.timeout_id)
#dlm.join() #dlm.join()
except Exception as e: except Exception as e:

89
legendary/gui/manager2.py
View file

@ -734,43 +734,60 @@ class DLManager(Process):
#self.obj_out = "cli" #self.obj_out = "cli"
#if self.obj_out == "cli": #if self.obj_out == "cli":
log_dlm.update(self) log_dlm.update(self)
main_window.values_dlm = [ #self.perc,
# 0 #self.processed_chunks,
self.perc, #self.num_chunk_tasks,
# 1 #self.rt_hours,
self.processed_chunks, #self.rt_minutes,
# 2 #self.rt_seconds,
self.num_chunk_tasks, #self.hours,
# 3 #self.minutes,
self.rt_hours, #self.seconds,
# 4 #self.total_dl,
self.rt_minutes, #self.total_write,
# 5 #self.total_used,
self.rt_seconds, #self.dl_speed,
# 6 #self.dl_unc_speed,
self.hours, #self.w_speed,
# 7 #self.r_speed,
self.minutes, #self.obj_out
# 8
self.seconds,
# 9
self.total_dl,
# 10
self.total_write,
# 11
self.total_used,
# 12
self.dl_speed,
# 13
self.dl_unc_speed,
# 14
self.w_speed,
# 15
self.r_speed,
# 16
self.obj_out
]
print("updated obj_out") print("updated obj_out")
##a## main_window.values_dlm = [
##a## # 0
##a## self.perc,
##a## # 1
##a## self.processed_chunks,
##a## # 2
##a## self.num_chunk_tasks,
##a## # 3
##a## self.rt_hours,
##a## # 4
##a## self.rt_minutes,
##a## # 5
##a## self.rt_seconds,
##a## # 6
##a## self.hours,
##a## # 7
##a## self.minutes,
##a## # 8
##a## self.seconds,
##a## # 9
##a## self.total_dl,
##a## # 10
##a## self.total_write,
##a## # 11
##a## self.total_used,
##a## # 12
##a## self.dl_speed,
##a## # 13
##a## self.dl_unc_speed,
##a## # 14
##a## self.w_speed,
##a## # 15
##a## self.r_speed,
##a## # 16
##a## self.obj_out
##a## ]
# send status update to back to instantiator (if queue exists) # send status update to back to instantiator (if queue exists)
if self.status_queue: if self.status_queue: