From 9cb88ea386b5d84d60c288550bcbccaad63dcb9a Mon Sep 17 00:00:00 2001 From: codeking Date: Sun, 8 Dec 2024 03:15:09 +0100 Subject: [PATCH] Rename existing application download events --- core/controllers/ApplicationVersionController.py | 4 ++-- core/observers/ApplicationVersionObserver.py | 4 ++-- main.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/controllers/ApplicationVersionController.py b/core/controllers/ApplicationVersionController.py index 091ba61..7fe43be 100644 --- a/core/controllers/ApplicationVersionController.py +++ b/core/controllers/ApplicationVersionController.py @@ -83,11 +83,11 @@ class ApplicationVersionController: response_buffer.write(data) progress = (bytes_written / response_size) * 100 if response_size > 0 else 0 - application_version_observer.notify('download_progress', application_version, dict( + application_version_observer.notify('download_progressing', application_version, dict( progress=progress )) - application_version_observer.notify('download_finished', application_version) + application_version_observer.notify('downloaded', application_version) response_buffer.seek(0) file_hash = ApplicationVersionController.__calculate_file_hash(response_buffer) diff --git a/core/observers/ApplicationVersionObserver.py b/core/observers/ApplicationVersionObserver.py index 0a48613..ea20100 100644 --- a/core/observers/ApplicationVersionObserver.py +++ b/core/observers/ApplicationVersionObserver.py @@ -6,5 +6,5 @@ class ApplicationVersionObserver(BaseObserver): def __init__(self): self.on_downloading = [] - self.on_download_progress = [] - self.on_download_finished = [] + self.on_download_progressing = [] + self.on_downloaded = [] diff --git a/main.py b/main.py index 7341423..4da5a57 100644 --- a/main.py +++ b/main.py @@ -37,8 +37,8 @@ if __name__ == '__main__': profile_observer = ProfileObserver() application_version_observer.subscribe('downloading', lambda event: print(f'Downloading {ApplicationController.get(event.subject.application_code).name}, version {event.subject.version_number}...')) - application_version_observer.subscribe('download_progress', lambda event: print(f'Current progress: {event.meta.get('progress'):.2f}%', flush=True, end='\r')) - application_version_observer.subscribe('download_finished', lambda event: print('\n')) + application_version_observer.subscribe('download_progressing', lambda event: print(f'Current progress: {event.meta.get('progress'):.2f}%', flush=True, end='\r')) + application_version_observer.subscribe('downloaded', lambda event: print('\n')) client_observer.subscribe('synchronizing', lambda event: print('Synchronizing...\n')) connection_observer.subscribe('connecting', lambda event: print(f'[{event.subject.get("attempt_count")}/{event.subject.get("maximum_number_of_attempts")}] Performing connection attempt...\n'))