RepoMirrors
/
hydrus
mirror of https://github.com/hydrusnetwork/hydrus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

No media_collect fix

This commit is contained in:
Hydrus Network Developer 2023-05-31 16:17:52 -05:00
parent 1e4c416fd6
commit 7b79d11fcf
No known key found for this signature in database
GPG Key ID: 76249F053212133C
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hydrus/client/gui/pages/ClientGUIManagementController.py
View File

@ -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 ):

11
hydrus/client/gui/pages/ClientGUIManagementPanels.py
View File

@ -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()

10
hydrus/client/gui/pages/ClientGUIResults.py
View File

@ -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 )