diff --git a/rare/components/tabs/downloads/__init__.py b/rare/components/tabs/downloads/__init__.py index 12857903a..f8a4fc2c5 100644 --- a/rare/components/tabs/downloads/__init__.py +++ b/rare/components/tabs/downloads/__init__.py @@ -191,7 +191,7 @@ def __refresh_download(self, item: InstallQueueItemModel): f"Failed to refresh download for {item.options.app_name} with error: {m}")).__get__(self) ) worker.signals.finished.connect( - (lambda obj, m: obj.logger.info( + (lambda obj: obj.logger.info( f"Download refresh worker finished for {item.options.app_name}")).__get__(self) ) diff --git a/rare/components/tabs/library/details/details.py b/rare/components/tabs/library/details/details.py index 1b56f66d3..1626e9a12 100644 --- a/rare/components/tabs/library/details/details.py +++ b/rare/components/tabs/library/details/details.py @@ -454,7 +454,12 @@ def update_game(self, rgame: RareGame): self.ui.exp_field.setText(f"{ach.user_xp}/{ach.total_product_xp}") for group, page in zip( - (ach.hidden, ach.uninitiated, ach.completed, ach.in_progress, ), + ( + sorted(ach.hidden, key=lambda a: a['xp'], reverse=False), + sorted(ach.uninitiated, key=lambda a: a['xp'], reverse=False), + sorted(ach.completed, key=lambda a: a['unlock_date'], reverse=True), + sorted(ach.in_progress, key=lambda a: a['progress'], reverse=True), + ), (self.ui.ach_hidden_page, self.ui.ach_uninitiated_page, self.ui.ach_completed_page, self.ui.ach_progress_page, ) ): self.ui.achievements_toolbox.setItemEnabled(self.ui.achievements_toolbox.indexOf(page), bool(group)) diff --git a/rare/models/install.py b/rare/models/install.py index b7b2bd218..276af1e6c 100644 --- a/rare/models/install.py +++ b/rare/models/install.py @@ -78,7 +78,7 @@ def download(self, download: Optional[InstallDownloadModel]): @property def expired(self) -> bool: - return datetime.now() > (self.__date + timedelta(minutes=30)) + return datetime.now() > (self.__date + timedelta(minutes=5)) def __bool__(self): return (self.download is not None) and (self.options is not None) and (not self.expired)