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

2021-02-24_12-48-51

Browse source
This commit is contained in:
koraynilay 2021-02-24 12:48:51 +01:00
parent 9bef34b1b0
commit 133e2c7168
3 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
legendary/downloader/log_dlm.py
View file

@ -38,6 +38,7 @@ class log_dlm:
#r_speed) #r_speed)
else: else:
print("update_gui") print("update_gui")
print(f"{dlm.dl_speed / 1024 / 1024:.02f} MiB/s - {(dlm.perc*100):.02f}% - ETA: {dlm.hours:02d}:{dlm.minutes:02d}:{dlm.seconds:02d} - log_dlm")
#self.update_gui(dlm, dlm.obj_out) #self.update_gui(dlm, dlm.obj_out)
#self.update_gui( #self.update_gui(
# dlm, # dlm,

22
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(dlm, bar, perc): def update_gui(parent, 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,9 +29,9 @@ def update_gui(dlm, bar, perc):
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(dlm.perc) bar.set_fraction(parent.dlm.perc)
bar.set_fraction(perc) #bar.set_fraction(perc)
#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"{parent.dlm.dl_speed / 1024 / 1024:.02f} MiB/s - {(parent.dlm.perc*100):.02f}% - ETA: {parent.dlm.hours:02d}:{parent.dlm.minutes:02d}:{parent.dlm.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
@ -681,7 +681,7 @@ def install_gtk(app_name, app_title, parent):
print('Preparing download...') print('Preparing download...')
# todo use status queue to print progress from CLI # todo use status queue to print progress from CLI
# This has become a little ridiculous hasn't it? # This has become a little ridiculous hasn't it?
dlm, analysis, igame = core.prepare_download(game=game, base_game=base_game, base_path=args.base_path, parent.dlm, analysis, igame = core.prepare_download(game=game, base_game=base_game, base_path=args.base_path,
force=args.force, max_shm=args.shared_memory, force=args.force, max_shm=args.shared_memory,
max_workers=args.max_workers, game_folder=args.game_folder, max_workers=args.max_workers, game_folder=args.game_folder,
disable_patching=args.disable_patching, disable_patching=args.disable_patching,
@ -762,8 +762,8 @@ def install_gtk(app_name, app_title, parent):
try: try:
# set up logging stuff (should be moved somewhere else later) # set up logging stuff (should be moved somewhere else later)
dlm.logging_queue = cli.logging_queue parent.dlm.logging_queue = cli.logging_queue
dlm.proc_debug = args.dlm_debug parent.dlm.proc_debug = args.dlm_debug
#print("parent:",parent) #print("parent:",parent)
# dlm.perc = 0 # dlm.perc = 0
@ -772,12 +772,12 @@ def install_gtk(app_name, app_title, parent):
# dlm.minutes = 0 # dlm.minutes = 0
# dlm.seconds = 0 # dlm.seconds = 0
#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}")
dlm.start() parent.dlm.start()
#time.sleep(4) #time.sleep(4)
perch = 0 #perch = 0
parent.timeout_id = GLib.timeout_add(1000, update_gui, dlm, parent.progress_bar, perch) parent.timeout_id = GLib.timeout_add(500, update_gui, parent, 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:
end_t = time.time() end_t = time.time()
#log_gtk(f'Installation failed after {end_t - start_t:.02f} seconds.' #log_gtk(f'Installation failed after {end_t - start_t:.02f} seconds.'

8
legendary/gui/manager2.py
View file

@ -34,6 +34,14 @@ class DLManager(Process):
self.log = logging.getLogger('DLM') self.log = logging.getLogger('DLM')
self.proc_debug = False self.proc_debug = False
# ###
# self.perc = 1
# self.dl_speed = 1
# self.hours = 1
# self.minutes = 1
# self.seconds = 1
# ###
self.base_url = base_url self.base_url = base_url
self.dl_dir = download_dir self.dl_dir = download_dir
self.cache_dir = cache_dir if cache_dir else os.path.join(download_dir, '.cache') self.cache_dir = cache_dir if cache_dir else os.path.join(download_dir, '.cache')