From 7b79d11fcf7ebe0ea29f2d40580b405f218c8436 Mon Sep 17 00:00:00 2001 From: Hydrus Network Developer Date: Wed, 31 May 2023 16:17:52 -0500 Subject: [PATCH] No media_collect fix --- .../client/gui/pages/ClientGUIManagementController.py | 1 + hydrus/client/gui/pages/ClientGUIManagementPanels.py | 11 ++++++++++- hydrus/client/gui/pages/ClientGUIResults.py | 10 +++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/hydrus/client/gui/pages/ClientGUIManagementController.py b/hydrus/client/gui/pages/ClientGUIManagementController.py index a31f0dca..d8ffe405 100644 --- a/hydrus/client/gui/pages/ClientGUIManagementController.py +++ b/hydrus/client/gui/pages/ClientGUIManagementController.py @@ -204,6 +204,7 @@ class ManagementController( HydrusSerialisable.SerialisableBase ): def _InitialiseDefaults( self ): self._variables[ 'media_sort' ] = ClientMedia.MediaSort( ( 'system', CC.SORT_FILES_BY_FILESIZE ), CC.SORT_ASC ) + self._variables[ 'media_collect' ] = ClientMedia.MediaCollect() def _InitialiseFromSerialisableInfo( self, serialisable_info ): diff --git a/hydrus/client/gui/pages/ClientGUIManagementPanels.py b/hydrus/client/gui/pages/ClientGUIManagementPanels.py index ce930136..31874eca 100644 --- a/hydrus/client/gui/pages/ClientGUIManagementPanels.py +++ b/hydrus/client/gui/pages/ClientGUIManagementPanels.py @@ -254,7 +254,16 @@ class ManagementPanel( QW.QScrollArea ): self._media_sort_widget = ClientGUIResultsSortCollect.MediaSortControl( self, media_sort = self._management_controller.GetVariable( 'media_sort' ) ) - self._media_collect_widget = ClientGUIResultsSortCollect.MediaCollectControl( self, media_collect = self._management_controller.GetVariable( 'media_collect' ) ) + if self._management_controller.HasVariable( 'media_collect' ): + + media_collect = self._management_controller.GetVariable( 'media_collect' ) + + else: + + media_collect = ClientMedia.MediaCollect() + + + self._media_collect_widget = ClientGUIResultsSortCollect.MediaCollectControl( self, media_collect = media_collect ) self._media_collect_widget.ListenForNewOptions() diff --git a/hydrus/client/gui/pages/ClientGUIResults.py b/hydrus/client/gui/pages/ClientGUIResults.py index 79596e25..1553e9c8 100644 --- a/hydrus/client/gui/pages/ClientGUIResults.py +++ b/hydrus/client/gui/pages/ClientGUIResults.py @@ -1913,7 +1913,15 @@ class MediaPanel( CAC.ApplicationCommandProcessorMixin, ClientMedia.ListeningMed if hashes is not None and len( hashes ) > 0: media_sort = self._management_controller.GetVariable( 'media_sort' ) - media_collect = self._management_controller.GetVariable( 'media_collect' ) + + if self._management_controller.HasVariable( 'media_collect' ): + + media_collect = self._management_controller.GetVariable( 'media_collect' ) + + else: + + media_collect = ClientMedia.MediaCollect() + HG.client_controller.pub( 'new_page_query', self._location_context, initial_hashes = hashes, initial_sort = media_sort, initial_collect = media_collect )