From 2e28ed3ca9ba9d0f92b34adf7bc520cb9ffb66fa Mon Sep 17 00:00:00 2001
From: Hydrus Network Developer <hydrus.admin@gmail.com>
Date: Wed, 15 May 2024 15:41:32 -0500
Subject: [PATCH] Version 575

closes #1551
---
 docs/changelog.md                             |  76 +-
 docs/getting_started_installing.md            |   2 +-
 docs/old_changelog.html                       |  32 +-
 hydrus/client/ClientConstants.py              |  14 -
 hydrus/client/ClientController.py             |   4 +-
 hydrus/client/ClientDownloading.py            |   2 +-
 hydrus/client/ClientFiles.py                  |  12 +-
 hydrus/client/ClientFilesPhysical.py          |   4 +
 hydrus/client/ClientImageHandling.py          |   9 +-
 hydrus/client/ClientOptions.py                | 727 +++++++-----------
 hydrus/client/ClientRendering.py              |   6 +-
 hydrus/client/caches/ClientCaches.py          |   6 +-
 hydrus/client/db/ClientDB.py                  |  65 +-
 hydrus/client/db/ClientDBFilesDuplicates.py   |   9 +-
 .../ClientDBMappingsCacheSpecificDisplay.py   |   6 +-
 .../ClientDBMappingsCacheSpecificStorage.py   |  23 +-
 hydrus/client/db/ClientDBTagSearch.py         |  78 ++
 .../client/duplicates/ClientAutoDuplicates.py | 199 +++++
 .../{ => duplicates}/ClientDuplicates.py      |  65 +-
 hydrus/client/duplicates/__init__.py          |   0
 hydrus/client/gui/ClientGUI.py                |  38 +
 hydrus/client/gui/ClientGUICore.py            |   2 +
 hydrus/client/gui/ClientGUIMenus.py           |  22 +
 .../client/gui/ClientGUIScrolledPanelsEdit.py |   2 +-
 .../gui/ClientGUIScrolledPanelsManagement.py  |  35 +-
 hydrus/client/gui/ClientGUIStyle.py           |  18 +-
 hydrus/client/gui/ClientGUISubscriptions.py   | 103 ++-
 hydrus/client/gui/canvas/ClientGUICanvas.py   |   2 +-
 .../gui/canvas/ClientGUICanvasHoverFrames.py  |   2 +-
 .../gui/importing/ClientGUIImportOptions.py   |   2 +
 hydrus/client/gui/lists/ClientGUIListBoxes.py |  10 +
 .../pages/ClientGUIManagementController.py    |   9 +-
 .../gui/pages/ClientGUIManagementPanels.py    |  28 +-
 hydrus/client/gui/pages/ClientGUIPages.py     |   8 +-
 hydrus/client/gui/pages/ClientGUIResults.py   |   2 +-
 .../client/gui/search/ClientGUIACDropdown.py  | 247 +++---
 .../client/importing/ClientImportFileSeeds.py |   2 +-
 hydrus/client/importing/ClientImportFiles.py  |   7 +-
 .../networking/ClientLocalServerResources.py  |   7 +-
 .../networking/ClientNetworkingFunctions.py   |   2 +-
 hydrus/core/HydrusConstants.py                |   5 +-
 hydrus/core/HydrusData.py                     |   6 +
 hydrus/core/HydrusSerialisable.py             |   4 +
 hydrus/core/files/HydrusAnimationHandling.py  |   8 +-
 .../core/files/HydrusOfficeOpenXMLHandling.py |   2 +-
 .../core/files/images/HydrusImageHandling.py  |  18 +-
 .../files/images/HydrusImageNormalisation.py  |   2 +-
 .../core/files/images/HydrusImageOpening.py   |  25 +-
 hydrus/test/TestClientAPI.py                  |   9 +-
 hydrus/test/TestClientDBDuplicates.py         |  49 +-
 hydrus/test/TestClientNetworking.py           |   7 +
 hydrus/test/TestHydrusSerialisable.py         |   3 +-
 ...oru file page parser - get webm ugoira.png | Bin 3320 -> 3366 bytes
 .../parsers/danbooru file page parser.png     | Bin 2358 -> 2933 bytes
 static/default/url_classes/fixupx tweet.png   | Bin 0 -> 1960 bytes
 static/default/url_classes/fixvx tweet.png    | Bin 0 -> 1947 bytes
 .../default/url_classes/fxtwitter tweet.png   | Bin 0 -> 2001 bytes
 .../vxtwitter api status (with username).png  | Bin 0 -> 2729 bytes
 .../url_classes/vxtwitter api status.png      | Bin 0 -> 2272 bytes
 .../default/url_classes/vxtwitter tweet.png   | Bin 0 -> 2057 bytes
 static/default/url_classes/x post.png         | Bin 1809 -> 1816 bytes
 61 files changed, 1282 insertions(+), 743 deletions(-)
 create mode 100644 hydrus/client/duplicates/ClientAutoDuplicates.py
 rename hydrus/client/{ => duplicates}/ClientDuplicates.py (98%)
 create mode 100644 hydrus/client/duplicates/__init__.py
 create mode 100644 static/default/url_classes/fixupx tweet.png
 create mode 100644 static/default/url_classes/fixvx tweet.png
 create mode 100644 static/default/url_classes/fxtwitter tweet.png
 create mode 100644 static/default/url_classes/vxtwitter api status (with username).png
 create mode 100644 static/default/url_classes/vxtwitter api status.png
 create mode 100644 static/default/url_classes/vxtwitter tweet.png

diff --git a/docs/changelog.md b/docs/changelog.md
index 57315d2c..dc75f122 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -7,6 +7,39 @@ title: Changelog
 !!! note
     This is the new changelog, only the most recent builds. For all versions, see the [old changelog](old_changelog.html).
 
+## [Version 575](https://github.com/hydrusnetwork/hydrus/releases/tag/v575)
+
+### misc
+
+* the new 'children' tab now sorts its results by count, and it only shows the top n (default 40) results. you can edit the n under _options-&gt;tags_. let me know how this works IRL, as this new count-sorting needs a bit of extra CPU
+* when you ask subscriptions to 'check now', either in the 'edit subscription' or 'edit subscriptions' dialogs, if there is a mix of DEAD and ALIVE subs, it now pops up a quick question dialog asking whether you want to check now for all/alive/dead
+* fixed the (do not) 'alphabetise GET query parameters' URL Class checkbox, which I broke in v569. sorry for the trouble--the new URL encoding handling was accidentally alphabetising all URLs on ingestion. a new unit test will catch this in future, so it shouldn't happen again (issue #1551)
+* thanks to a user, I think we have fixed ICC profile processing when your system ICC Profile is non-sRGB
+* fixed a logical test that was disallowing thumbnail regen on files with no resolution (certain svg, for instance). all un-resolutioned files will now (re)render a thumb to the max bounding thumbnail resolution setting. fingers crossed we'll be able to figure out a ratio solution in future
+* added a _debug-&gt;help-&gt;gui actions-&gt;reload current stylesheet_ menu action. it unloads and reloads the current QSS
+* added a _debug-&gt;help-&gt;gui actions-&gt;reload current gui session_ menu action. it saves the current session and reloads it
+* fixed the rendering of some 16-bit pngs that seem to be getting a slightly different image mode on the new version of PIL
+* the debug 'gui report mode' now reports extensive info about virtual taglist heights. if I have been working with you on taglists, mostly on the manage tags dialog, that spawn without a scrollbar even though they should, please run this mode and then try to capture the error. hit me up and we'll see if the numbers explain what's going on. I may have also simply fixed the bug
+* I think I sped up adding tags to a local tag service that has a lot of siblings/parents
+* updated the default danbooru parsers to get the original and/or translated artist notes. I don't know if a user did this or I did, but my dev machine somehow already had the tech while the defaults did not--if you did this, thinks!
+* added more tweet URL Classes for the default downloader. you should now be able to drag and drop a vxtwitter or fxtwitter URL on the client and it'll work
+
+### auto-duplicate resolution
+
+* I have nothing real to show today, but I have a skeleton of code and a good plan on how to get the client resolving easy duplicate pairs by itself. so far, it looks easier than I feared, but, as always, there will be a lot to do. I will keep chipping away at this and will release features in tentative waves for advanced users to play with
+* with this system, I will be launching the very first version of the 'Metadata Conditional' object I have been talking about for a few years. fingers crossed, we'll be able to spam it to all sorts of other places to do 'if the file has x property, then do y' in a standardised way
+
+### boring stuff
+
+* refactored the new tag children autocomplete tab to its own class so it can handle its new predicate gubbins and sorted/culled search separately. it is also now aware of the current file location context to give file-domain-sensitive suggestions (falling back to 'all known files' for fast search if things are complicated)
+* fixed a layout issue on file import options panel when a sister page caused it to be taller than it wanted; the help button ended up being the expanding widget jej
+* non-menubar menus and submenus across the program now remove a hanging final separator item, making the logic of forming menu groups a little easier in future
+* the core 'Load image in PIL' method has some better error reporting, and many calls now explicitly tell it a human-readable source description so we can avoid repeats of `DamagedOrUnusualFileException: Could not load the image at "&lt;_io.BytesIO object at 0x000001F60CE45620&gt;"--it was likely malformed!`
+* cleaned up some dict instantiations in `ClientOptions`
+* moved `ClientDuplicates` up to a new `duplicates` module and migrated some duplicate enums over to it from `ClientConstants`
+* removed an old method-wrapper hack that applied the 'load images with PIL' option. I just moved to a global that I set on init and update on options change
+* cleaned some duplicate checking code
+
 ## [Version 574](https://github.com/hydrusnetwork/hydrus/releases/tag/v574)
 
 ### local hashes cache
@@ -381,46 +414,3 @@ title: Changelog
 
 * just a small thing, but the under-documented `/manage_database/get_client_options` call now says the four types of default tag sort. I left the old key, `default_tag_sort`, in so as not to break stuff, but it is just a copy of the `search_page` variant in the new `default_tag_sort_xxx` foursome
 * client api version is now 62
-
-## [Version 564](https://github.com/hydrusnetwork/hydrus/releases/tag/v564)
-
-### more macOS work
-
-* thanks to a user, we have more macOS features:
-* macOS users get a new shortcut action, default Space, that uses Quick Look to preview a thumbnail like you can in Finder. **all existing users will get the new shortcut!**
-* the hydrus .app now has the version number in Get Info
-* **macOS users who run from source should rebuild their venvs this week!** if you don't, then trying this new Quick Look feature will just give you an error notification
-
-### new fuzzy operator math in system predicates
-
-* the system predicates for width, height, num_notes, num_words, num_urls, num_frames, duration, and framerate now support two different kinds of approximate equals, ≈: absolute (±x), and percentage (±x%). previously, the ≈ secretly just did ±15% in all cases (issue #1468)
-* all `system:framerate=x` searches are now converted to `±5%`, which is what they were behind the scenes. `!=` framerate stuff is no longer supported, so if you happened to use it, it is now converted to `<` just as a valid fallback
-* `system:duration` gets the same thing, `±5%`. it wasn't doing this behind the scenes before, but it should have been!
-* `system:duration` also now allows hours and minutes input, if you need longer!
-* for now, the parsing system is not updated to specify the % or absolute ± values. it will remain the same as the old system, with ±15% as the default for a `~=` input
-* there's still a little borked logic in these combined types. if you search `< 3 URLs`, that will return files with 0 URLs, and same for `num_notes`, but if you search `< 200px width` or any of the others I changed this week, that won't return a PDF that has no width (although it will return a damaged file that reports 0 width specifically). I am going to think about this, since there isn't an easy one-size-fits-all-solution to marry what is technically correct with what is actually convenient. I'll probably add a checkbox that says whether to include 'Null' values or not and default that True/False depending on the situation; let me know what you think!
-
-### misc
-
-* I have taken out Space as the default for archive/delete filter 'keep' and duplicate filter 'this is better, delete other'. Space is now exclusively, by default, media pause/play. **I am going to set this to existing users too, deleting/overwriting what Space does for you, if you are still set to the defaults**
-* integer percentages are now rendered without the trailing `.0`. `15%`, not `15.0%`
-* when you 'open externally', 'open in web browser', or 'open path' from a thumbnail, the preview viewer now pauses rather than clears completely
-* fixed the edit shortcut panel ALWAYS showing the new (home/end/left/right/to focus) dropdown for thumbnail dropdown, arrgh
-* I fixed a stupid typo that was breaking file repository file deletes
-* `help->about` now shows the Qt platformName
-* added a note about bad Wayland support to the Linux 'installing' help document
-* the guy who wrote the `Fixing_Hydrus_Random_Crashes_Under_Linux` document has updated it with new information, particularly related to running hydrus fast using virtual memory on small, underpowered computers
-
-### client api
-
-* thanks to a user, the undocumented API call that returns info on importer pages now includes the sha256 file hash in each import object Object
-* although it is a tiny change, let's nonetheless update the Client API version to 61
-
-### boring predicate overhaul work
-
-* updated the `NumberTest` object to hold specific percentage and absolute ± values
-* updated the `NumberTest` object to render itself to any number format, for instance pixels vs kilobytes vs a time delta
-* updated the `Predicate` object for system preds width, height, num_notes, num_words, num_urls, num_frames, duration, and framerate to store their operator and value as a `NumberTest`, and updated predicate string rendering, parsing, editing, database-level predicate handling
-* wrote new widgets to edit `NumberTest`s of various sorts and spammed them to these (operator, value) system predicate UI panels. we are finally clearing out some 8+-year-old jank here
-* rewrote the `num_notes` database search logic to use `NumberTest`s
-* the system preds for height, width, and framerate now say 'has x' and 'no x' when set to `>0` or `=0`, although what these really mean is not perfectly defined
diff --git a/docs/getting_started_installing.md b/docs/getting_started_installing.md
index b6cb4839..d157bb9c 100644
--- a/docs/getting_started_installing.md
+++ b/docs/getting_started_installing.md
@@ -83,7 +83,7 @@ By default, hydrus stores all its data—options, files, subscriptions, _everyth
 !!! danger "Bad Locations"
     **Do not install to a network location!** (i.e. on a different computer's hard drive) The SQLite database is sensitive to interruption and requires good file locking, which network interfaces often fake. There are [ways of splitting your client up](database_migration.md) so the database is on a local SSD but the files are on a network--this is fine--but you really should not put the database on a remote machine unless you know what you are doing and have a backup in case things go wrong.
     
-    **Do not install to a location with filesystem-level compression enabled!** It may work ok to start, but when the SQLite database grows to large size, this can cause extreme access latency and I/O errors and corruption.
+    **Do not install to a location with filesystem-level compression enabled! (e.g. BTRFS)** It may work ok to start, but when the SQLite database grows to large size, this can cause extreme access latency and I/O errors and corruption.
 
 !!! info "For macOS users"
     The Hydrus App is **non-portable** and puts your database in `~/Library/Hydrus` (i.e. `/Users/[You]/Library/Hydrus`). You can update simply by replacing the old App with the new, but if you wish to backup, you should be looking at `~/Library/Hydrus`, not the App itself.
diff --git a/docs/old_changelog.html b/docs/old_changelog.html
index ac53cbed..b2c33e6f 100644
--- a/docs/old_changelog.html
+++ b/docs/old_changelog.html
@@ -34,6 +34,36 @@
         <div class="content">
             <h1 id="changelog"><a href="#changelog">changelog</a></h1>
             <ul>
+                <li>
+                    <h2 id="version_575"><a href="#version_575">version 575</a></h2>
+                    <ul>
+                        <li><h3>misc</h3></li>
+                        <li>the new 'children' tab now sorts its results by count, and it only shows the top n (default 40) results. you can edit the n under _options-&gt;tags_. let me know how this works IRL, as this new count-sorting needs a bit of extra CPU</li>
+                        <li>when you ask subscriptions to 'check now', either in the 'edit subscription' or 'edit subscriptions' dialogs, if there is a mix of DEAD and ALIVE subs, it now pops up a quick question dialog asking whether you want to check now for all/alive/dead</li>
+                        <li>fixed the (do not) 'alphabetise GET query parameters' URL Class checkbox, which I broke in v569. sorry for the trouble--the new URL encoding handling was accidentally alphabetising all URLs on ingestion. a new unit test will catch this in future, so it shouldn't happen again (issue #1551)</li>
+                        <li>thanks to a user, I think we have fixed ICC profile processing when your system ICC Profile is non-sRGB</li>
+                        <li>fixed a logical test that was disallowing thumbnail regen on files with no resolution (certain svg, for instance). all un-resolutioned files will now (re)render a thumb to the max bounding thumbnail resolution setting. fingers crossed we'll be able to figure out a ratio solution in future</li>
+                        <li>added a _debug-&gt;help-&gt;gui actions-&gt;reload current stylesheet_ menu action. it unloads and reloads the current QSS</li>
+                        <li>added a _debug-&gt;help-&gt;gui actions-&gt;reload current gui session_ menu action. it saves the current session and reloads it</li>
+                        <li>fixed the rendering of some 16-bit pngs that seem to be getting a slightly different image mode on the new version of PIL</li>
+                        <li>the debug 'gui report mode' now reports extensive info about virtual taglist heights. if I have been working with you on taglists, mostly on the manage tags dialog, that spawn without a scrollbar even though they should, please run this mode and then try to capture the error. hit me up and we'll see if the numbers explain what's going on. I may have also simply fixed the bug</li>
+                        <li>I think I sped up adding tags to a local tag service that has a lot of siblings/parents</li>
+                        <li>updated the default danbooru parsers to get the original and/or translated artist notes. I don't know if a user did this or I did, but my dev machine somehow already had the tech while the defaults did not--if you did this, thinks!</li>
+                        <li>added more tweet URL Classes for the default downloader. you should now be able to drag and drop a vxtwitter or fxtwitter URL on the client and it'll work</li>
+                        <li><h3>auto-duplicate resolution</h3></li>
+                        <li>I have nothing real to show today, but I have a skeleton of code and a good plan on how to get the client resolving easy duplicate pairs by itself. so far, it looks easier than I feared, but, as always, there will be a lot to do. I will keep chipping away at this and will release features in tentative waves for advanced users to play with</li>
+                        <li>with this system, I will be launching the very first version of the 'Metadata Conditional' object I have been talking about for a few years. fingers crossed, we'll be able to spam it to all sorts of other places to do 'if the file has x property, then do y' in a standardised way</li>
+                        <li><h3>boring stuff</h3></li>
+                        <li>refactored the new tag children autocomplete tab to its own class so it can handle its new predicate gubbins and sorted/culled search separately. it is also now aware of the current file location context to give file-domain-sensitive suggestions (falling back to 'all known files' for fast search if things are complicated)</li>
+                        <li>fixed a layout issue on file import options panel when a sister page caused it to be taller than it wanted; the help button ended up being the expanding widget jej</li>
+                        <li>non-menubar menus and submenus across the program now remove a hanging final separator item, making the logic of forming menu groups a little easier in future</li>
+                        <li>the core 'Load image in PIL' method has some better error reporting, and many calls now explicitly tell it a human-readable source description so we can avoid repeats of `DamagedOrUnusualFileException: Could not load the image at "&lt;_io.BytesIO object at 0x000001F60CE45620&gt;"--it was likely malformed!`</li>
+                        <li>cleaned up some dict instantiations in `ClientOptions`</li>
+                        <li>moved `ClientDuplicates` up to a new `duplicates` module and migrated some duplicate enums over to it from `ClientConstants`</li>
+                        <li>removed an old method-wrapper hack that applied the 'load images with PIL' option. I just moved to a global that I set on init and update on options change</li>
+                        <li>cleaned some duplicate checking code</li>
+                    </ul>
+                </li>
                 <li>
                     <h2 id="version_574"><a href="#version_574">version 574</a></h2>
                     <ul>
@@ -53,7 +83,7 @@
                         <li>when setting up an import folder, the dialog will now refuse to OK if you set a path that is 1) above the install dir or db dir or 2) above or below any of your file storage locations. shouldn't be possible to set up an import from your own file storage folder by accident any more</li>
                         <li>added a new 'apply image ICC Profile colour adjustments' checkbox to _options-&gt;media_. this simply turns off ICC profile loading and application, for debug purposes</li>
                         <li><h3>boring cleanup</h3></li>
-                        <li>the default SQLite page size is now 4096 bytes on Linux, the SQLite default. it was 1024 previously, but SQLite now recommend 4096 for all platforms. the next time Linux users vacuum any of their databases, they will get fixed. I do not think this is a big deal, so don't rush to force this</li>
+                        <li>the default SQLite page size is now 4096 bytes on Linux and macOS, the SQLite default. it was 1024 previously, but SQLite now recommend 4096 for all platforms. the next time Linux users vacuum any of their databases, they will get fixed. I do not think this is a big deal, so don't rush to force this</li>
                         <li>fixed the last couple dozen missing layout flags across the program, which were ancient artifacts from the wx-&gt;Qt conversion</li>
                         <li>fixed the WTFPL licence to be my copyright, lol</li>
                         <li>deleted the local booru service management/UI code</li>
diff --git a/hydrus/client/ClientConstants.py b/hydrus/client/ClientConstants.py
index c41f866b..3ede7248 100644
--- a/hydrus/client/ClientConstants.py
+++ b/hydrus/client/ClientConstants.py
@@ -65,10 +65,6 @@ directions_alignment_string_lookup = {
     DIRECTION_DOWN : 'bottom'
 }
 
-DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH = 0
-DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH = 1
-DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES = 2
-
 FIELD_VERIFICATION_RECAPTCHA = 0
 FIELD_COMMENT = 1
 FIELD_TEXT = 2
@@ -146,16 +142,6 @@ hamming_string_lookup = {
     HAMMING_SPECULATIVE : 'speculative'
 }
 
-SIMILAR_FILES_PIXEL_DUPES_REQUIRED = 0
-SIMILAR_FILES_PIXEL_DUPES_ALLOWED = 1
-SIMILAR_FILES_PIXEL_DUPES_EXCLUDED = 2
-
-similar_files_pixel_dupes_string_lookup = {
-    SIMILAR_FILES_PIXEL_DUPES_REQUIRED : 'must be pixel dupes',
-    SIMILAR_FILES_PIXEL_DUPES_ALLOWED : 'can be pixel dupes',
-    SIMILAR_FILES_PIXEL_DUPES_EXCLUDED : 'must not be pixel dupes'
-}
-
 IDLE_NOT_ON_SHUTDOWN = 0
 IDLE_ON_SHUTDOWN = 1
 IDLE_ON_SHUTDOWN_ASK_FIRST = 2
