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

Revert "Revert "Fixing URL comparison issue"" 

This reverts commit 9ab079a80f.
This commit is contained in:
Hydrus Network Developer 2024-03-27 17:23:03 -05:00
parent 4faa2e11fd
commit 3c9793e788
No known key found for this signature in database
GPG Key ID: 76249F053212133C
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hydrus/client/importing/ClientImportFileSeeds.py
View File

@ -133,6 +133,18 @@ class FileSeed( HydrusSerialisable.SerialisableBase ):
self.file_seed_data = file_seed_data self.file_seed_data = file_seed_data
self.file_seed_data_for_comparison = file_seed_data self.file_seed_data_for_comparison = file_seed_data
if self.file_seed_type == FILE_SEED_TYPE_URL:
try:
self.file_seed_data_for_comparison = CG.client_controller.network_engine.domain_manager.NormaliseURL( self.file_seed_data )
except:
pass
self.created = HydrusTime.GetNow() self.created = HydrusTime.GetNow()
self.modified = self.created self.modified = self.created
self.source_time = None self.source_time = None
@ -298,6 +310,20 @@ class FileSeed( HydrusSerialisable.SerialisableBase ):
serialisable_hashes serialisable_hashes
) = serialisable_info ) = serialisable_info
self.file_seed_data_for_comparison = self.file_seed_data
if self.file_seed_type == FILE_SEED_TYPE_URL:
try:
self.file_seed_data_for_comparison = CG.client_controller.network_engine.domain_manager.NormaliseURL( self.file_seed_data )
except:
pass
self._external_filterable_tags = set( serialisable_external_filterable_tags ) self._external_filterable_tags = set( serialisable_external_filterable_tags )
self._external_additional_service_keys_to_tags = HydrusSerialisable.CreateFromSerialisableTuple( serialisable_external_additional_service_keys_to_tags ) self._external_additional_service_keys_to_tags = HydrusSerialisable.CreateFromSerialisableTuple( serialisable_external_additional_service_keys_to_tags )