From 95c541398516aa9fe4a1665576cbd311726120ec Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Sun, 17 Oct 2021 15:45:10 +1100 Subject: [PATCH] treat a Search as a "path" in PA_PREFS so we can remember settings for a search too - this fixes the issue where prefs are "changed" when you go from import/storage -> search -> import/storage again --- TODO | 6 +++--- options.py | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/TODO b/TODO index 4e4ba48..4dd495c 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,4 @@ ## GENERAL - * grep DDP: I think pa_prefs may not save when they should? - - from testing, import <-> storage swaps off views dont affect prefs, but when we go to search, it impacts import... (I think b/c import is the default in that set of options?) - * move all unsorted photos/* -> import/ TEST: moving over the top of same dir name (what does this do to FS content) -- I think the AddDir()'s should be finding existing ones, but maybe are adding? @@ -65,6 +62,9 @@ *** Need to use thread-safe sessions per Thread, half-assed version did not work + * put nightly? job to scan import dir + * put weekly? job to scan storage dir + need a manual button to restart a job in the GUI, (based on file-level optims, just run the job as new and it will optim over already done parts and continue) diff --git a/options.py b/options.py index e7251a0..45a0c1a 100644 --- a/options.py +++ b/options.py @@ -58,6 +58,16 @@ class Options(PA): else: self.folders=True self.noo="A to Z" + elif 'search' in url: + self.path_type = 'Search' + self.paths = None + pref=PA_PREF.query.filter(PA_PREF.pa_user_dn==current_user.dn,PA_PREF.path_type==self.path_type).first() + if pref: + self.folders=pref.folders + self.noo=pref.noo + else: + self.folders=False + self.noo="Oldest" else: self.path_type = 'Import' self.paths = SettingsIPath()