diff --git a/hydrus/client/ClientController.py b/hydrus/client/ClientController.py
index 456efecd..f8692129 100644
--- a/hydrus/client/ClientController.py
+++ b/hydrus/client/ClientController.py
@@ -1023,6 +1023,8 @@ class Controller( ClientControllerInterface.ClientControllerInterface, HydrusCon
         HydrusImageHandling.SetEnableLoadTruncatedImages( self.new_options.GetBoolean( 'enable_truncated_images_pil' ) )
         HydrusImageNormalisation.SetDoICCProfileNormalisation( self.new_options.GetBoolean( 'do_icc_profile_normalisation' ) )
         
+        HydrusImageHandling.FORCE_PIL_ALWAYS = self.new_options.GetBoolean( 'load_images_with_pil' )
+        
     
     def InitModel( self ):
         
@@ -1490,7 +1492,7 @@ class Controller( ClientControllerInterface.ClientControllerInterface, HydrusCon
             
             if work_done:
                 
-                from hydrus.client import ClientDuplicates
+                from hydrus.client.duplicates import ClientDuplicates
                 
                 ClientDuplicates.DuplicatesManager.instance().RefreshMaintenanceNumbers()
                 
diff --git a/hydrus/client/ClientDownloading.py b/hydrus/client/ClientDownloading.py
index be713119..e4be03ee 100644
--- a/hydrus/client/ClientDownloading.py
+++ b/hydrus/client/ClientDownloading.py
@@ -334,7 +334,7 @@ class QuickDownloadManager( object ):
                                     file_import_options.SetPreImportURLCheckLooksForNeighbours( preimport_url_check_looks_for_neighbours )
                                     file_import_options.SetPostImportOptions( automatic_archive, associate_primary_urls, associate_source_urls )
                                     
-                                    file_import_job = ClientImportFiles.FileImportJob( temp_path, file_import_options )
+                                    file_import_job = ClientImportFiles.FileImportJob( temp_path, file_import_options, human_file_description = f'Downloaded File - {hash.hex()}' )
                                     
                                     file_import_job.DoWork()
                                     
diff --git a/hydrus/client/ClientFiles.py b/hydrus/client/ClientFiles.py
index 8ff12445..27489a0d 100644
--- a/hydrus/client/ClientFiles.py
+++ b/hydrus/client/ClientFiles.py
@@ -1792,7 +1792,7 @@ class ClientFilesManager( object ):
             
             thumbnail_mime = HydrusFileHandling.GetThumbnailMime( path )
             
-            numpy_image = ClientImageHandling.GenerateNumPyImage( path, thumbnail_mime )
+            numpy_image = HydrusImageHandling.GenerateNumPyImage( path, thumbnail_mime )
             
             ( current_width, current_height ) = HydrusImageHandling.GetResolutionNumPy( numpy_image )
             
@@ -1863,7 +1863,7 @@ class ClientFilesManager( object ):
         
     
 
-def HasHumanReadableEmbeddedMetadata( path, mime ):
+def HasHumanReadableEmbeddedMetadata( path, mime, human_file_description = None ):
     
     if mime not in HC.FILES_THAT_CAN_HAVE_HUMAN_READABLE_EMBEDDED_METADATA:
         
@@ -1878,7 +1878,7 @@ def HasHumanReadableEmbeddedMetadata( path, mime ):
         
         try:
             
-            pil_image = HydrusImageOpening.RawOpenPILImage( path )
+            pil_image = HydrusImageOpening.RawOpenPILImage( path, human_file_description = human_file_description )
             
         except:
             
@@ -2051,7 +2051,7 @@ class FilesMaintenanceManager( object ):
         
         ( width, height ) = media_result.GetResolution()
         
-        if width is None or height is None:
+        if mime in HC.MIMES_THAT_ALWAYS_HAVE_GOOD_RESOLUTION and ( width is None or height is None )    :
             
             # this guy is probably pending a metadata regen but the user forced thumbnail regen now
             # we'll wait for metadata regen to notice the new dimensions and schedule this job again
@@ -2420,7 +2420,7 @@ class FilesMaintenanceManager( object ):
             path = self._controller.client_files_manager.GetFilePath( hash, mime )
             
             if mime == HC.APPLICATION_PSD:
-            
+                
                 try:
                     
                     has_icc_profile = HydrusPSDHandling.PSDHasICCProfile( path )
@@ -2672,7 +2672,7 @@ class FilesMaintenanceManager( object ):
             
             thumbnail_mime = HydrusFileHandling.GetThumbnailMime( thumbnail_path )
             
-            numpy_image = ClientImageHandling.GenerateNumPyImage( thumbnail_path, thumbnail_mime )
+            numpy_image = HydrusImageHandling.GenerateNumPyImage( thumbnail_path, thumbnail_mime )
             
             return HydrusBlurhash.GetBlurhashFromNumPy( numpy_image )
             
diff --git a/hydrus/client/ClientFilesPhysical.py b/hydrus/client/ClientFilesPhysical.py
index 11bc834d..f636bfb4 100644
--- a/hydrus/client/ClientFilesPhysical.py
+++ b/hydrus/client/ClientFilesPhysical.py
@@ -64,6 +64,10 @@ def GetMissingPrefixes( merge_target: str, prefixes: typing.Collection[ str ], m
     return missing_prefixes
     
 
+# TODO: A 'FilePath' or 'FileLocation' or similar that holds the path or IO stream, and/or temp_path to use for import calcs, and hash once known, and the human description like 'this came from blah URL'
+# then we spam that all over the import pipeline and when we need a nice error, we ask that guy to describe himself
+# search up 'human_file_description' to see what we'd be replacing
+
 class FilesStorageBaseLocation( object ):
     
     def __init__( self, path: str, ideal_weight: int, max_num_bytes = None ):
diff --git a/hydrus/client/ClientImageHandling.py b/hydrus/client/ClientImageHandling.py
index cb222bcb..7893f423 100644
--- a/hydrus/client/ClientImageHandling.py
+++ b/hydrus/client/ClientImageHandling.py
@@ -28,13 +28,6 @@ def DiscardBlankPerceptualHashes( perceptual_hashes ):
     return perceptual_hashes
     
 
-def GenerateNumPyImage( path, mime ):
-    
-    force_pil = CG.client_controller.new_options.GetBoolean( 'load_images_with_pil' )
-    
-    return HydrusImageHandling.GenerateNumPyImage( path, mime, force_pil = force_pil )
-    
-
 def GenerateShapePerceptualHashes( path, mime ):
     
     if HG.phash_generation_report_mode:
@@ -44,7 +37,7 @@ def GenerateShapePerceptualHashes( path, mime ):
     
     try:
         
-        numpy_image = GenerateNumPyImage( path, mime )
+        numpy_image = HydrusImageHandling.GenerateNumPyImage( path, mime )
         
         return GenerateShapePerceptualHashesNumPy( numpy_image )
         
diff --git a/hydrus/client/ClientOptions.py b/hydrus/client/ClientOptions.py
index 2fa11f19..7ac91187 100644
--- a/hydrus/client/ClientOptions.py
+++ b/hydrus/client/ClientOptions.py
@@ -11,8 +11,8 @@ from hydrus.core import HydrusTags
 
 from hydrus.client import ClientConstants as CC
 from hydrus.client import ClientDefaults
-from hydrus.client import ClientDuplicates
 from hydrus.client import ClientGlobals as CG
+from hydrus.client.duplicates import ClientDuplicates
 from hydrus.client.importing.options import FileImportOptions
 
 class ClientOptions( HydrusSerialisable.SerialisableBase ):
@@ -122,206 +122,134 @@ class ClientOptions( HydrusSerialisable.SerialisableBase ):
     
     def _InitialiseDefaults( self ):
         
-        self._dictionary[ 'booleans' ] = {}
-        
-        self._dictionary[ 'booleans' ][ 'advanced_mode' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'remove_filtered_files_even_when_skipped' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'filter_inbox_and_archive_predicates' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'discord_dnd_fix' ] = False
-        self._dictionary[ 'booleans' ][ 'secret_discord_dnd_fix' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'show_unmatched_urls_in_media_viewer' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'set_search_focus_on_page_change' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'allow_remove_on_manage_tags_input' ] = True
-        self._dictionary[ 'booleans' ][ 'yes_no_on_remove_on_manage_tags' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'activate_window_on_tag_search_page_activation' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'show_related_tags' ] = True
-        self._dictionary[ 'booleans' ][ 'show_file_lookup_script_tags' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'use_native_menubar' ] = HC.PLATFORM_MACOS
-        
-        self._dictionary[ 'booleans' ][ 'shortcuts_merge_non_number_numpad' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'disable_get_safe_position_test' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'freeze_message_manager_when_mouse_on_other_monitor' ] = False
-        self._dictionary[ 'booleans' ][ 'freeze_message_manager_when_main_gui_minimised' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'load_images_with_pil' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'only_show_delete_from_all_local_domains_when_filtering' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'use_system_ffmpeg' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'elide_page_tab_names' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'maintain_similar_files_duplicate_pairs_during_idle' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'show_namespaces' ] = True
-        self._dictionary[ 'booleans' ][ 'show_number_namespaces' ] = True
-        self._dictionary[ 'booleans' ][ 'show_subtag_number_namespaces' ] = True
-        self._dictionary[ 'booleans' ][ 'replace_tag_underscores_with_spaces' ] = False
-        self._dictionary[ 'booleans' ][ 'replace_tag_emojis_with_boxes' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'verify_regular_https' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'page_drop_chase_normally' ] = True
-        self._dictionary[ 'booleans' ][ 'page_drop_chase_with_shift' ] = False
-        self._dictionary[ 'booleans' ][ 'page_drag_change_tab_normally' ] = True
-        self._dictionary[ 'booleans' ][ 'page_drag_change_tab_with_shift' ] = True
-        self._dictionary[ 'booleans' ][ 'wheel_scrolls_tab_bar' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'remove_local_domain_moved_files' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'anchor_and_hide_canvas_drags' ] = HC.PLATFORM_WINDOWS
-        self._dictionary[ 'booleans' ][ 'touchscreen_canvas_drags_unanchor' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'import_page_progress_display' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'process_subs_in_random_order' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'ac_select_first_with_count' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'saving_sash_positions_on_exit' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'database_deferred_delete_maintenance_during_idle' ] = True
-        self._dictionary[ 'booleans' ][ 'database_deferred_delete_maintenance_during_active' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'file_maintenance_during_idle' ] = True
-        self._dictionary[ 'booleans' ][ 'file_maintenance_during_active' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'tag_display_maintenance_during_idle' ] = True
-        self._dictionary[ 'booleans' ][ 'tag_display_maintenance_during_active' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'save_page_sort_on_change' ] = False
-        self._dictionary[ 'booleans' ][ 'disable_page_tab_dnd' ] = False
-        self._dictionary[ 'booleans' ][ 'force_hide_page_signal_on_new_page' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'pause_export_folders_sync' ] = False
-        self._dictionary[ 'booleans' ][ 'pause_import_folders_sync' ] = False
-        self._dictionary[ 'booleans' ][ 'pause_repo_sync' ] = False
-        self._dictionary[ 'booleans' ][ 'pause_subs_sync' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'pause_all_new_network_traffic' ] = False
-        self._dictionary[ 'booleans' ][ 'boot_with_network_traffic_paused' ] = False
-        self._dictionary[ 'booleans' ][ 'pause_all_file_queues' ] = False
-        self._dictionary[ 'booleans' ][ 'pause_all_watcher_checkers' ] = False
-        self._dictionary[ 'booleans' ][ 'pause_all_gallery_searches' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'popup_message_force_min_width' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'always_show_iso_time' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'confirm_multiple_local_file_services_move' ] = True
-        self._dictionary[ 'booleans' ][ 'confirm_multiple_local_file_services_copy' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'use_advanced_file_deletion_dialog' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'show_new_on_file_seed_short_summary' ] = False
-        self._dictionary[ 'booleans' ][ 'show_deleted_on_file_seed_short_summary' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'only_save_last_session_during_idle' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'do_human_sort_on_hdd_file_import_paths' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'highlight_new_watcher' ] = True
-        self._dictionary[ 'booleans' ][ 'highlight_new_query' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'delete_files_after_export' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'file_viewing_statistics_active' ] = True
-        self._dictionary[ 'booleans' ][ 'file_viewing_statistics_active_on_archive_delete_filter' ] = True
-        self._dictionary[ 'booleans' ][ 'file_viewing_statistics_active_on_dupe_filter' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'prefix_hash_when_copying' ] = False
-        self._dictionary[ 'booleans' ][ 'file_system_waits_on_wakeup' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'always_show_system_everything' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'watch_clipboard_for_watcher_urls' ] = False
-        self._dictionary[ 'booleans' ][ 'watch_clipboard_for_other_recognised_urls' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'default_search_synchronised' ] = True
-        self._dictionary[ 'booleans' ][ 'autocomplete_float_main_gui' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'global_audio_mute' ] = False
-        self._dictionary[ 'booleans' ][ 'media_viewer_audio_mute' ] = False
-        self._dictionary[ 'booleans' ][ 'media_viewer_uses_its_own_audio_volume' ] = False
-        self._dictionary[ 'booleans' ][ 'preview_audio_mute' ] = False
-        self._dictionary[ 'booleans' ][ 'preview_uses_its_own_audio_volume' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'always_loop_gifs' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'always_show_system_tray_icon' ] = False
-        self._dictionary[ 'booleans' ][ 'minimise_client_to_system_tray' ] = False
-        self._dictionary[ 'booleans' ][ 'close_client_to_system_tray' ] = False
-        self._dictionary[ 'booleans' ][ 'start_client_in_system_tray' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'use_qt_file_dialogs' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'notify_client_api_cookies' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'expand_parents_on_storage_taglists' ] = True
-        self._dictionary[ 'booleans' ][ 'expand_parents_on_storage_autocomplete_taglists' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'show_parent_decorators_on_storage_taglists' ] = True
-        self._dictionary[ 'booleans' ][ 'show_parent_decorators_on_storage_autocomplete_taglists' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'show_sibling_decorators_on_storage_taglists' ] = True
-        self._dictionary[ 'booleans' ][ 'show_sibling_decorators_on_storage_autocomplete_taglists' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'show_session_size_warnings' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'delete_lock_for_archived_files' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'remember_last_advanced_file_deletion_reason' ] = True
-        self._dictionary[ 'booleans' ][ 'remember_last_advanced_file_deletion_special_action' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'do_macos_debug_dialog_menus' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'save_default_tag_service_tab_on_change' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'force_animation_scanbar_show' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'call_mouse_buttons_primary_secondary' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'start_note_editing_at_end' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'draw_transparency_checkerboard_media_canvas' ] = False
-        self._dictionary[ 'booleans' ][ 'draw_transparency_checkerboard_media_canvas_duplicates' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'menu_choice_buttons_can_mouse_scroll' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'focus_preview_on_ctrl_click' ] = False
-        self._dictionary[ 'booleans' ][ 'focus_preview_on_ctrl_click_only_static' ] = False
-        self._dictionary[ 'booleans' ][ 'focus_preview_on_shift_click' ] = False
-        self._dictionary[ 'booleans' ][ 'focus_preview_on_shift_click_only_static' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'fade_sibling_connector' ] = True
-        self._dictionary[ 'booleans' ][ 'use_custom_sibling_connector_colour' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'hide_uninteresting_local_import_time' ] = True
-        self._dictionary[ 'booleans' ][ 'hide_uninteresting_modified_time' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'allow_blurhash_fallback' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'fade_thumbnails' ] = True
-        
-        self._dictionary[ 'booleans' ][ 'slideshow_always_play_duration_media_once_through' ] = False
-        
-        self._dictionary[ 'booleans' ][ 'enable_truncated_images_pil' ] = True
-        self._dictionary[ 'booleans' ][ 'do_icc_profile_normalisation' ] = True
-        
         from hydrus.client.gui.canvas import ClientGUIMPV
         
-        self._dictionary[ 'booleans' ][ 'mpv_available_at_start' ] = ClientGUIMPV.MPV_IS_AVAILABLE
+        self._dictionary[ 'booleans' ] = {
+            'advanced_mode' : False,
+            'remove_filtered_files_even_when_skipped' : False,
+            'filter_inbox_and_archive_predicates' : False,
+            'discord_dnd_fix' : False,
+            'secret_discord_dnd_fix' : False,
+            'show_unmatched_urls_in_media_viewer' : False,
+            'set_search_focus_on_page_change' : False,
+            'allow_remove_on_manage_tags_input' : True,
+            'yes_no_on_remove_on_manage_tags' : True,
+            'activate_window_on_tag_search_page_activation' : False,
+            'show_related_tags' : True,
+            'show_file_lookup_script_tags' : False,
+            'use_native_menubar' : HC.PLATFORM_MACOS,
+            'shortcuts_merge_non_number_numpad' : True,
+            'disable_get_safe_position_test' : False,
+            'freeze_message_manager_when_mouse_on_other_monitor' : False,
+            'freeze_message_manager_when_main_gui_minimised' : False,
+            'load_images_with_pil' : True,
+            'only_show_delete_from_all_local_domains_when_filtering' : False,
+            'use_system_ffmpeg' : False,
+            'elide_page_tab_names' : True,
+            'maintain_similar_files_duplicate_pairs_during_idle' : False,
+            'show_namespaces' : True,
+            'show_number_namespaces' : True,
+            'show_subtag_number_namespaces' : True,
+            'replace_tag_underscores_with_spaces' : False,
+            'replace_tag_emojis_with_boxes' : False,
+            'verify_regular_https' : True,
+            'page_drop_chase_normally' : True,
+            'page_drop_chase_with_shift' : False,
+            'page_drag_change_tab_normally' : True,
+            'page_drag_change_tab_with_shift' : True,
+            'wheel_scrolls_tab_bar' : False,
+            'remove_local_domain_moved_files' : False,
+            'anchor_and_hide_canvas_drags' : HC.PLATFORM_WINDOWS,
+            'touchscreen_canvas_drags_unanchor' : False,
+            'import_page_progress_display' : True,
+            'process_subs_in_random_order' : True,
+            'ac_select_first_with_count' : False,
+            'saving_sash_positions_on_exit' : True,
+            'database_deferred_delete_maintenance_during_idle' : True,
+            'database_deferred_delete_maintenance_during_active' : True,
+            'file_maintenance_during_idle' : True,
+            'file_maintenance_during_active' : True,
+            'tag_display_maintenance_during_idle' : True,
+            'tag_display_maintenance_during_active' : True,
+            'save_page_sort_on_change' : False,
+            'disable_page_tab_dnd' : False,
+            'force_hide_page_signal_on_new_page' : False,
+            'pause_export_folders_sync' : False,
+            'pause_import_folders_sync' : False,
+            'pause_repo_sync' : False,
+            'pause_subs_sync' : False,
+            'pause_all_new_network_traffic' : False,
+            'boot_with_network_traffic_paused' : False,
+            'pause_all_file_queues' : False,
+            'pause_all_watcher_checkers' : False,
+            'pause_all_gallery_searches' : False,
+            'popup_message_force_min_width' : False,
+            'always_show_iso_time' : False,
+            'confirm_multiple_local_file_services_move' : True,
+            'confirm_multiple_local_file_services_copy' : True,
+            'use_advanced_file_deletion_dialog' : False,
+            'show_new_on_file_seed_short_summary' : False,
+            'show_deleted_on_file_seed_short_summary' : False,
+            'only_save_last_session_during_idle' : False,
+            'do_human_sort_on_hdd_file_import_paths' : True,
+            'highlight_new_watcher' : True,
+            'highlight_new_query' : True,
+            'delete_files_after_export' : False,
+            'file_viewing_statistics_active' : True,
+            'file_viewing_statistics_active_on_archive_delete_filter' : True,
+            'file_viewing_statistics_active_on_dupe_filter' : False,
+            'prefix_hash_when_copying' : False,
+            'file_system_waits_on_wakeup' : False,
+            'always_show_system_everything' : False,
+            'watch_clipboard_for_watcher_urls' : False,
+            'watch_clipboard_for_other_recognised_urls' : False,
+            'default_search_synchronised' : True,
+            'autocomplete_float_main_gui' : True,
+            'global_audio_mute' : False,
+            'media_viewer_audio_mute' : False,
+            'media_viewer_uses_its_own_audio_volume' : False,
+            'preview_audio_mute' : False,
+            'preview_uses_its_own_audio_volume' : True,
+            'always_loop_gifs' : True,
+            'always_show_system_tray_icon' : False,
+            'minimise_client_to_system_tray' : False,
+            'close_client_to_system_tray' : False,
+            'start_client_in_system_tray' : False,
+            'use_qt_file_dialogs' : False,
+            'notify_client_api_cookies' : False,
+            'expand_parents_on_storage_taglists' : True,
+            'expand_parents_on_storage_autocomplete_taglists' : True,
+            'show_parent_decorators_on_storage_taglists' : True,
+            'show_parent_decorators_on_storage_autocomplete_taglists' : True,
+            'show_sibling_decorators_on_storage_taglists' : True,
+            'show_sibling_decorators_on_storage_autocomplete_taglists' : True,
+            'show_session_size_warnings' : True,
+            'delete_lock_for_archived_files' : False,
+            'remember_last_advanced_file_deletion_reason' : True,
+            'remember_last_advanced_file_deletion_special_action' : False,
+            'do_macos_debug_dialog_menus' : False,
+            'save_default_tag_service_tab_on_change' : True,
+            'force_animation_scanbar_show' : False,
+            'call_mouse_buttons_primary_secondary' : False,
+            'start_note_editing_at_end' : True,
+            'draw_transparency_checkerboard_media_canvas' : False,
+            'draw_transparency_checkerboard_media_canvas_duplicates' : True,
+            'menu_choice_buttons_can_mouse_scroll' : True,
+            'focus_preview_on_ctrl_click' : False,
+            'focus_preview_on_ctrl_click_only_static' : False,
+            'focus_preview_on_shift_click' : False,
+            'focus_preview_on_shift_click_only_static' : False,
+            'fade_sibling_connector' : True,
+            'use_custom_sibling_connector_colour' : False,
+            'hide_uninteresting_local_import_time' : True,
+            'hide_uninteresting_modified_time' : True,
+            'allow_blurhash_fallback' : True,
+            'fade_thumbnails' : True,
+            'slideshow_always_play_duration_media_once_through' : False,
+            'enable_truncated_images_pil' : True,
+            'do_icc_profile_normalisation' : True,
+            'mpv_available_at_start' : ClientGUIMPV.MPV_IS_AVAILABLE
+        }
         
         #
         
@@ -415,207 +343,144 @@ class ClientOptions( HydrusSerialisable.SerialisableBase ):
         
         #
         
-        self._dictionary[ 'integers' ] = {}
-        
-        self._dictionary[ 'integers' ][ 'notebook_tab_alignment' ] = CC.DIRECTION_UP
-        
-        self._dictionary[ 'integers' ][ 'video_buffer_size' ] = 96 * 1024 * 1024
-        
-        self._dictionary[ 'integers' ][ 'related_tags_search_1_duration_ms' ] = 250
-        self._dictionary[ 'integers' ][ 'related_tags_search_2_duration_ms' ] = 2000
-        self._dictionary[ 'integers' ][ 'related_tags_search_3_duration_ms' ] = 6000
-        self._dictionary[ 'integers' ][ 'related_tags_concurrence_threshold_percent' ] = 6
-        
-        self._dictionary[ 'integers' ][ 'suggested_tags_width' ] = 300
-        
-        self._dictionary[ 'integers' ][ 'similar_files_duplicate_pairs_search_distance' ] = 0
-        
-        self._dictionary[ 'integers' ][ 'default_new_page_goes' ] = CC.NEW_PAGE_GOES_FAR_RIGHT
-        
-        self._dictionary[ 'integers' ][ 'num_recent_petition_reasons' ] = 5
-        
-        self._dictionary[ 'integers' ][ 'max_page_name_chars' ] = 20
-        self._dictionary[ 'integers' ][ 'page_file_count_display' ] = CC.PAGE_FILE_COUNT_DISPLAY_ALL
-        
-        self._dictionary[ 'integers' ][ 'network_timeout' ] = 10
-        self._dictionary[ 'integers' ][ 'connection_error_wait_time' ] = 15
-        self._dictionary[ 'integers' ][ 'serverside_bandwidth_wait_time' ] = 60
-        
-        self._dictionary[ 'integers' ][ 'thumbnail_visibility_scroll_percent' ] = 75
-        self._dictionary[ 'integers' ][ 'ideal_tile_dimension' ] = 768
-        
-        self._dictionary[ 'integers' ][ 'wake_delay_period' ] = 15
-        
         from hydrus.client.gui.canvas import ClientGUICanvasMedia
-        
-        self._dictionary[ 'integers' ][ 'media_viewer_zoom_center' ] = ClientGUICanvasMedia.ZOOM_CENTERPOINT_MOUSE
-        
-        self._dictionary[ 'integers' ][ 'last_session_save_period_minutes' ] = 5
-        
-        self._dictionary[ 'integers' ][ 'shutdown_work_period' ] = 86400
-        
-        self._dictionary[ 'integers' ][ 'max_network_jobs' ] = 15
-        self._dictionary[ 'integers' ][ 'max_network_jobs_per_domain' ] = 3
-        
-        self._dictionary[ 'integers' ][ 'max_connection_attempts_allowed' ] = 5
-        self._dictionary[ 'integers' ][ 'max_request_attempts_allowed_get' ] = 5
-        
         from hydrus.core.files.images import HydrusImageHandling
         
-        self._dictionary[ 'integers' ][ 'thumbnail_scale_type' ] = HydrusImageHandling.THUMBNAIL_SCALE_DOWN_ONLY
-        
-        self._dictionary[ 'integers' ][ 'max_simultaneous_subscriptions' ] = 1
-        
-        self._dictionary[ 'integers' ][ 'gallery_page_wait_period_pages' ] = 15
-        self._dictionary[ 'integers' ][ 'gallery_page_wait_period_subscriptions' ] = 5
-        self._dictionary[ 'integers' ][ 'watcher_page_wait_period' ] = 5
-        
-        self._dictionary[ 'integers' ][ 'popup_message_character_width' ] = 56
-        
-        self._dictionary[ 'integers' ][ 'duplicate_filter_max_batch_size' ] = 250
-        
-        self._dictionary[ 'integers' ][ 'video_thumbnail_percentage_in' ] = 35
-        
-        self._dictionary[ 'integers' ][ 'global_audio_volume' ] = 70
-        self._dictionary[ 'integers' ][ 'media_viewer_audio_volume' ] = 70
-        self._dictionary[ 'integers' ][ 'preview_audio_volume' ] = 70
-        
-        self._dictionary[ 'integers' ][ 'duplicate_comparison_score_higher_jpeg_quality' ] = 10
-        self._dictionary[ 'integers' ][ 'duplicate_comparison_score_much_higher_jpeg_quality' ] = 20
-        self._dictionary[ 'integers' ][ 'duplicate_comparison_score_higher_filesize' ] = 10
-        self._dictionary[ 'integers' ][ 'duplicate_comparison_score_much_higher_filesize' ] = 20
-        self._dictionary[ 'integers' ][ 'duplicate_comparison_score_higher_resolution' ] = 20
-        self._dictionary[ 'integers' ][ 'duplicate_comparison_score_much_higher_resolution' ] = 50
-        self._dictionary[ 'integers' ][ 'duplicate_comparison_score_more_tags' ] = 8
-        self._dictionary[ 'integers' ][ 'duplicate_comparison_score_older' ] = 4
-        self._dictionary[ 'integers' ][ 'duplicate_comparison_score_nicer_ratio' ] = 10
-        self._dictionary[ 'integers' ][ 'duplicate_comparison_score_has_audio' ] = 20
-        
-        self._dictionary[ 'integers' ][ 'thumbnail_cache_size' ] = 1024 * 1024 * 32
-        self._dictionary[ 'integers' ][ 'image_cache_size' ] = 1024 * 1024 * 384
-        self._dictionary[ 'integers' ][ 'image_tile_cache_size' ] = 1024 * 1024 * 256
-        
-        self._dictionary[ 'integers' ][ 'thumbnail_cache_timeout' ] = 86400
-        self._dictionary[ 'integers' ][ 'image_cache_timeout' ] = 600
-        self._dictionary[ 'integers' ][ 'image_tile_cache_timeout' ] = 300
-        
-        self._dictionary[ 'integers' ][ 'image_cache_storage_limit_percentage' ] = 25
-        self._dictionary[ 'integers' ][ 'image_cache_prefetch_limit_percentage' ] = 10
-        
-        self._dictionary[ 'integers' ][ 'media_viewer_prefetch_delay_base_ms' ] = 100
-        self._dictionary[ 'integers' ][ 'media_viewer_prefetch_num_previous' ] = 2
-        self._dictionary[ 'integers' ][ 'media_viewer_prefetch_num_next' ] = 3
-        
-        self._dictionary[ 'integers' ][ 'thumbnail_border' ] = 1
-        self._dictionary[ 'integers' ][ 'thumbnail_margin' ] = 2
-        
-        self._dictionary[ 'integers' ][ 'thumbnail_dpr_percent' ] = 100
-        
-        self._dictionary[ 'integers' ][ 'file_maintenance_idle_throttle_files' ] = 1
-        self._dictionary[ 'integers' ][ 'file_maintenance_idle_throttle_time_delta' ] = 2
-        
-        self._dictionary[ 'integers' ][ 'file_maintenance_active_throttle_files' ] = 1
-        self._dictionary[ 'integers' ][ 'file_maintenance_active_throttle_time_delta' ] = 20
-        
-        self._dictionary[ 'integers' ][ 'subscription_network_error_delay' ] = 12 * 3600
-        self._dictionary[ 'integers' ][ 'subscription_other_error_delay' ] = 36 * 3600
-        self._dictionary[ 'integers' ][ 'downloader_network_error_delay' ] = 90 * 60
-        
-        self._dictionary[ 'integers' ][ 'file_viewing_stats_menu_display' ] = CC.FILE_VIEWING_STATS_MENU_DISPLAY_MEDIA_AND_PREVIEW_IN_SUBMENU
-        
-        self._dictionary[ 'integers' ][ 'number_of_gui_session_backups' ] = 10
-        
-        self._dictionary[ 'integers' ][ 'animated_scanbar_height' ] = 20
-        self._dictionary[ 'integers' ][ 'animated_scanbar_nub_width' ] = 10
-        
-        self._dictionary[ 'integers' ][ 'domain_network_infrastructure_error_number' ] = 3
-        self._dictionary[ 'integers' ][ 'domain_network_infrastructure_error_time_delta' ] = 600
-        
-        self._dictionary[ 'integers' ][ 'ac_read_list_height_num_chars' ] = 21
-        self._dictionary[ 'integers' ][ 'ac_write_list_height_num_chars' ] = 11
-        
-        self._dictionary[ 'integers' ][ 'system_busy_cpu_percent' ] = 50
-        
-        self._dictionary[ 'integers' ][ 'human_bytes_sig_figs' ] = 3
-        
-        self._dictionary[ 'integers' ][ 'ms_to_wait_between_physical_file_deletes' ] = 250
-        
-        self._dictionary[ 'integers' ][ 'potential_duplicates_search_work_time_ms' ] = 500
-        self._dictionary[ 'integers' ][ 'potential_duplicates_search_rest_percentage' ] = 100
-        
-        self._dictionary[ 'integers' ][ 'repository_processing_work_time_ms_very_idle' ] = 30000
-        self._dictionary[ 'integers' ][ 'repository_processing_rest_percentage_very_idle' ] = 3
-        
-        self._dictionary[ 'integers' ][ 'repository_processing_work_time_ms_idle' ] = 10000
-        self._dictionary[ 'integers' ][ 'repository_processing_rest_percentage_idle' ] = 5
-        
-        self._dictionary[ 'integers' ][ 'repository_processing_work_time_ms_normal' ] = 500
-        self._dictionary[ 'integers' ][ 'repository_processing_rest_percentage_normal' ] = 10
-        
-        self._dictionary[ 'integers' ][ 'tag_display_processing_work_time_ms_idle' ] = 15000
-        self._dictionary[ 'integers' ][ 'tag_display_processing_rest_percentage_idle' ] = 3
-        
-        self._dictionary[ 'integers' ][ 'tag_display_processing_work_time_ms_normal' ] = 100
-        self._dictionary[ 'integers' ][ 'tag_display_processing_rest_percentage_normal' ] = 9900
-        
-        self._dictionary[ 'integers' ][ 'tag_display_processing_work_time_ms_work_hard' ] = 5000
-        self._dictionary[ 'integers' ][ 'tag_display_processing_rest_percentage_work_hard' ] = 5
-        
-        self._dictionary[ 'integers' ][ 'deferred_table_delete_work_time_ms_idle' ] = 20000
-        self._dictionary[ 'integers' ][ 'deferred_table_delete_rest_percentage_idle' ] = 10
-        
-        self._dictionary[ 'integers' ][ 'deferred_table_delete_work_time_ms_normal' ] = 250
-        self._dictionary[ 'integers' ][ 'deferred_table_delete_rest_percentage_normal' ] = 1000
-        
-        self._dictionary[ 'integers' ][ 'deferred_table_delete_work_time_ms_work_hard' ] = 5000
-        self._dictionary[ 'integers' ][ 'deferred_table_delete_rest_percentage_work_hard' ] = 10
+        self._dictionary[ 'integers' ] = {
+            'notebook_tab_alignment' : CC.DIRECTION_UP,
+            'video_buffer_size' : 96 * 1024 * 1024,
+            'related_tags_search_1_duration_ms' : 250,
+            'related_tags_search_2_duration_ms' : 2000,
+            'related_tags_search_3_duration_ms' : 6000,
+            'related_tags_concurrence_threshold_percent' : 6,
+            'suggested_tags_width' : 300,
+            'similar_files_duplicate_pairs_search_distance' : 0,
+            'default_new_page_goes' : CC.NEW_PAGE_GOES_FAR_RIGHT,
+            'num_recent_petition_reasons' : 5,
+            'max_page_name_chars' : 20,
+            'page_file_count_display' : CC.PAGE_FILE_COUNT_DISPLAY_ALL,
+            'network_timeout' : 10,
+            'connection_error_wait_time' : 15,
+            'serverside_bandwidth_wait_time' : 60,
+            'thumbnail_visibility_scroll_percent' : 75,
+            'ideal_tile_dimension' : 768,
+            'wake_delay_period' : 15,
+            'media_viewer_zoom_center' : ClientGUICanvasMedia.ZOOM_CENTERPOINT_MOUSE,
+            'last_session_save_period_minutes' : 5,
+            'shutdown_work_period' : 86400,
+            'max_network_jobs' : 15,
+            'max_network_jobs_per_domain' : 3,
+            'max_connection_attempts_allowed' : 5,
+            'max_request_attempts_allowed_get' : 5,
+            'thumbnail_scale_type' : HydrusImageHandling.THUMBNAIL_SCALE_DOWN_ONLY,
+            'max_simultaneous_subscriptions' : 1,
+            'gallery_page_wait_period_pages' : 15,
+            'gallery_page_wait_period_subscriptions' : 5,
+            'watcher_page_wait_period' : 5,
+            'popup_message_character_width' : 56,
+            'duplicate_filter_max_batch_size' : 250,
+            'video_thumbnail_percentage_in' : 35,
+            'global_audio_volume' : 70,
+            'media_viewer_audio_volume' : 70,
+            'preview_audio_volume' : 70,
+            'duplicate_comparison_score_higher_jpeg_quality' : 10,
+            'duplicate_comparison_score_much_higher_jpeg_quality' : 20,
+            'duplicate_comparison_score_higher_filesize' : 10,
+            'duplicate_comparison_score_much_higher_filesize' : 20,
+            'duplicate_comparison_score_higher_resolution' : 20,
+            'duplicate_comparison_score_much_higher_resolution' : 50,
+            'duplicate_comparison_score_more_tags' : 8,
+            'duplicate_comparison_score_older' : 4,
+            'duplicate_comparison_score_nicer_ratio' : 10,
+            'duplicate_comparison_score_has_audio' : 20,
+            'thumbnail_cache_size' : 1024 * 1024 * 32,
+            'image_cache_size' : 1024 * 1024 * 384,
+            'image_tile_cache_size' : 1024 * 1024 * 256,
+            'thumbnail_cache_timeout' : 86400,
+            'image_cache_timeout' : 600,
+            'image_tile_cache_timeout' : 300,
+            'image_cache_storage_limit_percentage' : 25,
+            'image_cache_prefetch_limit_percentage' : 10,
+            'media_viewer_prefetch_delay_base_ms' : 100,
+            'media_viewer_prefetch_num_previous' : 2,
+            'media_viewer_prefetch_num_next' : 3,
+            'thumbnail_border' : 1,
+            'thumbnail_margin' : 2,
+            'thumbnail_dpr_percent' : 100,
+            'file_maintenance_idle_throttle_files' : 1,
+            'file_maintenance_idle_throttle_time_delta' : 2,
+            'file_maintenance_active_throttle_files' : 1,
+            'file_maintenance_active_throttle_time_delta' : 20,
+            'subscription_network_error_delay' : 12 * 3600,
+            'subscription_other_error_delay' : 36 * 3600,
+            'downloader_network_error_delay' : 90 * 60,
+            'file_viewing_stats_menu_display' : CC.FILE_VIEWING_STATS_MENU_DISPLAY_MEDIA_AND_PREVIEW_IN_SUBMENU,
+            'number_of_gui_session_backups' : 10,
+            'animated_scanbar_height' : 20,
+            'animated_scanbar_nub_width' : 10,
+            'domain_network_infrastructure_error_number' : 3,
+            'domain_network_infrastructure_error_time_delta' : 600,
+            'ac_read_list_height_num_chars' : 21,
+            'ac_write_list_height_num_chars' : 11,
+            'system_busy_cpu_percent' : 50,
+            'human_bytes_sig_figs' : 3,
+            'ms_to_wait_between_physical_file_deletes' : 250,
+            'potential_duplicates_search_work_time_ms' : 500,
+            'potential_duplicates_search_rest_percentage' : 100,
+            'repository_processing_work_time_ms_very_idle' : 30000,
+            'repository_processing_rest_percentage_very_idle' : 3,
+            'repository_processing_work_time_ms_idle' : 10000,
+            'repository_processing_rest_percentage_idle' : 5,
+            'repository_processing_work_time_ms_normal' : 500,
+            'repository_processing_rest_percentage_normal' : 10,
+            'tag_display_processing_work_time_ms_idle' : 15000,
+            'tag_display_processing_rest_percentage_idle' : 3,
+            'tag_display_processing_work_time_ms_normal' : 100,
+            'tag_display_processing_rest_percentage_normal' : 9900,
+            'tag_display_processing_work_time_ms_work_hard' : 5000,
+            'tag_display_processing_rest_percentage_work_hard' : 5,
+            'deferred_table_delete_work_time_ms_idle' : 20000,
+            'deferred_table_delete_rest_percentage_idle' : 10,
+            'deferred_table_delete_work_time_ms_normal' : 250,
+            'deferred_table_delete_rest_percentage_normal' : 1000,
+            'deferred_table_delete_work_time_ms_work_hard' : 5000,
+            'deferred_table_delete_rest_percentage_work_hard' : 10
+        }
         
         #
         
-        self._dictionary[ 'keys' ] = {}
-        
-        self._dictionary[ 'keys' ][ 'default_tag_service_tab' ] = CC.DEFAULT_LOCAL_TAG_SERVICE_KEY.hex()
-        self._dictionary[ 'keys' ][ 'default_tag_service_search_page' ] = CC.COMBINED_TAG_SERVICE_KEY.hex()
-        self._dictionary[ 'keys' ][ 'default_gug_key' ] = HydrusData.GenerateKey().hex()
+        self._dictionary[ 'keys' ] = {
+            'default_tag_service_tab' : CC.DEFAULT_LOCAL_TAG_SERVICE_KEY.hex(),
+            'default_tag_service_search_page' : CC.COMBINED_TAG_SERVICE_KEY.hex(),
+            'default_gug_key' : HydrusData.GenerateKey().hex()
+        }
         
         self._dictionary[ 'key_list' ] = {}
         
         #
         
-        self._dictionary[ 'noneable_integers' ] = {}
-        
-        self._dictionary[ 'noneable_integers' ][ 'forced_search_limit' ] = None
-        
-        self._dictionary[ 'noneable_integers' ][ 'num_recent_tags' ] = 20
-        
-        self._dictionary[ 'noneable_integers' ][ 'duplicate_background_switch_intensity_a' ] = 0
-        self._dictionary[ 'noneable_integers' ][ 'duplicate_background_switch_intensity_b' ] = 3
-        
-        self._dictionary[ 'noneable_integers' ][ 'last_review_bandwidth_search_distance' ] = 7 * 86400
-        
-        self._dictionary[ 'noneable_integers' ][ 'file_viewing_statistics_media_min_time' ] = 2
-        self._dictionary[ 'noneable_integers' ][ 'file_viewing_statistics_media_max_time' ] = 600
-        self._dictionary[ 'noneable_integers' ][ 'file_viewing_statistics_preview_min_time' ] = 5
-        self._dictionary[ 'noneable_integers' ][ 'file_viewing_statistics_preview_max_time' ] = 60
-        
-        self._dictionary[ 'noneable_integers' ][ 'subscription_file_error_cancel_threshold' ] = 5
-        
-        self._dictionary[ 'noneable_integers' ][ 'media_viewer_cursor_autohide_time_ms' ] = 700
-        
-        self._dictionary[ 'noneable_integers' ][ 'idle_mode_client_api_timeout' ] = None
-        
-        self._dictionary[ 'noneable_integers' ][ 'system_busy_cpu_count' ] = 1
-        
-        self._dictionary[ 'noneable_integers' ][ 'animated_scanbar_hide_height' ] = 5
-        
-        self._dictionary[ 'noneable_integers' ][ 'last_backup_time' ] = None
-        
-        self._dictionary[ 'noneable_integers' ][ 'slideshow_short_duration_loop_percentage' ] = 20
-        self._dictionary[ 'noneable_integers' ][ 'slideshow_short_duration_loop_seconds' ] = 10
-        
-        self._dictionary[ 'noneable_integers' ][ 'slideshow_short_duration_cutoff_percentage' ] = 75
-        
-        self._dictionary[ 'noneable_integers' ][ 'slideshow_long_duration_overspill_percentage' ] = 50
+        self._dictionary[ 'noneable_integers' ] = {
+            'forced_search_limit' : None,
+            'num_recent_tags' : 20,
+            'duplicate_background_switch_intensity_a' : 0,
+            'duplicate_background_switch_intensity_b' : 3,
+            'last_review_bandwidth_search_distance' : 7 * 86400,
+            'file_viewing_statistics_media_min_time' : 2,
+            'file_viewing_statistics_media_max_time' : 600,
+            'file_viewing_statistics_preview_min_time' : 5,
+            'file_viewing_statistics_preview_max_time' : 60,
+            'subscription_file_error_cancel_threshold' : 5,
+            'media_viewer_cursor_autohide_time_ms' : 700,
+            'idle_mode_client_api_timeout' : None,
+            'system_busy_cpu_count' : 1,
+            'animated_scanbar_hide_height' : 5,
+            'last_backup_time' : None,
+            'slideshow_short_duration_loop_percentage' : 20,
+            'slideshow_short_duration_loop_seconds' : 10,
+            'slideshow_short_duration_cutoff_percentage' : 75,
+            'slideshow_long_duration_overspill_percentage' : 50,
+            'num_to_show_in_ac_dropdown_children_tab' : 40
+        }
         
         #
         
@@ -623,50 +488,50 @@ class ClientOptions( HydrusSerialisable.SerialisableBase ):
         
         #
         
-        self._dictionary[ 'noneable_strings' ] = {}
+        self._dictionary[ 'noneable_strings' ] = {
+            'favourite_file_lookup_script' : 'gelbooru md5',
+            'suggested_tags_layout' : 'notebook',
+            'backup_path' : None,
+            'web_browser_path' : None,
+            'last_png_export_dir' : None,
+            'media_background_bmp_path' : None,
+            'http_proxy' : None,
+            'https_proxy' : None,
+            'no_proxy' : '127.0.0.1',
+            'qt_style_name' : None,
+            'qt_stylesheet_name' : None,
+            'last_advanced_file_deletion_reason' : None,
+            'last_advanced_file_deletion_special_action' : None,
+            'sibling_connector_custom_namespace_colour' : 'system',
+            'or_connector_custom_namespace_colour' : 'system'
+        }
         
-        self._dictionary[ 'noneable_strings' ][ 'favourite_file_lookup_script' ] = 'gelbooru md5'
-        self._dictionary[ 'noneable_strings' ][ 'suggested_tags_layout' ] = 'notebook'
-        self._dictionary[ 'noneable_strings' ][ 'backup_path' ] = None
-        self._dictionary[ 'noneable_strings' ][ 'web_browser_path' ] = None
-        self._dictionary[ 'noneable_strings' ][ 'last_png_export_dir' ] = None
-        self._dictionary[ 'noneable_strings' ][ 'media_background_bmp_path' ] = None
-        self._dictionary[ 'noneable_strings' ][ 'http_proxy' ] = None
-        self._dictionary[ 'noneable_strings' ][ 'https_proxy' ] = None
-        self._dictionary[ 'noneable_strings' ][ 'no_proxy' ] = '127.0.0.1'
-        self._dictionary[ 'noneable_strings' ][ 'qt_style_name' ] = None
-        self._dictionary[ 'noneable_strings' ][ 'qt_stylesheet_name' ] = None
-        self._dictionary[ 'noneable_strings' ][ 'last_advanced_file_deletion_reason' ] = None
-        self._dictionary[ 'noneable_strings' ][ 'last_advanced_file_deletion_special_action' ] = None
-        self._dictionary[ 'noneable_strings' ][ 'sibling_connector_custom_namespace_colour' ] = 'system'
-        self._dictionary[ 'noneable_strings' ][ 'or_connector_custom_namespace_colour' ] = 'system'
+        self._dictionary[ 'strings' ] = {
+            'app_display_name' : 'hydrus client',
+            'namespace_connector' : ':',
+            'sibling_connector' : ' \u2192 ',
+            'or_connector' : ' OR ',
+            'export_phrase' : '{hash}',
+            'current_colourset' : 'default',
+            'favourite_simple_downloader_formula' : 'all files linked by images in page',
+            'thumbnail_scroll_rate' : '1.0',
+            'pause_character' : '\u23F8',
+            'stop_character' : '\u23F9',
+            'default_gug_name' : 'safebooru tag search',
+            'has_audio_label' : '\U0001F50A',
+            'has_duration_label' : ' \u23F5 ',
+            'discord_dnd_filename_pattern' : '{hash}',
+            'default_suggested_tags_notebook_page' : 'related',
+            'last_incremental_tagging_namespace' : 'page',
+            'last_incremental_tagging_prefix' : '',
+            'last_incremental_tagging_suffix' : ''
+        }
         
-        self._dictionary[ 'strings' ] = {}
-        
-        self._dictionary[ 'strings' ][ 'app_display_name' ] = 'hydrus client'
-        self._dictionary[ 'strings' ][ 'namespace_connector' ] = ':'
-        self._dictionary[ 'strings' ][ 'sibling_connector' ] = ' \u2192 '
-        self._dictionary[ 'strings' ][ 'or_connector' ] = ' OR '
-        self._dictionary[ 'strings' ][ 'export_phrase' ] = '{hash}'
-        self._dictionary[ 'strings' ][ 'current_colourset' ] = 'default'
-        self._dictionary[ 'strings' ][ 'favourite_simple_downloader_formula' ] = 'all files linked by images in page'
-        self._dictionary[ 'strings' ][ 'thumbnail_scroll_rate' ] = '1.0'
-        self._dictionary[ 'strings' ][ 'pause_character' ] = '\u23F8'
-        self._dictionary[ 'strings' ][ 'stop_character' ] = '\u23F9'
-        self._dictionary[ 'strings' ][ 'default_gug_name' ] = 'safebooru tag search'
-        self._dictionary[ 'strings' ][ 'has_audio_label' ] = '\U0001F50A'
-        self._dictionary[ 'strings' ][ 'has_duration_label' ] = ' \u23F5 '
-        self._dictionary[ 'strings' ][ 'discord_dnd_filename_pattern' ] = '{hash}'
-        self._dictionary[ 'strings' ][ 'default_suggested_tags_notebook_page' ] = 'related'
-        self._dictionary[ 'strings' ][ 'last_incremental_tagging_namespace' ] = 'page'
-        self._dictionary[ 'strings' ][ 'last_incremental_tagging_prefix' ] = ''
-        self._dictionary[ 'strings' ][ 'last_incremental_tagging_suffix' ] = ''
-        
-        self._dictionary[ 'string_list' ] = {}
-        
-        self._dictionary[ 'string_list' ][ 'default_media_viewer_custom_shortcuts' ] = []
-        self._dictionary[ 'string_list' ][ 'favourite_tags' ] = []
-        self._dictionary[ 'string_list' ][ 'advanced_file_deletion_reasons' ] = [ 'I do not like it.', 'It is bad quality.', 'It is not appropriate for this client.', 'Temporary delete--I want to bring it back later.' ]
+        self._dictionary[ 'string_list' ] = {
+            'default_media_viewer_custom_shortcuts' : [],
+            'favourite_tags' : [],
+            'advanced_file_deletion_reasons' : [ 'I do not like it.', 'It is bad quality.', 'It is not appropriate for this client.', 'Temporary delete--I want to bring it back later.' ]
+        }
         
         #
         
diff --git a/hydrus/client/ClientRendering.py b/hydrus/client/ClientRendering.py
index e7747852..0642d840 100644
--- a/hydrus/client/ClientRendering.py
+++ b/hydrus/client/ClientRendering.py
@@ -45,12 +45,14 @@ def FrameIndexOutOfRange( index, range_start, range_end ):
     
     return False
     
+
 def GenerateHydrusBitmap( path, mime, compressed = True ):
     
-    numpy_image = ClientImageHandling.GenerateNumPyImage( path, mime )
+    numpy_image = HydrusImageHandling.GenerateNumPyImage( path, mime )
     
     return GenerateHydrusBitmapFromNumPyImage( numpy_image, compressed = compressed )
     
+
 def GenerateHydrusBitmapFromNumPyImage( numpy_image, compressed = True ):
     
     ( y, x, depth ) = numpy_image.shape
@@ -247,7 +249,7 @@ class ImageRenderer( ClientCachesBase.CacheableObject ):
         
         try:
             
-            self._numpy_image = ClientImageHandling.GenerateNumPyImage( self._path, self._mime )
+            self._numpy_image = HydrusImageHandling.GenerateNumPyImage( self._path, self._mime )
             
         except Exception as e:
             
diff --git a/hydrus/client/caches/ClientCaches.py b/hydrus/client/caches/ClientCaches.py
index 3c7e9f29..9a85f215 100644
--- a/hydrus/client/caches/ClientCaches.py
+++ b/hydrus/client/caches/ClientCaches.py
@@ -374,7 +374,7 @@ class ThumbnailCache( object ):
             
             thumbnail_mime = HydrusFileHandling.GetThumbnailMime( thumbnail_path )
             
-            numpy_image = ClientImageHandling.GenerateNumPyImage( thumbnail_path, thumbnail_mime )
+            numpy_image = HydrusImageHandling.GenerateNumPyImage( thumbnail_path, thumbnail_mime )
             
         except Exception as e:
             
@@ -394,7 +394,7 @@ class ThumbnailCache( object ):
             
             try:
                 
-                numpy_image = ClientImageHandling.GenerateNumPyImage( thumbnail_path, thumbnail_mime )
+                numpy_image = HydrusImageHandling.GenerateNumPyImage( thumbnail_path, thumbnail_mime )
                 
             except Exception as e:
                 
@@ -645,7 +645,7 @@ class ThumbnailCache( object ):
             
             for ( mime, thumbnail_path ) in HydrusFileHandling.mimes_to_default_thumbnail_paths.items():
                 
-                numpy_image = ClientImageHandling.GenerateNumPyImage( thumbnail_path, HC.IMAGE_PNG )
+                numpy_image = HydrusImageHandling.GenerateNumPyImage( thumbnail_path, HC.IMAGE_PNG )
                 
                 numpy_image_resolution = HydrusImageHandling.GetResolutionNumPy( numpy_image )
                 
diff --git a/hydrus/client/db/ClientDB.py b/hydrus/client/db/ClientDB.py
index 7b90e8f8..16ae59af 100644
--- a/hydrus/client/db/ClientDB.py
+++ b/hydrus/client/db/ClientDB.py
@@ -69,6 +69,7 @@ from hydrus.client.db import ClientDBTagSearch
 from hydrus.client.db import ClientDBTagSiblings
 from hydrus.client.db import ClientDBTagSuggestions
 from hydrus.client.db import ClientDBURLMap
+from hydrus.client.duplicates import ClientDuplicates
 from hydrus.client.importing import ClientImportFiles
 from hydrus.client.interfaces import ClientControllerInterface
 from hydrus.client.media import ClientMediaManagers
@@ -1829,7 +1830,7 @@ class DB( HydrusDB.HydrusDB ):
             
             with self._MakeTemporaryIntegerTable( [], 'hash_id' ) as temp_table_name_2:
                 
-                if dupe_search_type == CC.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES:
+                if dupe_search_type == ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES:
                     
                     query_hash_ids_1 = set( self.modules_files_query.PopulateSearchIntoTempTable( file_search_context_1, temp_table_name_1 ) )
                     query_hash_ids_2 = set( self.modules_files_query.PopulateSearchIntoTempTable( file_search_context_2, temp_table_name_2 ) )
@@ -1850,7 +1851,7 @@ class DB( HydrusDB.HydrusDB ):
                         
                         query_hash_ids = set( self.modules_files_query.PopulateSearchIntoTempTable( file_search_context_1, temp_table_name_1 ) )
                         
-                        if dupe_search_type == CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH:
+                        if dupe_search_type == ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH:
                             
                             chosen_allowed_hash_ids = query_hash_ids
                             comparison_allowed_hash_ids = query_hash_ids
@@ -1967,7 +1968,7 @@ class DB( HydrusDB.HydrusDB ):
             
             with self._MakeTemporaryIntegerTable( [], 'hash_id' ) as temp_table_name_2:
                 
-                if dupe_search_type == CC.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES:
+                if dupe_search_type == ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES:
                     
                     query_hash_ids_1 = set( self.modules_files_query.PopulateSearchIntoTempTable( file_search_context_1, temp_table_name_1 ) )
                     query_hash_ids_2 = set( self.modules_files_query.PopulateSearchIntoTempTable( file_search_context_2, temp_table_name_2 ) )
@@ -1988,7 +1989,7 @@ class DB( HydrusDB.HydrusDB ):
                         
                         query_hash_ids = set( self.modules_files_query.PopulateSearchIntoTempTable( file_search_context_1, temp_table_name_1 ) )
                         
-                        if dupe_search_type == CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH:
+                        if dupe_search_type == ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH:
                             
                             # both chosen and comparison must be in the search, no king selection nonsense allowed
                             chosen_allowed_hash_ids = query_hash_ids
@@ -2155,7 +2156,7 @@ class DB( HydrusDB.HydrusDB ):
             
             with self._MakeTemporaryIntegerTable( [], 'hash_id' ) as temp_table_name_2:
                 
-                if dupe_search_type == CC.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES:
+                if dupe_search_type == ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES:
                     
                     self.modules_files_query.PopulateSearchIntoTempTable( file_search_context_1, temp_table_name_1 )
                     self.modules_files_query.PopulateSearchIntoTempTable( file_search_context_2, temp_table_name_2 )
@@ -2172,7 +2173,7 @@ class DB( HydrusDB.HydrusDB ):
                         
                         self.modules_files_query.PopulateSearchIntoTempTable( file_search_context_1, temp_table_name_1 )
                         
-                        if dupe_search_type == CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH:
+                        if dupe_search_type == ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH:
                             
                             table_join = self.modules_files_duplicates.GetPotentialDuplicatePairsTableJoinOnSearchResultsBothFiles( temp_table_name_1, pixel_dupes_preference, max_hamming_distance )
                             
@@ -2791,7 +2792,7 @@ class DB( HydrusDB.HydrusDB ):
         return boned_stats
         
         # TODO: fix this, it takes ages sometimes IRL
-        table_join = self.modules_files_duplicates.GetPotentialDuplicatePairsTableJoinOnSearchResults( db_location_context, current_files_table_name, CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED, max_hamming_distance = 8 )
+        table_join = self.modules_files_duplicates.GetPotentialDuplicatePairsTableJoinOnSearchResults( db_location_context, current_files_table_name, ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED, max_hamming_distance = 8 )
         
         ( total_potential_pairs, ) = self._Execute( f'SELECT COUNT( * ) FROM ( SELECT DISTINCT smaller_media_id, larger_media_id FROM {table_join} );' ).fetchone()
         
@@ -6807,6 +6808,7 @@ class DB( HydrusDB.HydrusDB ):
         elif action == 'tag_display_application': result = self.modules_tag_display.GetApplication( *args, **kwargs )
         elif action == 'tag_display_maintenance_status': result = self._CacheTagDisplayGetApplicationStatusNumbers( *args, **kwargs )
         elif action == 'tag_parents': result = self.modules_tag_parents.GetTagParents( *args, **kwargs )
+        elif action == 'tag_predicates': result = self.modules_tag_search.GetTagPredicates( *args, **kwargs )
         elif action == 'tag_siblings': result = self.modules_tag_siblings.GetTagSiblings( *args, **kwargs )
         elif action == 'tag_siblings_all_ideals': result = self.modules_tag_siblings.GetTagSiblingsIdeals( *args, **kwargs )
         elif action == 'tag_display_decorators': result = self.modules_tag_display.GetUIDecorators( *args, **kwargs )
@@ -10321,6 +10323,55 @@ class DB( HydrusDB.HydrusDB ):
                 
             
         
+        if version == 574:
+            
+            try:
+                
+                domain_manager = self.modules_serialisable.GetJSONDump( HydrusSerialisable.SERIALISABLE_TYPE_NETWORK_DOMAIN_MANAGER )
+                
+                domain_manager.Initialise()
+                
+                domain_manager.OverwriteDefaultParsers( [
+                    'danbooru file page parser - get webm ugoira',
+                    'danbooru file page parser'
+                ] )
+                
+                parsers = domain_manager.GetParsers()
+                
+                parser_names = { parser.GetName() for parser in parsers }
+                
+                # checking for floog's downloader
+                if 'fxtwitter api status parser' not in parser_names and 'vxtwitter api status parser' not in parser_names:
+                    
+                    domain_manager.OverwriteDefaultURLClasses( [
+                        'vxtwitter tweet',
+                        'vxtwitter api status',
+                        'vxtwitter api status (with username)',
+                        'fixvx tweet',
+                        'fixupx tweet',
+                        'fxtwitter tweet',
+                        'x post'
+                    ] )
+                    
+                
+                #
+                
+                domain_manager.TryToLinkURLClassesAndParsers()
+                
+                #
+                
+                self.modules_serialisable.SetJSONDump( domain_manager )
+                
+            except Exception as e:
+                
+                HydrusData.PrintException( e )
+                
+                message = 'Trying to update some downloaders failed! Please let hydrus dev know!'
+                
+                self.pub_initial_message( message )
+                
+            
+        
         self._controller.frame_splash_status.SetTitleText( 'updated db to v{}'.format( HydrusData.ToHumanInt( version + 1 ) ) )
         
         self._Execute( 'UPDATE version SET version = ?;', ( version + 1, ) )
diff --git a/hydrus/client/db/ClientDBFilesDuplicates.py b/hydrus/client/db/ClientDBFilesDuplicates.py
index edf916c9..79e31406 100644
--- a/hydrus/client/db/ClientDBFilesDuplicates.py
+++ b/hydrus/client/db/ClientDBFilesDuplicates.py
@@ -12,6 +12,7 @@ from hydrus.client.db import ClientDBDefinitionsCache
 from hydrus.client.db import ClientDBFilesStorage
 from hydrus.client.db import ClientDBModule
 from hydrus.client.db import ClientDBSimilarFiles
+from hydrus.client.duplicates import ClientDuplicates
 
 class ClientDBFilesDuplicates( ClientDBModule.ClientDBModule ):
     
@@ -1013,16 +1014,16 @@ class ClientDBFilesDuplicates( ClientDBModule.ClientDBModule ):
         
         join_predicates = [ 'smaller_media_id = duplicate_files_smaller.media_id AND larger_media_id = duplicate_files_larger.media_id' ]
         
-        if pixel_dupes_preference != CC.SIMILAR_FILES_PIXEL_DUPES_REQUIRED:
+        if pixel_dupes_preference != ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_REQUIRED:
             
             join_predicates.append( 'distance <= {}'.format( max_hamming_distance ) )
             
         
-        if pixel_dupes_preference in ( CC.SIMILAR_FILES_PIXEL_DUPES_REQUIRED, CC.SIMILAR_FILES_PIXEL_DUPES_EXCLUDED ):
+        if pixel_dupes_preference in ( ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_REQUIRED, ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_EXCLUDED ):
             
             join_predicate_pixel_dupes = 'duplicate_files_smaller.king_hash_id = pixel_hash_map_smaller.hash_id AND duplicate_files_larger.king_hash_id = pixel_hash_map_larger.hash_id AND pixel_hash_map_smaller.pixel_hash_id = pixel_hash_map_larger.pixel_hash_id'
             
-            if pixel_dupes_preference == CC.SIMILAR_FILES_PIXEL_DUPES_REQUIRED:
+            if pixel_dupes_preference == ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_REQUIRED:
                 
                 tables.extend( [
                     'pixel_hash_map AS pixel_hash_map_smaller',
@@ -1031,7 +1032,7 @@ class ClientDBFilesDuplicates( ClientDBModule.ClientDBModule ):
                 
                 join_predicates.append( join_predicate_pixel_dupes )
                 
-            elif pixel_dupes_preference == CC.SIMILAR_FILES_PIXEL_DUPES_EXCLUDED:
+            elif pixel_dupes_preference == ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_EXCLUDED:
                 
                 # can't do "AND NOT {}", or the join will just give you the million rows where it isn't true. we want 'AND NEVER {}', and quick
                 
diff --git a/hydrus/client/db/ClientDBMappingsCacheSpecificDisplay.py b/hydrus/client/db/ClientDBMappingsCacheSpecificDisplay.py
index d6da1d80..34ebabbc 100644
--- a/hydrus/client/db/ClientDBMappingsCacheSpecificDisplay.py
+++ b/hydrus/client/db/ClientDBMappingsCacheSpecificDisplay.py
@@ -693,6 +693,9 @@ class ClientDBMappingsCacheSpecificDisplay( ClientDBModule.ClientDBModule ):
     
     def RescindPendingMappings( self, file_service_id, tag_service_id, storage_tag_id, hash_ids ):
         
+        # other things imply this tag on display, so we need to check storage to see what else has it
+        statuses_to_table_names = self.modules_mappings_storage.GetFastestStorageMappingTableNames( file_service_id, tag_service_id )
+        
         ( cache_display_current_mappings_table_name, cache_display_pending_mappings_table_name ) = ClientDBMappingsStorage.GenerateSpecificDisplayMappingsCacheTableNames( file_service_id, tag_service_id )
         
         implies_tag_ids = self.modules_tag_display.GetImplies( ClientTags.TAG_DISPLAY_DISPLAY_ACTUAL, tag_service_id, storage_tag_id )
@@ -718,9 +721,6 @@ class ClientDBMappingsCacheSpecificDisplay( ClientDBModule.ClientDBModule ):
                 
             else:
                 
-                # other things imply this tag on display, so we need to check storage to see what else has it
-                statuses_to_table_names = self.modules_mappings_storage.GetFastestStorageMappingTableNames( file_service_id, tag_service_id )
-                
                 mappings_table_name = statuses_to_table_names[ HC.CONTENT_STATUS_PENDING ]
                 
                 with self._MakeTemporaryIntegerTable( other_implied_by_tag_ids, 'tag_id' ) as temp_table_name:
diff --git a/hydrus/client/db/ClientDBMappingsCacheSpecificStorage.py b/hydrus/client/db/ClientDBMappingsCacheSpecificStorage.py
index 83ba6be2..94cdfb22 100644
--- a/hydrus/client/db/ClientDBMappingsCacheSpecificStorage.py
+++ b/hydrus/client/db/ClientDBMappingsCacheSpecificStorage.py
@@ -263,16 +263,25 @@ class ClientDBMappingsCacheSpecificStorage( ClientDBModule.ClientDBModule ):
     
     def AddMappings( self, tag_service_id, tag_id, hash_ids, filtered_hashes_generator: FilteredHashesGenerator ):
         
+        is_local = self.modules_services.GetServiceType( tag_service_id ) == HC.LOCAL_TAG
+        
         for ( file_service_id, filtered_hash_ids ) in filtered_hashes_generator.IterateHashes( hash_ids ):
             
             ( cache_current_mappings_table_name, cache_deleted_mappings_table_name, cache_pending_mappings_table_name ) = ClientDBMappingsStorage.GenerateSpecificMappingsCacheTableNames( file_service_id, tag_service_id )
             
-            # we have to interleave this into the iterator so that if two siblings with the same ideal are pend->currented at once, we remain logic consistent for soletag lookups!
-            self.modules_mappings_cache_specific_display.RescindPendingMappings( file_service_id, tag_service_id, tag_id, filtered_hash_ids )
-            
-            self._ExecuteMany( 'DELETE FROM ' + cache_pending_mappings_table_name + ' WHERE hash_id = ? AND tag_id = ?;', ( ( hash_id, tag_id ) for hash_id in filtered_hash_ids ) )
-            
-            num_pending_rescinded = self._GetRowCount()
+            if is_local:
+                
+                num_pending_rescinded = 0
+                
+            else:
+                
+                # we have to interleave this into the iterator so that if two siblings with the same ideal are pend->currented at once, we remain logic consistent for soletag lookups!
+                self.modules_mappings_cache_specific_display.RescindPendingMappings( file_service_id, tag_service_id, tag_id, filtered_hash_ids )
+                
+                self._ExecuteMany( 'DELETE FROM ' + cache_pending_mappings_table_name + ' WHERE hash_id = ? AND tag_id = ?;', ( ( hash_id, tag_id ) for hash_id in filtered_hash_ids ) )
+                
+                num_pending_rescinded = self._GetRowCount()
+                
             
             #
             
@@ -595,8 +604,6 @@ class ClientDBMappingsCacheSpecificStorage( ClientDBModule.ClientDBModule ):
             
             ( cache_current_mappings_table_name, cache_deleted_mappings_table_name, cache_pending_mappings_table_name ) = ClientDBMappingsStorage.GenerateSpecificMappingsCacheTableNames( file_service_id, tag_service_id )
             
-            ac_counts = collections.Counter()
-            
             self.modules_mappings_cache_specific_display.RescindPendingMappings( file_service_id, tag_service_id, tag_id, filtered_hash_ids )
             
             self._ExecuteMany( 'DELETE FROM ' + cache_pending_mappings_table_name + ' WHERE hash_id = ? AND tag_id = ?;', ( ( hash_id, tag_id ) for hash_id in filtered_hash_ids ) )
diff --git a/hydrus/client/db/ClientDBTagSearch.py b/hydrus/client/db/ClientDBTagSearch.py
index 0eadbc55..1c6a8b6b 100644
--- a/hydrus/client/db/ClientDBTagSearch.py
+++ b/hydrus/client/db/ClientDBTagSearch.py
@@ -1295,6 +1295,84 @@ class ClientDBTagSearch( ClientDBModule.ClientDBModule ):
         return final_result_tag_ids
         
     
+    def GetTagIdPredicates(
+        self,
+        tag_display_type: int,
+        file_search_context: ClientSearch.FileSearchContext,
+        tag_ids: typing.Collection[ int ],
+        inclusive = True,
+        zero_count_ok = False,
+        job_status = None
+    ):
+        
+        all_predicates = []
+        
+        tag_context = file_search_context.GetTagContext()
+        
+        display_tag_service_id = self.modules_services.GetServiceId( tag_context.display_service_key )
+        
+        include_current = tag_context.include_current_tags
+        include_pending = tag_context.include_pending_tags
+        
+        file_search_context_branch = self.modules_services.GetFileSearchContextBranch( file_search_context )
+        
+        for leaf in file_search_context_branch.IterateLeaves():
+            
+            domain_is_cross_referenced = leaf.file_service_id != self.modules_services.combined_deleted_file_service_id
+            
+            for group_of_tag_ids in HydrusData.SplitIteratorIntoChunks( tag_ids, 1000 ):
+                
+                if job_status is not None and job_status.IsCancelled():
+                    
+                    return []
+                    
+                
+                ids_to_count = self.modules_mappings_counts.GetCounts( tag_display_type, leaf.tag_service_id, leaf.file_service_id, group_of_tag_ids, include_current, include_pending, domain_is_cross_referenced = domain_is_cross_referenced, zero_count_ok = zero_count_ok, job_status = job_status )
+                
+                if len( ids_to_count ) == 0:
+                    
+                    continue
+                    
+                
+                #
+                
+                predicates = self.modules_tag_display.GeneratePredicatesFromTagIdsAndCounts( tag_display_type, display_tag_service_id, ids_to_count, inclusive, job_status = job_status )
+                
+                all_predicates.extend( predicates )
+                
+            
+            if job_status is not None and job_status.IsCancelled():
+                
+                return []
+                
+            
+        
+        predicates = ClientSearch.MergePredicates( all_predicates )
+        
+        return predicates
+        
+    
+    def GetTagPredicates(
+        self,
+        tag_display_type: int,
+        file_search_context: ClientSearch.FileSearchContext,
+        tags: typing.Collection[ str ],
+        inclusive = True,
+        zero_count_ok = False,
+        job_status = None
+    ):
+        
+        tag_ids = set( self.modules_tags.GetTagIdsToTags( tags = tags ).keys() )
+        
+        return self.GetTagIdPredicates(
+            tag_display_type,
+            file_search_context,
+            tag_ids,
+            inclusive = inclusive,
+            zero_count_ok = zero_count_ok,
+            job_status = job_status )
+        
+    
     def GetTagsTableName( self, file_service_id, tag_service_id ):
         
         if file_service_id == self.modules_services.combined_file_service_id:
diff --git a/hydrus/client/duplicates/ClientAutoDuplicates.py b/hydrus/client/duplicates/ClientAutoDuplicates.py
new file mode 100644
index 00000000..3cb21934
--- /dev/null
+++ b/hydrus/client/duplicates/ClientAutoDuplicates.py
@@ -0,0 +1,199 @@
+import random
+import threading
+
+from hydrus.core import HydrusSerialisable
+
+from hydrus.client import ClientConstants as CC
+from hydrus.client.duplicates import ClientDuplicates
+
+DUPLICATE_STATUS_DOES_NOT_MATCH_SEARCH = 0
+DUPLICATE_STATUS_MATCHES_SEARCH_BUT_NOT_TESTED = 1
+DUPLICATE_STATUS_MATCHES_SEARCH_FAILED_TEST = 2
+DUPLICATE_STATUS_MATCHES_SEARCH_PASSED_TEST = 3 # presumably this will not be needed much since we'll delete the duplicate pair soon after, but we may as well be careful
+
+class PairComparatorRule( HydrusSerialisable.SerialisableBase ):
+    
+    def Test( self, media_result_better, media_result_worse ):
+        
+        raise NotImplementedError()
+        
+    
+
+LOOKING_AT_BETTER_CANDIDATE = 0
+LOOKING_AT_WORSE_CANDIDATE = 1
+
+class PairComparatorRuleOneFile( PairComparatorRule ):
+    
+    SERIALISABLE_TYPE = HydrusSerialisable.SERIALISABLE_AUTO_DUPLICATES_PAIR_COMPARATOR_RULE_ONE_FILE
+    SERIALISABLE_NAME = 'Auto-Duplicates Pair Comparator Rule - One File'
+    SERIALISABLE_VERSION = 1
+    
+    def __init__( self ):
+        
+        PairComparatorRule.__init__( self )
+        
+        self._looking_at = LOOKING_AT_BETTER_CANDIDATE
+        
+        # ok bro time to get metadata conditional working. first draft will be filetype test for jpeg/png. no need for UI yet
+        self._metadata_conditional = None
+        # what are we testing?
+            # this would be a great place to insert MetadataConditional
+            # mime is jpeg
+            # has icc profile
+            # maybe stuff like filesize > 200KB
+        
+    
+    # serialisable gubbins
+    # get/set
+    
+    def Test( self, media_result_better, media_result_worse ):
+        
+        if self._looking_at == LOOKING_AT_BETTER_CANDIDATE:
+            
+            return self._metadata_conditional.Test( media_result_better )
+            
+        else:
+            
+            return self._metadata_conditional.Test( media_result_worse )
+            
+        
+    
+
+HydrusSerialisable.SERIALISABLE_TYPES_TO_OBJECT_TYPES[ HydrusSerialisable.SERIALISABLE_AUTO_DUPLICATES_PAIR_COMPARATOR_RULE_ONE_FILE ] = PairComparatorRuleOneFile
+
+class PairComparatorRuleTwoFiles( PairComparatorRule ):
+    
+    SERIALISABLE_TYPE = HydrusSerialisable.SERIALISABLE_AUTO_DUPLICATES_PAIR_COMPARATOR_RULE_TWO_FILES
+    SERIALISABLE_NAME = 'Auto-Duplicates Pair Comparator Rule - Two Files'
+    SERIALISABLE_VERSION = 1
+    
+    def __init__( self ):
+        
+        PairComparatorRule.__init__( self )
+        
+        # if I am feeling big brain, isn't this just a dynamic one-file metadata conditional?
+            # if we want 4x size, then we just pull the size of A and ask if B is <0.25x that or whatever. we don't need a clever two-file MetadataConditional test
+        # so, this guy should yeah just store two or three simple enums to handle type, operator, and quantity
+        
+        # property
+            # width
+            # filesize
+            # age
+            # etc..
+        # operator
+            # is more than 4x larger
+            # is at least x absolute value larger?
+        
+    
+    # serialisable gubbins
+    # get/set
+    
+    def Test( self, media_result_better, media_result_worse ):
+        
+        pass
+        
+    
+
+HydrusSerialisable.SERIALISABLE_TYPES_TO_OBJECT_TYPES[ HydrusSerialisable.SERIALISABLE_AUTO_DUPLICATES_PAIR_COMPARATOR_RULE_TWO_FILES ] = PairComparatorRuleTwoFiles
+
+class PairSelectorAndComparator( HydrusSerialisable.SerialisableBase ):
+    
+    SERIALISABLE_TYPE = HydrusSerialisable.SERIALISABLE_AUTO_DUPLICATES_PAIR_SELECTOR_AND_COMPARATOR
+    SERIALISABLE_NAME = 'Auto-Duplicates Pair Selector and Comparator'
+    SERIALISABLE_VERSION = 1
+    
+    def __init__( self ):
+        
+        HydrusSerialisable.SerialisableBase.__init__( self )
+        
+        self._rules = HydrusSerialisable.SerialisableList()
+        
+    
+    # serialisable gubbins
+    # get/set
+    
+    def GetMatchingMedia( self, media_result_1, media_result_2 ):
+        
+        pair = [ media_result_1, media_result_2 ]
+        
+        # just in case both match
+        random.shuffle( pair )
+        
+        ( media_result_1, media_result_2 ) = pair
+        
+        if False not in ( rule.Test( media_result_1, media_result_2 ) for rule in self._rules ):
+            
+            return media_result_1
+            
+        elif False not in ( rule.Test( media_result_2, media_result_1 ) for rule in self._rules ):
+            
+            return media_result_2
+            
+        else:
+            
+            return None
+            
+        
+    
+
+HydrusSerialisable.SERIALISABLE_TYPES_TO_OBJECT_TYPES[ HydrusSerialisable.SERIALISABLE_AUTO_DUPLICATES_PAIR_SELECTOR_AND_COMPARATOR ] = PairSelectorAndComparator
+
+class AutoDuplicatesRule( HydrusSerialisable.SerialisableBaseNamed ):
+    
+    SERIALISABLE_TYPE = HydrusSerialisable.SERIALISABLE_AUTO_DUPLICATES_RULE
+    SERIALISABLE_NAME = 'Auto-Duplicates Rule'
+    SERIALISABLE_VERSION = 1
+    
+    def __init__( self, name ):
+        
+        HydrusSerialisable.SerialisableBaseNamed.__init__( self, name )
+        
+        self._id = -1
+        
+        # maybe make this search part into its own object? in ClientDuplicates
+        # could wangle duplicate pages and client api dupe stuff to work in the same guy, great idea
+        self._file_search_context_1 = None
+        self._file_search_context_2 = None
+        self._dupe_search_type = ClientDuplicates.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH
+        self._pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        self._max_hamming_distance = 4
+        
+        self._selector_and_comparator = None
+        
+        # action info
+            # set as better
+            # delete the other one
+            # optional custom merge options
+        
+    
+    # serialisable gubbins
+    # get/set
+    # 'here's a pair of media results, pass/fail?'
+    
+
+HydrusSerialisable.SERIALISABLE_TYPES_TO_OBJECT_TYPES[ HydrusSerialisable.SERIALISABLE_AUTO_DUPLICATES_RULE ] = AutoDuplicatesRule
+
+class AutoDuplicatesManager( object ):
+    
+    my_instance = None
+    
+    def __init__( self ):
+        
+        AutoDuplicatesManager.my_instance = self
+        
+        # my rules, start with empty and then load from db or whatever on controller init
+        
+        self._lock = threading.Lock()
+        
+    
+    @staticmethod
+    def instance() -> 'AutoDuplicatesManager':
+        
+        if AutoDuplicatesManager.my_instance is None:
+            
+            AutoDuplicatesManager()
+            
+        
+        return AutoDuplicatesManager.my_instance
+        
+    
diff --git a/hydrus/client/ClientDuplicates.py b/hydrus/client/duplicates/ClientDuplicates.py
similarity index 98%
rename from hydrus/client/ClientDuplicates.py
rename to hydrus/client/duplicates/ClientDuplicates.py
index 0a82c453..a1beb9bb 100644
--- a/hydrus/client/ClientDuplicates.py
+++ b/hydrus/client/duplicates/ClientDuplicates.py
@@ -23,6 +23,24 @@ from hydrus.client.media import ClientMediaFileFilter
 from hydrus.client.metadata import ClientContentUpdates
 from hydrus.client.metadata import ClientTags
 
+DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH = 0
+DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH = 1
+DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES = 2
+
+SIMILAR_FILES_PIXEL_DUPES_REQUIRED = 0
+SIMILAR_FILES_PIXEL_DUPES_ALLOWED = 1
+SIMILAR_FILES_PIXEL_DUPES_EXCLUDED = 2
+
+similar_files_pixel_dupes_string_lookup = {
+    SIMILAR_FILES_PIXEL_DUPES_REQUIRED : 'must be pixel dupes',
+    SIMILAR_FILES_PIXEL_DUPES_ALLOWED : 'can be pixel dupes',
+    SIMILAR_FILES_PIXEL_DUPES_EXCLUDED : 'must not be pixel dupes'
+}
+
+SYNC_ARCHIVE_NONE = 0
+SYNC_ARCHIVE_IF_ONE_DO_BOTH = 1
+SYNC_ARCHIVE_DO_BOTH_REGARDLESS = 2
+
 hashes_to_jpeg_quality = {}
 
 def GetDuplicateComparisonScore( shown_media, comparison_media ):
@@ -423,40 +441,25 @@ def GetDuplicateComparisonStatements( shown_media, comparison_media ):
         
         global hashes_to_jpeg_quality
         
-        if s_hash not in hashes_to_jpeg_quality:
+        for jpeg_hash in ( s_hash, c_hash ): 
             
-            path = CG.client_controller.client_files_manager.GetFilePath( s_hash, s_mime )
-            
-            try:
+            if jpeg_hash not in hashes_to_jpeg_quality:
                 
-                raw_pil_image = HydrusImageOpening.RawOpenPILImage( path )
+                path = CG.client_controller.client_files_manager.GetFilePath( jpeg_hash, HC.IMAGE_JPEG )
                 
-                result = HydrusImageMetadata.GetJPEGQuantizationQualityEstimate( raw_pil_image )
+                try:
+                    
+                    raw_pil_image = HydrusImageOpening.RawOpenPILImage( path )
+                    
+                    result = HydrusImageMetadata.GetJPEGQuantizationQualityEstimate( raw_pil_image )
+                    
+                except:
+                    
+                    result = ( 'unknown', None )
+                    
                 
-            except:
+                hashes_to_jpeg_quality[ jpeg_hash ] = result
                 
-                result = ( 'unknown', None )
-                
-            
-            hashes_to_jpeg_quality[ s_hash ] = result
-            
-        
-        if c_hash not in hashes_to_jpeg_quality:
-            
-            path = CG.client_controller.client_files_manager.GetFilePath( c_hash, c_mime )
-            
-            try:
-                
-                raw_pil_image = HydrusImageOpening.RawOpenPILImage( path )
-                
-                result = HydrusImageMetadata.GetJPEGQuantizationQualityEstimate( raw_pil_image )
-                
-            except:
-                
-                result = ( 'unknown', None )
-                
-            
-            hashes_to_jpeg_quality[ c_hash ] = result
             
         
         ( s_label, s_jpeg_quality ) = hashes_to_jpeg_quality[ s_hash ]
@@ -785,10 +788,6 @@ class DuplicatesManager( object ):
         
     
 
-SYNC_ARCHIVE_NONE = 0
-SYNC_ARCHIVE_IF_ONE_DO_BOTH = 1
-SYNC_ARCHIVE_DO_BOTH_REGARDLESS = 2
-
 def get_updated_domain_modified_timestamp_datas( destination_media: ClientMedia.MediaSingleton, source_media: ClientMedia.MediaSingleton, urls: typing.Collection[ str ] ):
     
     from hydrus.client.networking import ClientNetworkingFunctions
diff --git a/hydrus/client/duplicates/__init__.py b/hydrus/client/duplicates/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/hydrus/client/gui/ClientGUI.py b/hydrus/client/gui/ClientGUI.py
index e33a4444..3e1278db 100644
--- a/hydrus/client/gui/ClientGUI.py
+++ b/hydrus/client/gui/ClientGUI.py
@@ -3459,6 +3459,8 @@ class FrameGUI( CAC.ApplicationCommandProcessorMixin, ClientGUITopLevelWindows.M
         ClientGUIMenus.AppendMenuItem( gui_actions, 'make some popups', 'Throw some varied popups at the message manager, just to check it is working.', self._DebugMakeSomePopups )
         ClientGUIMenus.AppendMenuItem( gui_actions, 'publish some sub files in five seconds', 'Publish some files like a subscription would.', self._controller.CallLater, 5, lambda: CG.client_controller.pub( 'imported_files_to_page', [ HydrusData.GenerateKey() for i in range( 5 ) ], 'example sub files' ) )
         ClientGUIMenus.AppendMenuItem( gui_actions, 'refresh pages menu in five seconds', 'Delayed refresh the pages menu, giving you time to minimise or otherwise alter the client before it arrives.', self._controller.CallLater, 5, self._menu_updater_pages.update )
+        ClientGUIMenus.AppendMenuItem( gui_actions, 'reload current g ui session', 'Reload the current QSS stylesheet.', self._ReloadCurrentGUISession )
+        ClientGUIMenus.AppendMenuItem( gui_actions, 'reload current stylesheet', 'Reload the current QSS stylesheet.', ClientGUIStyle.ReloadStyleSheet )
         ClientGUIMenus.AppendMenuItem( gui_actions, 'reset multi-column list settings to default', 'Reset all multi-column list widths and other display settings to default.', self._DebugResetColumnListManager )
         ClientGUIMenus.AppendMenuItem( gui_actions, 'save \'last session\' gui session', 'Make an immediate save of the \'last session\' gui session. Mostly for testing crashes, where last session is not saved correctly.', self.ProposeSaveGUISession, CC.LAST_SESSION_SESSION_NAME )
         
@@ -5437,6 +5439,42 @@ class FrameGUI( CAC.ApplicationCommandProcessorMixin, ClientGUITopLevelWindows.M
             
         
     
+    def _ReloadCurrentGUISession( self ):
+        
+        name = 'temp_session_slot_for_reload_if_you_see_this_you_can_delete_it'
+        only_changed_page_data = True
+        about_to_save = True
+        
+        session = self._notebook.GetCurrentGUISession( name, only_changed_page_data, about_to_save )
+        
+        self._FleshOutSessionWithCleanDataIfNeeded( self._notebook, name, session )
+        
+        def qt_load():
+            
+            while self._notebook.count() > 0:
+                
+                self._notebook.CloseCurrentPage( polite = False )
+                
+            
+            self._notebook.LoadGUISession( name )
+            
+            self._controller.Write( 'delete_serialisable_named', HydrusSerialisable.SERIALISABLE_TYPE_GUI_SESSION_CONTAINER, name )
+            
+            self._controller.pub( 'notify_new_sessions' )
+            
+            
+        
+        def do_save():
+            
+            CG.client_controller.SaveGUISession( session )
+            
+            CG.client_controller.CallBlockingToQt( self, qt_load )
+            
+        
+        self._controller.CallToThread( do_save )
+        
+        
+    
     def _RepairInvalidTags( self ):
         
         message = 'This will scan all your tags and repair any that are invalid. This might mean taking out unrenderable characters or cleaning up improper whitespace. If there is a tag collision once cleaned, it may add a (1)-style number on the end.'
diff --git a/hydrus/client/gui/ClientGUICore.py b/hydrus/client/gui/ClientGUICore.py
index e9ed98ca..9dec16da 100644
--- a/hydrus/client/gui/ClientGUICore.py
+++ b/hydrus/client/gui/ClientGUICore.py
@@ -53,6 +53,8 @@ class GUICore( QC.QObject ):
     
     def PopupMenu( self, widget: QW.QWidget, menu: QW.QMenu ):
         
+        ClientGUIMenus.RemoveFinalSeparator( menu )
+        
         if HC.PLATFORM_MACOS and widget.window().isModal():
             
             # Ok, seems like Big Sur can't do menus at the moment lmao. it shows the menu but the mouse can't interact with it
diff --git a/hydrus/client/gui/ClientGUIMenus.py b/hydrus/client/gui/ClientGUIMenus.py
index 962b30ef..9144414a 100644
--- a/hydrus/client/gui/ClientGUIMenus.py
+++ b/hydrus/client/gui/ClientGUIMenus.py
@@ -17,6 +17,8 @@ from hydrus.client.gui import ClientGUIFunctions
 
 def AppendMenu( menu, submenu, label ):
     
+    RemoveFinalSeparator( submenu )
+    
     label = SanitiseLabel( label )
     
     submenu.setTitle( label )
@@ -234,6 +236,26 @@ def GetEventCallable( callable, *args, **kwargs ):
     
     return event_callable
     
+    
+def RemoveFinalSeparator( menu: QW.QMenu ):
+    
+    num_items = len( menu.actions() )
+    
+    if num_items > 0:
+        
+        last_item = menu.actions()[-1]
+        
+        # got this once, who knows what happened, so we test for QAction now
+        # 'PySide2.QtGui.QStandardItem' object has no attribute 'isSeparator'
+        if isinstance( last_item, QW.QAction ):
+            
+            if last_item.isSeparator():
+                
+                menu.removeAction( last_item )
+                
+            
+        
+    
 def SanitiseLabel( label: str ) -> str:
     
     if label == '':
diff --git a/hydrus/client/gui/ClientGUIScrolledPanelsEdit.py b/hydrus/client/gui/ClientGUIScrolledPanelsEdit.py
index 62a3b4b3..8908528b 100644
--- a/hydrus/client/gui/ClientGUIScrolledPanelsEdit.py
+++ b/hydrus/client/gui/ClientGUIScrolledPanelsEdit.py
@@ -19,9 +19,9 @@ from hydrus.core import HydrusText
 
 from hydrus.client import ClientApplicationCommand as CAC
 from hydrus.client import ClientConstants as CC
-from hydrus.client import ClientDuplicates
 from hydrus.client import ClientGlobals as CG
 from hydrus.client import ClientTime
+from hydrus.client.duplicates import ClientDuplicates
 from hydrus.client.gui import ClientGUIDialogs
 from hydrus.client.gui import ClientGUIDialogsMessage
 from hydrus.client.gui import ClientGUIDialogsQuick
diff --git a/hydrus/client/gui/ClientGUIScrolledPanelsManagement.py b/hydrus/client/gui/ClientGUIScrolledPanelsManagement.py
index 15cb07ac..d40aa2e7 100644
--- a/hydrus/client/gui/ClientGUIScrolledPanelsManagement.py
+++ b/hydrus/client/gui/ClientGUIScrolledPanelsManagement.py
@@ -4119,6 +4119,15 @@ class ManageOptionsPanel( ClientGUIScrolledPanels.ManagePanel ):
             
             #
             
+            children_panel = ClientGUICommon.StaticBox( self, 'children tags' )
+            
+            self._num_to_show_in_ac_dropdown_children_tab = ClientGUICommon.NoneableSpinCtrl( children_panel, none_phrase = 'show all', min = 1 )
+            tt = 'The "children" tab will show children of the current tag context (usually the list of tags above the autocomplete), ordered by file count. This can quickly get spammy, so I recommend you cull it to a reasonable size.'
+            self._num_to_show_in_ac_dropdown_children_tab.setToolTip( tt )
+            self._num_to_show_in_ac_dropdown_children_tab.SetValue( 20 ) # init default
+            
+            #
+            
             self._expand_parents_on_storage_taglists.setChecked( self._new_options.GetBoolean( 'expand_parents_on_storage_taglists' ) )
             self._expand_parents_on_storage_taglists.setToolTip( ClientGUIFunctions.WrapToolTip( 'This affects taglists in places like the manage tags dialog, where you edit tags as they actually are, and implied parents hang below tags.' ) )
             
@@ -4147,7 +4156,9 @@ class ManageOptionsPanel( ClientGUIScrolledPanels.ManagePanel ):
             
             #
             
-            vbox = QP.VBoxLayout()
+            self._num_to_show_in_ac_dropdown_children_tab.SetValue( self._new_options.GetNoneableInteger( 'num_to_show_in_ac_dropdown_children_tab' ) )
+            
+            #
             
             rows = []
             
@@ -4164,18 +4175,30 @@ class ManageOptionsPanel( ClientGUIScrolledPanels.ManagePanel ):
             
             general_panel.Add( gridbox, CC.FLAGS_EXPAND_SIZER_PERPENDICULAR )
             
-            QP.AddToLayout( vbox, general_panel, CC.FLAGS_EXPAND_PERPENDICULAR )
-            
             #
             
             favourites_panel.Add( favourites_st, CC.FLAGS_EXPAND_PERPENDICULAR )
             favourites_panel.Add( self._favourites, CC.FLAGS_EXPAND_BOTH_WAYS )
             favourites_panel.Add( self._favourites_input )
             
-            QP.AddToLayout( vbox, favourites_panel, CC.FLAGS_EXPAND_BOTH_WAYS )
+            #
+            
+            rows = []
+            
+            rows.append( ( 'How many tags to show in the children tab: ', self._num_to_show_in_ac_dropdown_children_tab ) )
+            
+            gridbox = ClientGUICommon.WrapInGrid( children_panel, rows )
+            
+            children_panel.Add( gridbox, CC.FLAGS_EXPAND_SIZER_PERPENDICULAR )
             
             #
             
+            vbox = QP.VBoxLayout()
+            
+            QP.AddToLayout( vbox, general_panel, CC.FLAGS_EXPAND_PERPENDICULAR )
+            QP.AddToLayout( vbox, favourites_panel, CC.FLAGS_EXPAND_BOTH_WAYS )
+            QP.AddToLayout( vbox, children_panel, CC.FLAGS_EXPAND_PERPENDICULAR )
+            
             self.setLayout( vbox )
             
             #
@@ -4212,6 +4235,10 @@ class ManageOptionsPanel( ClientGUIScrolledPanels.ManagePanel ):
             
             self._new_options.SetStringList( 'favourite_tags', list( self._favourites.GetTags() ) )
             
+            #
+            
+            self._new_options.SetNoneableInteger( 'num_to_show_in_ac_dropdown_children_tab', self._num_to_show_in_ac_dropdown_children_tab.GetValue() )
+            
         
     
     class _TagPresentationPanel( QW.QWidget ):
diff --git a/hydrus/client/gui/ClientGUIStyle.py b/hydrus/client/gui/ClientGUIStyle.py
index d93c5f05..7049d7b8 100644
--- a/hydrus/client/gui/ClientGUIStyle.py
+++ b/hydrus/client/gui/ClientGUIStyle.py
@@ -15,6 +15,7 @@ ORIGINAL_STYLE_NAME = None
 CURRENT_STYLE_NAME = None
 ORIGINAL_STYLESHEET = None
 CURRENT_STYLESHEET = None
+CURRENT_STYLESHEET_FILENAME = None
 
 def ClearStylesheet():
     
@@ -88,6 +89,18 @@ def InitialiseDefaults():
     CURRENT_STYLESHEET = ORIGINAL_STYLESHEET
     
 
+def ReloadStyleSheet():
+    
+    ClearStylesheet()
+    
+    if CURRENT_STYLESHEET_FILENAME is not None:
+        
+        ClearStylesheet()
+        
+        SetStylesheetFromPath( CURRENT_STYLESHEET_FILENAME )
+        
+    
+
 def SetStyleFromName( name: str ):
     
     if QtInit.WE_ARE_QT5:
@@ -116,7 +129,6 @@ def SetStyleFromName( name: str ):
     except Exception as e:
         
         raise HydrusExceptions.DataMissing( 'Style "{}" could not be generated/applied. If this is the default, perhaps a third-party custom style, you may have to restart the client to re-set it. Extra error info: {}'.format( name, e ) )
-            
         
     
 
@@ -143,6 +155,10 @@ def SetStyleSheet( stylesheet, prepend_hydrus = True ):
 
 def SetStylesheetFromPath( filename ):
     
+    global CURRENT_STYLESHEET_FILENAME
+    
+    CURRENT_STYLESHEET_FILENAME = filename
+    
     path = os.path.join( STYLESHEET_DIR, filename )
     
     if not os.path.exists( path ):
diff --git a/hydrus/client/gui/ClientGUISubscriptions.py b/hydrus/client/gui/ClientGUISubscriptions.py
index 549be06f..9836238f 100644
--- a/hydrus/client/gui/ClientGUISubscriptions.py
+++ b/hydrus/client/gui/ClientGUISubscriptions.py
@@ -1,4 +1,5 @@
 import collections
+import itertools
 import os
 import threading
 import time
@@ -39,6 +40,36 @@ from hydrus.client.importing import ClientImportSubscriptions
 from hydrus.client.importing import ClientImportSubscriptionQuery
 from hydrus.client.importing import ClientImportSubscriptionLegacy # keep this here so the serialisable stuff is registered, it has to be imported somewhere
 
+def DoAliveOrDeadCheck( win: QW.QWidget, query_headers: typing.Collection[ ClientImportSubscriptionQuery.SubscriptionQueryHeader ] ):
+    
+    do_alive = True
+    do_dead = True
+    
+    num_dead = sum( ( 1 for query_header in query_headers if query_header.IsDead() ) )
+    
+    if 0 < num_dead < len( query_headers ):
+        
+        message = f'Of the {HydrusData.ToHumanInt(len(query_headers))} selected queries, {HydrusData.ToHumanInt(num_dead)} are DEAD. Which queries do you want to check?'
+        
+        choice_tuples = [
+            ( f'all of them', ( True, True ), 'Resuscitate the DEAD queries and check everything.' ),
+            ( f'the {HydrusData.ToHumanInt(len(query_headers)-num_dead)} ALIVE', ( True, False ), 'Check the ALIVE queries.' ),
+            ( f'the {HydrusData.ToHumanInt(num_dead)} DEAD', ( False, True ), 'Resuscitate the DEAD queries and check them.' )
+        ]
+        
+        try:
+            
+            ( do_alive, do_dead ) = ClientGUIDialogsQuick.SelectFromListButtons( win, 'Check which?', choice_tuples, message = message )
+            
+        except HydrusExceptions.CancelledException:
+            
+            raise
+            
+        
+    
+    return ( do_alive, do_dead )
+    
+
 def GetQueryHeadersQualityInfo( query_headers: typing.Iterable[ ClientImportSubscriptionQuery.SubscriptionQueryHeader ] ):
     
     data = []
@@ -403,14 +434,38 @@ class EditSubscriptionPanel( ClientGUIScrolledPanels.EditPanel ):
     
     def _CheckNow( self ):
         
-        selected_queries = self._query_headers.GetData( only_selected = True )
+        selected_query_headers = self._query_headers.GetData( only_selected = True )
         
-        for query_header in selected_queries:
+        try:
+            
+            ( do_alive, do_dead ) = DoAliveOrDeadCheck( self, selected_query_headers )
+            
+        except HydrusExceptions.CancelledException:
+            
+            return
+            
+        
+        for query_header in selected_query_headers:
+            
+            if query_header.IsDead():
+                
+                if not do_dead:
+                    
+                    continue
+                    
+                
+            else:
+                
+                if not do_alive:
+                    
+                    continue
+                    
+                
             
             query_header.CheckNow()
             
         
-        self._query_headers.UpdateDatas( selected_queries )
+        self._query_headers.UpdateDatas( selected_query_headers )
         
         self._query_headers.Sort()
         
@@ -2060,9 +2115,49 @@ class EditSubscriptionsPanel( ClientGUIScrolledPanels.EditPanel ):
         
         subscriptions = self._subscriptions.GetData( only_selected = True )
         
+        query_headers = HydrusData.MassExtend( ( subscription.GetQueryHeaders() for subscription in subscriptions ) )
+        
+        try:
+            
+            ( do_alive, do_dead ) = DoAliveOrDeadCheck( self, query_headers )
+            
+        except HydrusExceptions.CancelledException:
+            
+            return
+            
+        
         for subscription in subscriptions:
             
-            subscription.CheckNow()
+            we_did_some = False
+            
+            query_headers = subscription.GetQueryHeaders()
+            
+            for query_header in query_headers:
+                
+                if query_header.IsDead():
+                    
+                    if not do_dead:
+                        
+                        continue
+                        
+                    
+                else:
+                    
+                    if not do_alive:
+                        
+                        continue
+                        
+                    
+                
+                query_header.CheckNow()
+                
+                we_did_some = True
+                
+            
+            if we_did_some:
+                
+                subscription.ScrubDelay()
+                
             
         
         self._subscriptions.UpdateDatas( subscriptions )
diff --git a/hydrus/client/gui/canvas/ClientGUICanvas.py b/hydrus/client/gui/canvas/ClientGUICanvas.py
index b32f4b57..fa049f2c 100644
--- a/hydrus/client/gui/canvas/ClientGUICanvas.py
+++ b/hydrus/client/gui/canvas/ClientGUICanvas.py
@@ -14,9 +14,9 @@ from hydrus.core import HydrusTime
 from hydrus.client import ClientApplicationCommand as CAC
 from hydrus.client import ClientConstants as CC
 from hydrus.client import ClientData
-from hydrus.client import ClientDuplicates
 from hydrus.client import ClientGlobals as CG
 from hydrus.client import ClientLocation
+from hydrus.client.duplicates import ClientDuplicates
 from hydrus.client.gui import ClientGUICore as CGC
 from hydrus.client.gui import ClientGUIDialogs
 from hydrus.client.gui import ClientGUIDialogsManage
diff --git a/hydrus/client/gui/canvas/ClientGUICanvasHoverFrames.py b/hydrus/client/gui/canvas/ClientGUICanvasHoverFrames.py
index 999302d3..5532a309 100644
--- a/hydrus/client/gui/canvas/ClientGUICanvasHoverFrames.py
+++ b/hydrus/client/gui/canvas/ClientGUICanvasHoverFrames.py
@@ -12,8 +12,8 @@ from hydrus.core import HydrusSerialisable
 from hydrus.client import ClientApplicationCommand as CAC
 from hydrus.client import ClientConstants as CC
 from hydrus.client import ClientData
-from hydrus.client import ClientDuplicates
 from hydrus.client import ClientGlobals as CG
+from hydrus.client.duplicates import ClientDuplicates
 from hydrus.client.gui import ClientGUIDragDrop
 from hydrus.client.gui import ClientGUICore as CGC
 from hydrus.client.gui import ClientGUIFunctions
diff --git a/hydrus/client/gui/importing/ClientGUIImportOptions.py b/hydrus/client/gui/importing/ClientGUIImportOptions.py
index 84164da2..59bfdf83 100644
--- a/hydrus/client/gui/importing/ClientGUIImportOptions.py
+++ b/hydrus/client/gui/importing/ClientGUIImportOptions.py
@@ -312,6 +312,8 @@ class EditFileImportOptionsPanel( ClientGUIScrolledPanels.EditPanel ):
         QP.AddToLayout( vbox, self._load_default_options, CC.FLAGS_EXPAND_PERPENDICULAR )
         QP.AddToLayout( vbox, self._specific_options_panel, CC.FLAGS_EXPAND_BOTH_WAYS )
         
+        vbox.addStretch( 1 )
+        
         self.widget().setLayout( vbox )
         
         self._destination_location_context.locationChanged.connect( self._UpdateLocationText )
diff --git a/hydrus/client/gui/lists/ClientGUIListBoxes.py b/hydrus/client/gui/lists/ClientGUIListBoxes.py
index 2cad749d..4e6ca6a1 100644
--- a/hydrus/client/gui/lists/ClientGUIListBoxes.py
+++ b/hydrus/client/gui/lists/ClientGUIListBoxes.py
@@ -1989,6 +1989,8 @@ class ListBox( QW.QScrollArea ):
     
     def _SetVirtualSize( self ):
         
+        # this triggers an update of the scrollbars, maybe important if this is the first time the thing is shown, let's see if it helps our missing scrollbar issue
+        # I think this is needed here for PySide2 and a/c dropdowns, help
         self.setWidgetResizable( True )
         
         my_size = self.widget().size()
@@ -1997,10 +1999,18 @@ class ListBox( QW.QScrollArea ):
         
         ideal_virtual_size = QC.QSize( my_size.width(), text_height * self._total_positional_rows )
         
+        if HG.gui_report_mode:
+            
+            HydrusData.ShowText( f'Setting a virtual size on {self}. Num terms: {len( self._ordered_terms)}, Text height: {text_height}, Total Positional Rows: {self._total_positional_rows}, My Height: {my_size.height()}, Ideal Height: {ideal_virtual_size.height()}' )
+            
+        
         if ideal_virtual_size != my_size:
             
             self.widget().setMinimumSize( ideal_virtual_size )
             
+            # this triggers an update of the scrollbars, maybe important if this is the first time the thing is shown, let's see if it helps our missing scrollbar issue
+            self.setWidgetResizable( True )
+            
         
     
     def _Sort( self ):
diff --git a/hydrus/client/gui/pages/ClientGUIManagementController.py b/hydrus/client/gui/pages/ClientGUIManagementController.py
index 66d4837d..efd2fc46 100644
--- a/hydrus/client/gui/pages/ClientGUIManagementController.py
+++ b/hydrus/client/gui/pages/ClientGUIManagementController.py
@@ -9,6 +9,7 @@ from hydrus.core import HydrusTime
 from hydrus.client import ClientConstants as CC
 from hydrus.client import ClientGlobals as CG
 from hydrus.client import ClientLocation
+from hydrus.client.duplicates import ClientDuplicates
 from hydrus.client.importing import ClientImportGallery
 from hydrus.client.importing import ClientImportLocal
 from hydrus.client.importing import ClientImportSimpleURLs
@@ -74,8 +75,8 @@ def CreateManagementControllerDuplicateFilter(
     
     management_controller.SetVariable( 'file_search_context_1', file_search_context )
     management_controller.SetVariable( 'file_search_context_2', file_search_context.Duplicate() )
-    management_controller.SetVariable( 'dupe_search_type', CC.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH )
-    management_controller.SetVariable( 'pixel_dupes_preference', CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED )
+    management_controller.SetVariable( 'dupe_search_type', ClientDuplicates.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH )
+    management_controller.SetVariable( 'pixel_dupes_preference', ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED )
     management_controller.SetVariable( 'max_hamming_distance', 4 )
     
     return management_controller
@@ -506,13 +507,13 @@ class ManagementController( HydrusSerialisable.SerialisableBase ):
             
             if management_type == MANAGEMENT_TYPE_DUPLICATE_FILTER:
                 
-                value = CC.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH
+                value = ClientDuplicates.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH
                 
                 if 'both_files_match' in variables:
                     
                     if variables[ 'both_files_match' ]:
                         
-                        value = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+                        value = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
                         
                     
                     del variables[ 'both_files_match' ]
diff --git a/hydrus/client/gui/pages/ClientGUIManagementPanels.py b/hydrus/client/gui/pages/ClientGUIManagementPanels.py
index 09aff2df..898f949c 100644
--- a/hydrus/client/gui/pages/ClientGUIManagementPanels.py
+++ b/hydrus/client/gui/pages/ClientGUIManagementPanels.py
@@ -17,7 +17,6 @@ from hydrus.core.networking import HydrusNetwork
 
 from hydrus.client import ClientConstants as CC
 from hydrus.client import ClientDefaults
-from hydrus.client import ClientDuplicates
 from hydrus.client import ClientGlobals as CG
 from hydrus.client import ClientLocation
 from hydrus.client import ClientParsing
@@ -25,6 +24,7 @@ from hydrus.client import ClientPaths
 from hydrus.client import ClientServices
 from hydrus.client import ClientThreading
 from hydrus.client import ClientTime
+from hydrus.client.duplicates import ClientDuplicates
 from hydrus.client.gui import ClientGUIAsync
 from hydrus.client.gui import ClientGUICore as CGC
 from hydrus.client.gui import ClientGUIDialogs
@@ -549,15 +549,15 @@ class ManagementPanelDuplicateFilter( ManagementPanel ):
         
         self._dupe_search_type = ClientGUICommon.BetterChoice( self._filtering_panel )
         
-        self._dupe_search_type.addItem( 'at least one file matches the search', CC.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH )
-        self._dupe_search_type.addItem( 'both files match the search', CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH )
-        self._dupe_search_type.addItem( 'both files match different searches', CC.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES )
+        self._dupe_search_type.addItem( 'at least one file matches the search', ClientDuplicates.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH )
+        self._dupe_search_type.addItem( 'both files match the search', ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH )
+        self._dupe_search_type.addItem( 'both files match different searches', ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES )
         
         self._pixel_dupes_preference = ClientGUICommon.BetterChoice( self._filtering_panel )
         
-        for p in ( CC.SIMILAR_FILES_PIXEL_DUPES_REQUIRED, CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED, CC.SIMILAR_FILES_PIXEL_DUPES_EXCLUDED ):
+        for p in ( ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_REQUIRED, ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED, ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_EXCLUDED ):
             
-            self._pixel_dupes_preference.addItem( CC.similar_files_pixel_dupes_string_lookup[ p ], p )
+            self._pixel_dupes_preference.addItem( ClientDuplicates.similar_files_pixel_dupes_string_lookup[ p ], p )
             
         
         self._max_hamming_distance_for_filter = ClientGUICommon.BetterSpinBox( self._filtering_panel, min = 0, max = 64 )
@@ -592,7 +592,7 @@ class ManagementPanelDuplicateFilter( ManagementPanel ):
         
         if not management_controller.HasVariable( 'pixel_dupes_preference' ):
             
-            management_controller.SetVariable( 'pixel_dupes_preference', CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED )
+            management_controller.SetVariable( 'pixel_dupes_preference', ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED )
             
         
         self._pixel_dupes_preference.SetValue( management_controller.GetVariable( 'pixel_dupes_preference' ) )
@@ -759,11 +759,11 @@ class ManagementPanelDuplicateFilter( ManagementPanel ):
         
         if optimise_for_search:
             
-            if dupe_search_type == CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH and ( file_search_context_1.IsJustSystemEverything() or file_search_context_1.HasNoPredicates() ):
+            if dupe_search_type == ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH and ( file_search_context_1.IsJustSystemEverything() or file_search_context_1.HasNoPredicates() ):
                 
-                dupe_search_type = CC.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH
+                dupe_search_type = ClientDuplicates.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH
                 
-            elif dupe_search_type == CC.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES:
+            elif dupe_search_type == ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES:
                 
                 if file_search_context_1.IsJustSystemEverything() or file_search_context_1.HasNoPredicates():
                     
@@ -771,11 +771,11 @@ class ManagementPanelDuplicateFilter( ManagementPanel ):
                     file_search_context_1 = file_search_context_2
                     file_search_context_2 = f
                     
-                    dupe_search_type = CC.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH
+                    dupe_search_type = ClientDuplicates.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH
                     
                 elif file_search_context_2.IsJustSystemEverything() or file_search_context_2.HasNoPredicates():
                     
-                    dupe_search_type = CC.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH
+                    dupe_search_type = ClientDuplicates.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH
                     
                 
             
@@ -1027,9 +1027,9 @@ class ManagementPanelDuplicateFilter( ManagementPanel ):
         
         ( file_search_context_1, file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance ) = self._GetDuplicateFileSearchData( optimise_for_search = False )
         
-        self._tag_autocomplete_2.setVisible( dupe_search_type == CC.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES )
+        self._tag_autocomplete_2.setVisible( dupe_search_type == ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES )
         
-        self._max_hamming_distance_for_filter.setEnabled( self._pixel_dupes_preference.GetValue() != CC.SIMILAR_FILES_PIXEL_DUPES_REQUIRED )
+        self._max_hamming_distance_for_filter.setEnabled( self._pixel_dupes_preference.GetValue() != ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_REQUIRED )
         
     
     def FilterDupeSearchTypeChanged( self ):
diff --git a/hydrus/client/gui/pages/ClientGUIPages.py b/hydrus/client/gui/pages/ClientGUIPages.py
index b030f8a5..150181ba 100644
--- a/hydrus/client/gui/pages/ClientGUIPages.py
+++ b/hydrus/client/gui/pages/ClientGUIPages.py
@@ -1973,9 +1973,13 @@ class PagesNotebook( QP.TabWidgetWithDnD ):
                 ClientGUIMenus.AppendMenuItem( menu, 'send pages to the right to a new page of pages', 'Make a new page of pages and put all the pages to the right into it.', self._SendRightPagesToNewNotebook, tab_index )
                 
             
-            if click_over_page_of_pages and page.count() > 0:
+            ClientGUIMenus.AppendSeparator( menu )
+            
+            if not click_over_page_of_pages:
                 
-                ClientGUIMenus.AppendSeparator( menu )
+                ClientGUIMenus.AppendMenuItem( menu, 'refresh this page', 'Command this page to refresh.', page.RefreshQuery )
+                
+            elif click_over_page_of_pages and page.count() > 0:
                 
                 ClientGUIMenus.AppendMenuItem( menu, 'refresh all this page\'s pages', 'Command every page below this one to refresh.', page.RefreshAllPages )
                 
diff --git a/hydrus/client/gui/pages/ClientGUIResults.py b/hydrus/client/gui/pages/ClientGUIResults.py
index de4de2ec..8471e43d 100644
--- a/hydrus/client/gui/pages/ClientGUIResults.py
+++ b/hydrus/client/gui/pages/ClientGUIResults.py
@@ -3286,7 +3286,7 @@ class MediaPanelThumbnails( MediaPanel ):
         
     
     def _UpdateScrollBars( self ):
-
+        
         # The following call is officially a no-op since this property is already true, but it also triggers an update
         # of the scroll area's scrollbars which we need.
         # We need this since we are intercepting & doing work in resize events which causes
diff --git a/hydrus/client/gui/search/ClientGUIACDropdown.py b/hydrus/client/gui/search/ClientGUIACDropdown.py
index 7dcf11f9..7bfd9c3d 100644
--- a/hydrus/client/gui/search/ClientGUIACDropdown.py
+++ b/hydrus/client/gui/search/ClientGUIACDropdown.py
@@ -599,13 +599,13 @@ def WriteFetch(
 
 class ListBoxTagsPredicatesAC( ClientGUIListBoxes.ListBoxTagsPredicates ):
     
-    def __init__( self, parent, callable, service_key, float_mode, **kwargs ):
+    def __init__( self, parent, callable, float_mode, service_key, **kwargs ):
         
         ClientGUIListBoxes.ListBoxTagsPredicates.__init__( self, parent, **kwargs )
         
         self._callable = callable
-        self._service_key = service_key
         self._float_mode = float_mode
+        self._service_key = service_key
         
         self._predicates = {}
         
@@ -676,7 +676,6 @@ class ListBoxTagsPredicatesAC( ClientGUIListBoxes.ListBoxTagsPredicates ):
         if not they_are_the_same:
             
             previously_selected_predicate = None
-            previously_selected_predicate_had_count = False
             
             if len( self._selected_terms ) == 1:
                 
@@ -1534,6 +1533,155 @@ class AutoCompleteDropdown( CAC.ApplicationCommandProcessorMixin, QW.QWidget ):
         self._DropdownHideShow()
         
     
+
+class ChildrenTab( ListBoxTagsPredicatesAC ):
+    
+    def __init__( self, parent: QW.QWidget, broadcast_call, float_mode: bool, location_context: ClientLocation.LocationContext, tag_service_key: bytes, tag_display_type: int = ClientTags.TAG_DISPLAY_DISPLAY_ACTUAL, height_num_chars: int = 4 ):
+        
+        self._location_context = location_context
+        self._tags_to_child_predicates_cache = dict()
+        self._children_need_updating = True
+        
+        ListBoxTagsPredicatesAC.__init__( self, parent, broadcast_call, float_mode, tag_service_key, tag_display_type = tag_display_type, height_num_chars = height_num_chars )
+        
+    
+    def NotifyNeedsUpdating( self ):
+        
+        self._children_need_updating = True
+        
+    
+    def SetLocationContext( self, location_context: ClientLocation.LocationContext ):
+        
+        self._location_context = location_context
+        
+    
+    def SetTagServiceKey( self, service_key: bytes ):
+        
+        ListBoxTagsPredicatesAC.SetTagServiceKey( self, service_key )
+        
+        self._tags_to_child_predicates_cache = dict()
+        
+    
+    def UpdateChildrenIfNeeded( self, context_tags: typing.Collection[ str ] ):
+        
+        if self._children_need_updating:
+            
+            context_tags = set( context_tags )
+            
+            tag_display_type = self._tag_display_type
+            location_context = self._location_context
+            tag_service_key = self._service_key
+            tags_to_child_predicates_cache = dict( self._tags_to_child_predicates_cache )
+            
+            if location_context.IsOneDomain():
+                
+                search_location_context = location_context
+                
+            else:
+                
+                # let's not blat the db on some crazy multi-domain just for this un-numbered list
+                search_location_context = ClientLocation.LocationContext.STATICCreateSimple( CC.COMBINED_TAG_SERVICE_KEY )
+                
+            
+            tag_context = ClientSearch.TagContext( service_key = tag_service_key )
+            
+            file_search_context = ClientSearch.FileSearchContext(
+                location_context = search_location_context,
+                tag_context = tag_context
+            )
+            
+            def work_callable():
+                
+                uncached_context_tags = { tag for tag in context_tags if tag not in tags_to_child_predicates_cache }
+                
+                if len( uncached_context_tags ) > 0:
+                    
+                    new_tags_to_child_tags = CG.client_controller.Read( 'tag_descendants_lookup', tag_service_key, uncached_context_tags )
+                    
+                    new_child_tags = HydrusData.MassUnion( new_tags_to_child_tags.values() )
+                    
+                    child_predicates = CG.client_controller.Read(
+                        'tag_predicates',
+                        tag_display_type,
+                        file_search_context,
+                        new_child_tags,
+                        zero_count_ok = True
+                    )
+                    
+                    child_tags_to_child_predicates = { predicate.GetValue() : predicate for predicate in child_predicates }
+                    
+                    new_tags_to_child_predicates = { tag : { child_tags_to_child_predicates[ child_tag ] for child_tag in child_tags if child_tag in child_tags_to_child_predicates } for ( tag, child_tags ) in new_tags_to_child_tags.items() }
+                    
+                else:
+                    
+                    new_tags_to_child_predicates = dict()
+                    
+                
+                child_predicates = set()
+                
+                for tag in context_tags:
+                    
+                    if tag in tags_to_child_predicates_cache:
+                        
+                        child_predicates.update( tags_to_child_predicates_cache[ tag ] )
+                        
+                    elif tag in new_tags_to_child_predicates:
+                        
+                        child_predicates.update( new_tags_to_child_predicates[ tag ] )
+                        
+                    
+                
+                child_predicates = [ predicate for predicate in child_predicates if predicate.GetValue() not in context_tags ]
+                
+                ClientSearch.SortPredicates( child_predicates )
+                
+                child_predicates = [ predicate.GetCountlessCopy() for predicate in child_predicates ]
+                
+                num_to_show_in_ac_dropdown_children_tab = CG.client_controller.new_options.GetNoneableInteger( 'num_to_show_in_ac_dropdown_children_tab' )
+                
+                if num_to_show_in_ac_dropdown_children_tab is not None:
+                    
+                    child_predicates = child_predicates[ : num_to_show_in_ac_dropdown_children_tab ]
+                    
+                
+                return ( location_context, tag_service_key, child_predicates, new_tags_to_child_predicates )
+                
+            
+            def publish_callable( result ):
+                
+                ( job_location_context, job_tag_service_key, child_predicates, new_tags_to_children ) = result
+                
+                if job_location_context != self._location_context or job_tag_service_key != self._service_key:
+                    
+                    self.SetPredicates( [] )
+                    
+                    return
+                    
+                
+                self._tags_to_child_predicates_cache.update( new_tags_to_children )
+                
+                self.SetPredicates( child_predicates, preserve_single_selection = True )
+                
+                self._children_need_updating = False
+                
+            
+            def errback_callable( etype, value, tb ):
+                
+                self.SetPredicates( [] )
+                
+                self._children_need_updating = False
+                
+                HydrusData.ShowText( 'Trying to load some child tags failed, please send this to hydev:' )
+                HydrusData.ShowExceptionTuple( etype, value, tb, do_wait = False )
+                
+            
+            job = ClientGUIAsync.AsyncQtJob( self, work_callable, publish_callable, errback_callable = errback_callable )
+            
+            job.start()
+            
+        
+    
+
 class AutoCompleteDropdownTags( AutoCompleteDropdown ):
     
     locationChanged = QC.Signal( ClientLocation.LocationContext )
@@ -1569,9 +1717,7 @@ class AutoCompleteDropdownTags( AutoCompleteDropdown ):
         
         self._dropdown_notebook.addTab( self._favourites_list, 'favourites' )
         
-        self._children_list = ListBoxTagsPredicatesAC( self._dropdown_notebook, self.BroadcastChoices, self._float_mode, self._tag_service_key, tag_display_type = ClientTags.TAG_DISPLAY_DISPLAY_ACTUAL, height_num_chars = 4 )
-        self._tags_to_children_cache = dict()
-        self._children_list_needs_updating = True
+        self._children_list = ChildrenTab( self._dropdown_notebook, self.BroadcastChoices, self._float_mode, self._location_context_button.GetValue(), self._tag_service_key, tag_display_type = ClientTags.TAG_DISPLAY_DISPLAY_ACTUAL, height_num_chars = 4 )
         
         self._dropdown_notebook.addTab( self._children_list, 'children' )
         
@@ -1628,6 +1774,10 @@ class AutoCompleteDropdownTags( AutoCompleteDropdown ):
             self._SetTagService( top_local_tag_service_key )
             
         
+        self._children_list.SetLocationContext( location_context )
+        
+        self._NotifyChildrenListNeedsUpdating()
+        
         self.locationChanged.emit( location_context )
         
         self._SetListDirty()
@@ -1635,7 +1785,7 @@ class AutoCompleteDropdownTags( AutoCompleteDropdown ):
     
     def _NotifyChildrenListNeedsUpdating( self ):
         
-        self._children_list_needs_updating = True
+        self._children_list.NotifyNeedsUpdating()
         
         self._UpdateChildrenListIfNeeded()
         
@@ -1737,7 +1887,6 @@ class AutoCompleteDropdownTags( AutoCompleteDropdown ):
         self._favourites_list.SetTagServiceKey( self._tag_service_key )
         self._children_list.SetTagServiceKey( self._tag_service_key )
         
-        self._tags_to_children_cache = dict()
         self._NotifyChildrenListNeedsUpdating()
         
         self.tagServiceChanged.emit( self._tag_service_key )
@@ -1754,83 +1903,9 @@ class AutoCompleteDropdownTags( AutoCompleteDropdown ):
     
     def _UpdateChildrenListIfNeeded( self ):
         
-        if self._children_list_needs_updating and self._dropdown_notebook.currentWidget() == self._children_list:
+        if self._dropdown_notebook.currentWidget() == self._children_list:
             
-            tag_service_key = self._tag_service_key
-            context_tags = set( self._current_context_tags )
-            tags_to_children_cache = dict( self._tags_to_children_cache )
-            
-            def work_callable():
-                
-                uncached_context_tags = { tag for tag in context_tags if tag not in tags_to_children_cache }
-                
-                if len( uncached_context_tags ) > 0:
-                    
-                    new_tags_to_children = CG.client_controller.Read( 'tag_descendants_lookup', tag_service_key, uncached_context_tags )
-                    
-                else:
-                    
-                    new_tags_to_children = dict()
-                    
-                
-                child_tags = set()
-                
-                for tag in context_tags:
-                    
-                    if tag in tags_to_children_cache:
-                        
-                        child_tags.update( tags_to_children_cache[ tag ] )
-                        
-                    elif tag in new_tags_to_children:
-                        
-                        child_tags.update( new_tags_to_children[ tag ] )
-                        
-                    
-                
-                child_tags.difference_update( context_tags )
-                
-                return ( tag_service_key, child_tags, new_tags_to_children )
-                
-            
-            def publish_callable( result ):
-                
-                ( job_tag_service_key, child_tags, new_tags_to_children ) = result
-                
-                if job_tag_service_key != self._tag_service_key:
-                    
-                    self._children_list.SetPredicates( [] )
-                    
-                    return
-                    
-                
-                child_tags = list( child_tags )
-                
-                self._tags_to_children_cache.update( new_tags_to_children )
-                
-                tag_sort = ClientTagSorting.TagSort( sort_type = ClientTagSorting.SORT_BY_HUMAN_TAG, sort_order = CC.SORT_ASC )
-                
-                ClientTagSorting.SortTags( tag_sort, child_tags )
-                
-                predicates = [ ClientSearch.Predicate( ClientSearch.PREDICATE_TYPE_TAG, value = tag ) for tag in child_tags ]
-                
-                self._children_list.SetPredicates( predicates, preserve_single_selection = True )
-                
-                self._children_list_needs_updating = False
-                
-            
-            def errback_callable( etype, value, tb ):
-                
-                self._children_list.SetPredicates( [] )
-                
-                self._children_list_needs_updating = False
-                
-                HydrusData.ShowText( 'Trying to load some child tags failed, please send this to hydev:' )
-                HydrusData.ShowExceptionTuple( etype, value, tb, do_wait = False )
-                
-            
-            job = ClientGUIAsync.AsyncQtJob( self, work_callable, publish_callable, errback_callable = errback_callable )
-            
-            job.start()
+            self._children_list.UpdateChildrenIfNeeded( set( self._current_context_tags ) )
             
         
     
@@ -2292,7 +2367,7 @@ class AutoCompleteDropdownTagsRead( AutoCompleteDropdownTags ):
             height_num_chars = self._fixed_results_list_height
             
         
-        return ListBoxTagsPredicatesAC( self._dropdown_notebook, self.BroadcastChoices, self._tag_service_key, self._float_mode, tag_display_type = ClientTags.TAG_DISPLAY_DISPLAY_ACTUAL, height_num_chars = height_num_chars )
+        return ListBoxTagsPredicatesAC( self._dropdown_notebook, self.BroadcastChoices, self._float_mode, self._tag_service_key, tag_display_type = ClientTags.TAG_DISPLAY_DISPLAY_ACTUAL, height_num_chars = height_num_chars )
         
     
     def _LocationContextJustChanged( self, location_context: ClientLocation.LocationContext ):
@@ -3061,7 +3136,7 @@ class AutoCompleteDropdownTagsWrite( AutoCompleteDropdownTags ):
         
         height_num_chars = CG.client_controller.new_options.GetInteger( 'ac_write_list_height_num_chars' )
         
-        preds_list = ListBoxTagsPredicatesAC( self._dropdown_notebook, self.BroadcastChoices, self._display_tag_service_key, self._float_mode, tag_display_type = ClientTags.TAG_DISPLAY_STORAGE, height_num_chars = height_num_chars )
+        preds_list = ListBoxTagsPredicatesAC( self._dropdown_notebook, self.BroadcastChoices, self._float_mode, self._display_tag_service_key, tag_display_type = ClientTags.TAG_DISPLAY_STORAGE, height_num_chars = height_num_chars )
         
         preds_list.SetExtraParentRowsAllowed( CG.client_controller.new_options.GetBoolean( 'expand_parents_on_storage_autocomplete_taglists' ) )
         preds_list.SetParentDecoratorsAllowed( CG.client_controller.new_options.GetBoolean( 'show_parent_decorators_on_storage_autocomplete_taglists' ) )
diff --git a/hydrus/client/importing/ClientImportFileSeeds.py b/hydrus/client/importing/ClientImportFileSeeds.py
index 62b90490..15a101cc 100644
--- a/hydrus/client/importing/ClientImportFileSeeds.py
+++ b/hydrus/client/importing/ClientImportFileSeeds.py
@@ -1023,7 +1023,7 @@ class FileSeed( HydrusSerialisable.SerialisableBase ):
             file_import_options = FileImportOptions.GetRealFileImportOptions( file_import_options, FileImportOptions.IMPORT_TYPE_LOUD )
             
         
-        file_import_job = ClientImportFiles.FileImportJob( temp_path, file_import_options )
+        file_import_job = ClientImportFiles.FileImportJob( temp_path, file_import_options, human_file_description = self.file_seed_data )
         
         file_import_status = file_import_job.DoWork( status_hook = status_hook )
         
diff --git a/hydrus/client/importing/ClientImportFiles.py b/hydrus/client/importing/ClientImportFiles.py
index 7d7c7c3b..326db141 100644
--- a/hydrus/client/importing/ClientImportFiles.py
+++ b/hydrus/client/importing/ClientImportFiles.py
@@ -106,7 +106,7 @@ def CheckFileImportStatus( file_import_status: FileImportStatus ) -> FileImportS
     
 class FileImportJob( object ):
     
-    def __init__( self, temp_path: str, file_import_options: FileImportOptions.FileImportOptions ):
+    def __init__( self, temp_path: str, file_import_options: FileImportOptions.FileImportOptions, human_file_description = None ):
         
         if HG.file_import_report_mode:
             
@@ -120,6 +120,7 @@ class FileImportJob( object ):
         
         self._temp_path = temp_path
         self._file_import_options = file_import_options
+        self._human_file_description = human_file_description
         
         self._pre_import_file_status = FileImportStatus.STATICGetUnknownStatus()
         self._post_import_file_status = FileImportStatus.STATICGetUnknownStatus()
@@ -422,7 +423,7 @@ class FileImportJob( object ):
                 
                 if raw_pil_image is None:
                     
-                    raw_pil_image = HydrusImageOpening.RawOpenPILImage( self._temp_path )
+                    raw_pil_image = HydrusImageOpening.RawOpenPILImage( self._temp_path, human_file_description = self._human_file_description )
                     
                 
                 has_exif = HydrusImageMetadata.HasEXIF( raw_pil_image )
@@ -451,7 +452,7 @@ class FileImportJob( object ):
                     
                     if raw_pil_image is None:
                         
-                        raw_pil_image = HydrusImageOpening.RawOpenPILImage( self._temp_path )
+                        raw_pil_image = HydrusImageOpening.RawOpenPILImage( self._temp_path, human_file_description = self._human_file_description )
                         
                     
                     has_icc_profile = HydrusImageMetadata.HasICCProfile( raw_pil_image )
diff --git a/hydrus/client/networking/ClientLocalServerResources.py b/hydrus/client/networking/ClientLocalServerResources.py
index dad33b8b..9655d5e5 100644
--- a/hydrus/client/networking/ClientLocalServerResources.py
+++ b/hydrus/client/networking/ClientLocalServerResources.py
@@ -45,6 +45,7 @@ from hydrus.client import ClientThreading
 from hydrus.client import ClientTime
 from hydrus.client import ClientRendering
 from hydrus.client import ClientImageHandling
+from hydrus.client.duplicates import ClientDuplicates
 from hydrus.client.importing import ClientImportFiles
 from hydrus.client.importing.options import FileImportOptions
 from hydrus.client.media import ClientMedia
@@ -625,8 +626,8 @@ def ParseDuplicateSearch( request: HydrusServerRequest.HydrusRequest ):
     file_search_context_1 = ClientSearch.FileSearchContext( location_context = location_context, tag_context = tag_context_1, predicates = predicates_1 )
     file_search_context_2 = ClientSearch.FileSearchContext( location_context = location_context, tag_context = tag_context_2, predicates = predicates_2 )
     
-    dupe_search_type = request.parsed_request_args.GetValue( 'potentials_search_type', int, default_value = CC.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH )
-    pixel_dupes_preference = request.parsed_request_args.GetValue( 'pixel_duplicates', int, default_value = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED )
+    dupe_search_type = request.parsed_request_args.GetValue( 'potentials_search_type', int, default_value = ClientDuplicates.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH )
+    pixel_dupes_preference = request.parsed_request_args.GetValue( 'pixel_duplicates', int, default_value = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED )
     max_hamming_distance = request.parsed_request_args.GetValue( 'max_hamming_distance', int, default_value = 4 )
     
     return (
@@ -1434,7 +1435,7 @@ class HydrusResourceClientAPIRestrictedAddFilesAddFile( HydrusResourceClientAPIR
         
         file_import_options = CG.client_controller.new_options.GetDefaultFileImportOptions( FileImportOptions.IMPORT_TYPE_QUIET )
         
-        file_import_job = ClientImportFiles.FileImportJob( temp_path, file_import_options )
+        file_import_job = ClientImportFiles.FileImportJob( temp_path, file_import_options, human_file_description = f'API POSTed File' )
         
         body_dict = {}
         
diff --git a/hydrus/client/networking/ClientNetworkingFunctions.py b/hydrus/client/networking/ClientNetworkingFunctions.py
index 1a1c7d0a..5f967196 100644
--- a/hydrus/client/networking/ClientNetworkingFunctions.py
+++ b/hydrus/client/networking/ClientNetworkingFunctions.py
@@ -519,7 +519,7 @@ def EnsureURLIsEncoded( url: str, keep_fragment = True ) -> str:
         single_value_parameters = [ ensure_param_component_is_encoded( single_value_parameter ) for single_value_parameter in single_value_parameters ]
         
         path = '/' + '/'.join( path_components )
-        query = ConvertQueryDictToText( query_dict, single_value_parameters )
+        query = ConvertQueryDictToText( query_dict, single_value_parameters, param_order = param_order )
         
         if not keep_fragment:
             
diff --git a/hydrus/core/HydrusConstants.py b/hydrus/core/HydrusConstants.py
index 4ba94a12..880b6993 100644
--- a/hydrus/core/HydrusConstants.py
+++ b/hydrus/core/HydrusConstants.py
@@ -105,7 +105,7 @@ options = {}
 # Misc
 
 NETWORK_VERSION = 20
-SOFTWARE_VERSION = 574
+SOFTWARE_VERSION = 575
 CLIENT_API_VERSION = 64
 
 SERVER_THUMBNAIL_DIMENSIONS = ( 200, 200 )
@@ -992,6 +992,9 @@ APPLICATIONS_WITH_THUMBNAILS = { IMAGE_SVG, APPLICATION_PDF, APPLICATION_FLASH,
 
 MIMES_WITH_THUMBNAILS = set( IMAGES ).union( ANIMATIONS ).union( VIDEO ).union( APPLICATIONS_WITH_THUMBNAILS )
 
+# basically a flash or a clip or a svg or whatever can normally just have some janked out resolution, so when testing such for thumbnail gen etc.., we'll ignore applications
+MIMES_THAT_ALWAYS_HAVE_GOOD_RESOLUTION = set( IMAGES ).union( ANIMATIONS ).union( VIDEO )
+
 FILES_THAT_CAN_HAVE_ICC_PROFILE = { IMAGE_BMP, IMAGE_JPEG, IMAGE_PNG, IMAGE_GIF, IMAGE_TIFF, APPLICATION_PSD }.union( PIL_HEIF_MIMES )
 
 FILES_THAT_CAN_HAVE_EXIF = { IMAGE_JPEG, IMAGE_TIFF, IMAGE_PNG, IMAGE_WEBP }.union( PIL_HEIF_MIMES )
diff --git a/hydrus/core/HydrusData.py b/hydrus/core/HydrusData.py
index c32a7e1e..e6bc98e2 100644
--- a/hydrus/core/HydrusData.py
+++ b/hydrus/core/HydrusData.py
@@ -845,10 +845,16 @@ def LastShutdownWasBad( db_path, instance ):
         return False
         
 
+def MassExtend( iterables ):
+    
+    return [ item for item in itertools.chain.from_iterable( iterables ) ]
+    
+
 def MassUnion( iterables ):
     
     return { item for item in itertools.chain.from_iterable( iterables ) }
     
+
 def MedianPop( population ):
     
     # assume it has at least one and comes sorted
diff --git a/hydrus/core/HydrusSerialisable.py b/hydrus/core/HydrusSerialisable.py
index 5a178572..d58703bb 100644
--- a/hydrus/core/HydrusSerialisable.py
+++ b/hydrus/core/HydrusSerialisable.py
@@ -142,6 +142,10 @@ SERIALISABLE_TYPE_PETITION_HEADER = 124
 SERIALISABLE_TYPE_STRING_JOINER = 125
 SERIALISABLE_TYPE_FILE_FILTER = 126
 SERIALISABLE_TYPE_URL_CLASS_PARAMETER_FIXED_NAME = 127
+SERIALISABLE_AUTO_DUPLICATES_RULE = 128
+SERIALISABLE_AUTO_DUPLICATES_PAIR_SELECTOR_AND_COMPARATOR = 129
+SERIALISABLE_AUTO_DUPLICATES_PAIR_COMPARATOR_RULE_ONE_FILE = 130
+SERIALISABLE_AUTO_DUPLICATES_PAIR_COMPARATOR_RULE_TWO_FILES = 131
 
 SERIALISABLE_TYPES_TO_OBJECT_TYPES = {}
 
diff --git a/hydrus/core/files/HydrusAnimationHandling.py b/hydrus/core/files/HydrusAnimationHandling.py
index 31ec30d3..edabdb57 100644
--- a/hydrus/core/files/HydrusAnimationHandling.py
+++ b/hydrus/core/files/HydrusAnimationHandling.py
@@ -199,9 +199,9 @@ def GetAPNGDurationAndNumFrames( path ):
     return ( duration_in_ms, num_frames )
     
 
-def GetFrameDurationsPILAnimation( path ):
+def GetFrameDurationsPILAnimation( path, human_file_description = None ):
     
-    pil_image = HydrusImageOpening.RawOpenPILImage( path )
+    pil_image = HydrusImageOpening.RawOpenPILImage( path, human_file_description = human_file_description )
     
     times_to_play = GetTimesToPlayPILAnimationFromPIL( pil_image )
     
@@ -301,11 +301,11 @@ def GetTimesToPlayAPNG( path: str ) -> int:
     return num_plays
     
 
-def GetTimesToPlayPILAnimation( path ) -> int:
+def GetTimesToPlayPILAnimation( path, human_file_description = None ) -> int:
     
     try:
         
-        pil_image = HydrusImageOpening.RawOpenPILImage( path )
+        pil_image = HydrusImageOpening.RawOpenPILImage( path, human_file_description = human_file_description )
         
     except HydrusExceptions.UnsupportedFileException:
         
diff --git a/hydrus/core/files/HydrusOfficeOpenXMLHandling.py b/hydrus/core/files/HydrusOfficeOpenXMLHandling.py
index f3ca3594..fcdda511 100644
--- a/hydrus/core/files/HydrusOfficeOpenXMLHandling.py
+++ b/hydrus/core/files/HydrusOfficeOpenXMLHandling.py
@@ -93,7 +93,7 @@ def PowerPointResolution( path: str ):
     file = GetZipAsPath( path, 'ppt/presentation.xml' ).open( 'rb' )
     
     root = ET.parse( file )
-        
+    
     sldSz = root.find('./p:sldSz', {'p': 'http://schemas.openxmlformats.org/presentationml/2006/main'})
     
     x_emu = int(sldSz.get('cx'))
diff --git a/hydrus/core/files/images/HydrusImageHandling.py b/hydrus/core/files/images/HydrusImageHandling.py
index 1f02eef1..379d80c7 100644
--- a/hydrus/core/files/images/HydrusImageHandling.py
+++ b/hydrus/core/files/images/HydrusImageHandling.py
@@ -142,7 +142,11 @@ def ClipPILImage( pil_image: PILImage.Image, clip_rect ):
     return pil_image.crop( box = ( x, y, x + clip_width, y + clip_height ) )
     
 
-def GenerateNumPyImage( path, mime, force_pil = False ) -> numpy.array:
+FORCE_PIL_ALWAYS = True
+
+def GenerateNumPyImage( path, mime, force_pil = False, human_file_description = None ) -> numpy.array:
+    
+    force_pil = force_pil or FORCE_PIL_ALWAYS
     
     if HG.media_load_report_mode:
         
@@ -180,7 +184,7 @@ def GenerateNumPyImage( path, mime, force_pil = False ) -> numpy.array:
     
     if not force_pil:
         
-        pil_image = HydrusImageOpening.RawOpenPILImage( path )
+        pil_image = HydrusImageOpening.RawOpenPILImage( path, human_file_description = human_file_description )
         
         if pil_image.mode == 'LAB':
             
@@ -277,9 +281,9 @@ def GenerateNumPyImageFromPILImage( pil_image: PILImage.Image, strip_useless_alp
     return numpy_image
     
 
-def GeneratePILImage( path: typing.Union[ str, typing.BinaryIO ], dequantize = True ) -> PILImage.Image:
+def GeneratePILImage( path: typing.Union[ str, typing.BinaryIO ], dequantize = True, human_file_description = None ) -> PILImage.Image:
     
-    pil_image = HydrusImageOpening.RawOpenPILImage( path )
+    pil_image = HydrusImageOpening.RawOpenPILImage( path, human_file_description = human_file_description )
     
     try:
         
@@ -287,7 +291,7 @@ def GeneratePILImage( path: typing.Union[ str, typing.BinaryIO ], dequantize = T
         
         if dequantize:
             
-            if pil_image.mode in ( 'I', 'F' ):
+            if pil_image.mode in ( 'I', 'I;16', 'I;16L', 'I;16B', 'I;16N', 'F' ):
                 
                 # 'I' = greyscale, uint16
                 # 'F' = float, np.float32
@@ -622,7 +626,7 @@ def GetThumbnailResolution( image_resolution: typing.Tuple[ int, int ], bounding
     return ( thumbnail_width, thumbnail_height )
     
 
-def IsDecompressionBomb( path ) -> bool:
+def IsDecompressionBomb( path, human_file_description = None ) -> bool:
     
     # there are two errors here, the 'Warning' and the 'Error', which atm is just a test vs a test x 2 for number of pixels
     # 256MB bmp by default, ( 1024 ** 3 ) // 4 // 3
@@ -634,7 +638,7 @@ def IsDecompressionBomb( path ) -> bool:
     
     try:
         
-        HydrusImageOpening.RawOpenPILImage( path )
+        HydrusImageOpening.RawOpenPILImage( path, human_file_description = human_file_description )
         
     except ( PILImage.DecompressionBombError ):
         
diff --git a/hydrus/core/files/images/HydrusImageNormalisation.py b/hydrus/core/files/images/HydrusImageNormalisation.py
index a12a4453..17d7324a 100644
--- a/hydrus/core/files/images/HydrusImageNormalisation.py
+++ b/hydrus/core/files/images/HydrusImageNormalisation.py
@@ -155,7 +155,7 @@ def NormaliseICCProfilePILImageToSRGB( pil_image: PILImage.Image ) -> PILImage.I
         
         src_profile = PILImageCms.ImageCmsProfile( f )
         
-        if pil_image.mode in ( 'I', 'F', 'L', 'LA', 'P' ):
+        if pil_image.mode in ( 'I', 'I;16', 'I;16L', 'I;16B', 'I;16N', 'F', 'L', 'LA', 'P' ):
             
             # had a bunch of LA pngs that turned pure white on RGBA ICC conversion
             # but seem to work fine if keep colourspace the same for now
diff --git a/hydrus/core/files/images/HydrusImageOpening.py b/hydrus/core/files/images/HydrusImageOpening.py
index 00cb589c..e56b1bc3 100644
--- a/hydrus/core/files/images/HydrusImageOpening.py
+++ b/hydrus/core/files/images/HydrusImageOpening.py
@@ -3,20 +3,33 @@ from PIL import Image as PILImage
 
 from hydrus.core import HydrusExceptions
 
-def RawOpenPILImage( path: typing.Union[ str, typing.BinaryIO ] ) -> PILImage.Image:
+def RawOpenPILImage( path: typing.Union[ str, typing.BinaryIO ], human_file_description = None ) -> PILImage.Image:
     
     try:
         
         pil_image = PILImage.open( path )
         
+        if pil_image is None:
+            
+            raise Exception( 'PIL returned None.' )
+            
+        
     except Exception as e:
         
-        raise HydrusExceptions.DamagedOrUnusualFileException( f'Could not load the image at "{path}"--it was likely malformed!' ) from e
+        if human_file_description is not None:
+            
+            message = f'Could not load the image at "{human_file_description}"--it was likely malformed!'
+            
+        elif isinstance( path, str ):
+            
+            message = f'Could not load the image at "{path}"--it was likely malformed!'
+            
+        else:
+            
+            message = f'Could not load the image, which had no path (so was probably from inside another file?)--it was likely malformed!'
+            
         
-    
-    if pil_image is None:
-        
-        raise HydrusExceptions.DamagedOrUnusualFileException( f'Could not load the image at "{path}"--it was likely malformed!' )
+        raise HydrusExceptions.DamagedOrUnusualFileException( message ) from e
         
     
     return pil_image
diff --git a/hydrus/test/TestClientAPI.py b/hydrus/test/TestClientAPI.py
index ec48b66a..b2fabf5f 100644
--- a/hydrus/test/TestClientAPI.py
+++ b/hydrus/test/TestClientAPI.py
@@ -26,6 +26,7 @@ from hydrus.client import ClientGlobals as CG
 from hydrus.client import ClientLocation
 from hydrus.client import ClientServices
 from hydrus.client import ClientTime
+from hydrus.client.duplicates import ClientDuplicates
 from hydrus.client.importing import ClientImportFiles
 from hydrus.client.media import ClientMediaManagers
 from hydrus.client.media import ClientMediaResult
@@ -4172,8 +4173,8 @@ class TestClientAPI( unittest.TestCase ):
         
         default_file_search_context = ClientSearch.FileSearchContext( location_context = default_location_context, tag_context = tag_context, predicates = predicates )
         
-        default_potentials_search_type = CC.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH
-        default_pixel_duplicates = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        default_potentials_search_type = ClientDuplicates.DUPE_SEARCH_ONE_FILE_MATCHES_ONE_SEARCH
+        default_pixel_duplicates = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         default_max_hamming_distance = 4
         
         test_tag_service_key_1 = CC.DEFAULT_LOCAL_TAG_SERVICE_KEY
@@ -4192,8 +4193,8 @@ class TestClientAPI( unittest.TestCase ):
         
         test_file_search_context_2 = ClientSearch.FileSearchContext( location_context = default_location_context, tag_context = test_tag_context_2, predicates = test_predicates_2 )
         
-        test_potentials_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES
-        test_pixel_duplicates = CC.SIMILAR_FILES_PIXEL_DUPES_EXCLUDED
+        test_potentials_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_DIFFERENT_SEARCHES
+        test_pixel_duplicates = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_EXCLUDED
         test_max_hamming_distance = 8
         
         # get count
diff --git a/hydrus/test/TestClientDBDuplicates.py b/hydrus/test/TestClientDBDuplicates.py
index 8e8e117a..d237709e 100644
--- a/hydrus/test/TestClientDBDuplicates.py
+++ b/hydrus/test/TestClientDBDuplicates.py
@@ -10,6 +10,7 @@ from hydrus.core import HydrusTime
 from hydrus.client import ClientConstants as CC
 from hydrus.client import ClientLocation
 from hydrus.client.db import ClientDB
+from hydrus.client.duplicates import ClientDuplicates
 from hydrus.client.importing import ClientImportFiles
 from hydrus.client.importing.options import FileImportOptions
 from hydrus.client.metadata import ClientContentUpdates
@@ -122,9 +123,9 @@ class TestClientDBDuplicates( unittest.TestCase ):
     
     def _test_initial_state( self ):
         
-        pixel_dupes_preference = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         max_hamming_distance = 4
-        dupe_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+        dupe_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
         
         num_potentials = self._read( 'potential_duplicates_count', self._file_search_context_1, self._file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance )
         
@@ -175,9 +176,9 @@ class TestClientDBDuplicates( unittest.TestCase ):
         
         self._our_main_dupe_group_hashes.add( self._dupe_hashes[2] )
         
-        pixel_dupes_preference = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         max_hamming_distance = 4
-        dupe_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+        dupe_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
         
         num_potentials = self._read( 'potential_duplicates_count', self._file_search_context_1, self._file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance )
         
@@ -263,9 +264,9 @@ class TestClientDBDuplicates( unittest.TestCase ):
         
         self._our_main_dupe_group_hashes.add( self._king_hash )
         
-        pixel_dupes_preference = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         max_hamming_distance = 4
-        dupe_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+        dupe_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
         
         num_potentials = self._read( 'potential_duplicates_count', self._file_search_context_1, self._file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance )
         
@@ -330,9 +331,9 @@ class TestClientDBDuplicates( unittest.TestCase ):
         
         self._our_main_dupe_group_hashes.add( self._dupe_hashes[5] )
         
-        pixel_dupes_preference = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         max_hamming_distance = 4
-        dupe_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+        dupe_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
         
         num_potentials = self._read( 'potential_duplicates_count', self._file_search_context_1, self._file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance )
         
@@ -508,9 +509,9 @@ class TestClientDBDuplicates( unittest.TestCase ):
         
         self._write( 'duplicate_pair_status', [ row ] )
         
-        pixel_dupes_preference = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         max_hamming_distance = 4
-        dupe_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+        dupe_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
         
         num_potentials = self._read( 'potential_duplicates_count', self._file_search_context_1, self._file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance )
         
@@ -592,9 +593,9 @@ class TestClientDBDuplicates( unittest.TestCase ):
         
         self._write( 'duplicate_pair_status', rows )
         
-        pixel_dupes_preference = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         max_hamming_distance = 4
-        dupe_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+        dupe_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
         
         num_potentials = self._read( 'potential_duplicates_count', self._file_search_context_1, self._file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance )
         
@@ -636,9 +637,9 @@ class TestClientDBDuplicates( unittest.TestCase ):
         
         self._write( 'duplicate_pair_status', rows )
         
-        pixel_dupes_preference = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         max_hamming_distance = 4
-        dupe_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+        dupe_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
         
         num_potentials = self._read( 'potential_duplicates_count', self._file_search_context_1, self._file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance )
         
@@ -656,9 +657,9 @@ class TestClientDBDuplicates( unittest.TestCase ):
         
         self._write( 'duplicate_pair_status', [ row ] )
         
-        pixel_dupes_preference = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         max_hamming_distance = 4
-        dupe_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+        dupe_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
         
         num_potentials = self._read( 'potential_duplicates_count', self._file_search_context_1, self._file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance )
         
@@ -712,9 +713,9 @@ class TestClientDBDuplicates( unittest.TestCase ):
         
         self._write( 'duplicate_pair_status', rows )
         
-        pixel_dupes_preference = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         max_hamming_distance = 4
-        dupe_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+        dupe_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
         
         num_potentials = self._read( 'potential_duplicates_count', self._file_search_context_1, self._file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance )
         
@@ -732,9 +733,9 @@ class TestClientDBDuplicates( unittest.TestCase ):
         
         self._write( 'duplicate_pair_status', [ row ] )
         
-        pixel_dupes_preference = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         max_hamming_distance = 4
-        dupe_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+        dupe_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
         
         num_potentials = self._read( 'potential_duplicates_count', self._file_search_context_1, self._file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance )
         
@@ -794,9 +795,9 @@ class TestClientDBDuplicates( unittest.TestCase ):
         
         self._write( 'duplicate_pair_status', rows )
         
-        pixel_dupes_preference = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         max_hamming_distance = 4
-        dupe_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+        dupe_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
         
         num_potentials = self._read( 'potential_duplicates_count', self._file_search_context_1, self._file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance )
         
@@ -857,9 +858,9 @@ class TestClientDBDuplicates( unittest.TestCase ):
         
         self._write( 'duplicate_pair_status', rows )
         
-        pixel_dupes_preference = CC.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
+        pixel_dupes_preference = ClientDuplicates.SIMILAR_FILES_PIXEL_DUPES_ALLOWED
         max_hamming_distance = 4
-        dupe_search_type = CC.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
+        dupe_search_type = ClientDuplicates.DUPE_SEARCH_BOTH_FILES_MATCH_ONE_SEARCH
         
         num_potentials = self._read( 'potential_duplicates_count', self._file_search_context_1, self._file_search_context_2, dupe_search_type, pixel_dupes_preference, max_hamming_distance )
         
diff --git a/hydrus/test/TestClientNetworking.py b/hydrus/test/TestClientNetworking.py
index d2774d96..05b8b4ec 100644
--- a/hydrus/test/TestClientNetworking.py
+++ b/hydrus/test/TestClientNetworking.py
@@ -357,6 +357,13 @@ class TestURLClasses( unittest.TestCase ):
         self.assertEqual( ClientNetworkingFunctions.EnsureURLIsEncoded( human_url_with_mix ), encoded_url_with_mix )
         self.assertEqual( ClientNetworkingFunctions.EnsureURLIsEncoded( encoded_url_with_mix ), encoded_url_with_mix )
         
+        # double-check we don't auto-alphabetise params in this early stage! we screwed this up before and broke that option
+        human_url_with_mix = 'https://grunky.site/post?b=5 5&a=1 1'
+        encoded_url_with_mix = 'https://grunky.site/post?b=5%205&a=1%201'
+        
+        self.assertEqual( ClientNetworkingFunctions.EnsureURLIsEncoded( human_url_with_mix ), encoded_url_with_mix )
+        self.assertEqual( ClientNetworkingFunctions.EnsureURLIsEncoded( encoded_url_with_mix ), encoded_url_with_mix )
+        
     
     def test_defaults( self ):
         
diff --git a/hydrus/test/TestHydrusSerialisable.py b/hydrus/test/TestHydrusSerialisable.py
index e88cf053..34660c9e 100644
--- a/hydrus/test/TestHydrusSerialisable.py
+++ b/hydrus/test/TestHydrusSerialisable.py
@@ -8,9 +8,8 @@ from hydrus.core import HydrusTime
 
 from hydrus.client import ClientApplicationCommand as CAC
 from hydrus.client import ClientConstants as CC
-from hydrus.client import ClientData
 from hydrus.client import ClientDefaults
-from hydrus.client import ClientDuplicates
+from hydrus.client.duplicates import ClientDuplicates
 from hydrus.client.gui import ClientGUIShortcuts
 from hydrus.client.importing import ClientImportSubscriptions
 from hydrus.client.importing import ClientImportSubscriptionQuery
diff --git a/static/default/parsers/danbooru file page parser - get webm ugoira.png b/static/default/parsers/danbooru file page parser - get webm ugoira.png
index bac3157c6783f02a209d1bd28791bd17a47708c7..31bd0de3a7f28997546dc89f6467f5b2449d596d 100644
GIT binary patch
literal 3366
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
Q|9gP+wT-o~8qRV5190FsbN~PV

literal 3320
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

diff --git a/static/default/parsers/danbooru file page parser.png b/static/default/parsers/danbooru file page parser.png
index 78dc40499fdbe5a9371e14076e972e3eab249fee..2d055c668fe88af2b6b6808b97581d6a6d4b45c1 100644
GIT binary patch
delta 2877
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
b0saSQMtw63fMvS?0000<MFvhpu0mjfhu4gw

delta 2308
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

diff --git a/static/default/url_classes/fixupx tweet.png b/static/default/url_classes/fixupx tweet.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcf2b68c75d29d6a55de8c3f63ab42b915afab1a
GIT binary patch
literal 1960
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

literal 0
HcmV?d00001

diff --git a/static/default/url_classes/fixvx tweet.png b/static/default/url_classes/fixvx tweet.png
new file mode 100644
index 0000000000000000000000000000000000000000..d007a1a3496da646030602d38715af9db0c61cfb
GIT binary patch
literal 1947
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
Ox;B<4Eh@|?(f<P40dVR7

literal 0
HcmV?d00001

diff --git a/static/default/url_classes/fxtwitter tweet.png b/static/default/url_classes/fxtwitter tweet.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cedefba8564ac078a69e0c07b356277b256478c
GIT binary patch
literal 2001
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
JU31Qx`d<~4pcnuE

literal 0
HcmV?d00001

diff --git a/static/default/url_classes/vxtwitter api status (with username).png b/static/default/url_classes/vxtwitter api status (with username).png
new file mode 100644
index 0000000000000000000000000000000000000000..4dbfa9f3278bea1e762b70c40d38aea7453da449
GIT binary patch
literal 2729
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
Zu8NV-j<3THwdH>`sEvg^zT&u7%s-5s_qhN7

literal 0
HcmV?d00001

diff --git a/static/default/url_classes/vxtwitter api status.png b/static/default/url_classes/vxtwitter api status.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bfdcdb69923ffdde88f321285828ab564036fd5
GIT binary patch
literal 2272
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
a1<paF)Kdeu!sX20*F|5)M7u%@8~raX^%~>=

literal 0
HcmV?d00001

diff --git a/static/default/url_classes/vxtwitter tweet.png b/static/default/url_classes/vxtwitter tweet.png
new file mode 100644
index 0000000000000000000000000000000000000000..9407f3c6f85570572895925b18352e8b62d2e683
GIT binary patch
literal 2057
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
L*vhER5KsOW;sv`m

literal 0
HcmV?d00001

diff --git a/static/default/url_classes/x post.png b/static/default/url_classes/x post.png
index 5475b40c9ee19baf1d042b53d9771f91964fdc6d..7f0ae94d318e1b3d05be190fa4e4386e1a79b423 100644
GIT binary patch
delta 1801
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

delta 1793
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