Add config option to always apply invisible AND tag filter.

diff --git a/src/ytplom/http.py b/src/ytplom/http.py
index b406868bafb0426f55ab9868598a53336277f845..b845c7612542ffc0bfcd28c9d83b74d4c3e970be 100644 (file)
--- a/src/ytplom/http.py
+++ b/src/ytplom/http.py
@@ -94,7 +94,7 @@ class Server(ThreadingHTTPServer):
                          *args, **kwargs)
         self.config = config
         self.jinja = JinjaEnv(loader=JinjaFSLoader(_PATH_TEMPLATES))
-        self.player = Player()
+        self.player = Player(config.tags_prefilter)
         self.downloads = DownloadsManager()
         self.downloads.clean_unfinished()
         self.downloads.start_thread()
@@ -156,9 +156,13 @@ class _TaskHandler(BaseHTTPRequestHandler):
             self.server.player.move_entry(int(command.split('_')[1]))
         elif command.startswith('down_'):
             self.server.player.move_entry(int(command.split('_')[1]), False)
-        for k in [k for k in ('filter_path', 'filter_tags')
-                  if k in postvars.as_dict]:
-            setattr(self.server.player, k, postvars.as_dict[k])
+        if 'filter_path' in postvars.as_dict:
+            self.server.player.filter_path = FilterStr(
+                    postvars.first_for('filter_path'))
+        if 'filter_tags' in postvars.as_dict:
+            self.server.player.filter_tags = {
+                Tag(t) for t in postvars.first_for('filter_tags').split(',')
+                if t}
         self._send_http('OK', code=200)
 
     def _receive_files_command(self, postvars: _ReqMap) -> None:
@@ -315,7 +319,9 @@ class _TaskHandler(BaseHTTPRequestHandler):
 
     def _send_files_index(self, params: _ReqMap) -> None:
         filter_path = FilterStr(params.first_for('filter_path'))
-        filter_tags = FilterStr(params.first_for('filter_tags'))
+        filter_tags_str = params.first_for('filter_tags')
+        filter_tags = self.server.config.tags_prefilter | {
+                Tag(t) for t in filter_tags_str.split(',') if t}
         show_absent = bool(params.first_for('show_absent'))
         with DbConn() as conn:
             files = VideoFile.get_filtered(
@@ -325,7 +331,7 @@ class _TaskHandler(BaseHTTPRequestHandler):
                                      {'files': files,
                                       'selected': 'files',
                                       'filter_path': filter_path,
-                                      'filter_tags': filter_tags,
+                                      'filter_tags': filter_tags_str,
                                       'show_absent': show_absent})
 
     def _send_missing_json(self) -> None:

diff --git a/src/ytplom/misc.py b/src/ytplom/misc.py
index 5800b5412e6fa23d58e4c9af957020c3b2d91bd2..e052e49193dc79cce4427dc1d94b2b3190a3a9b8 100644 (file)
--- a/src/ytplom/misc.py
+++ b/src/ytplom/misc.py
@@ -28,7 +28,8 @@ DEFAULTS = {
     'port': 8090,
     'port_remote': 8090,
     'background_color': '#ffffff',
-    'queries_cutoff': ''
+    'queries_cutoff': '',
+    'tags_prefilter_str': ''
 }
 
 # type definitions for mypy
@@ -90,6 +91,7 @@ class Config:
     api_key: str
     background_color: str
     queries_cutoff: str
+    tags_prefilter_str: str
 
     def __init__(self):
         def set_attrs_from_dict(d):
@@ -103,6 +105,8 @@ class Config:
         set_attrs_from_dict({k[len(ENVIRON_PREFIX):].lower(): v
                              for k, v in environ.items()
                              if k.isupper() and k.startswith(ENVIRON_PREFIX)})
+        self.tags_prefilter = {
+                Tag(t) for t in self.tags_prefilter_str.split(',') if t}
 
 
 class YoutubeQuery(DbData):
@@ -300,8 +304,8 @@ class VideoFile(DbData):
     @classmethod
     def get_filtered(cls,
                      conn: BaseDbConn,
-                     filter_path: FilterStr = FilterStr(''),
-                     filter_tags: FilterStr = FilterStr(''),
+                     filter_path: FilterStr,
+                     filter_tags: set[Tag],
                      show_absent: bool = False
                      ) -> list[Self]:
         """Return cls.get_all matching provided filter criteria."""
@@ -311,9 +315,8 @@ class VideoFile(DbData):
                 and (show_absent or f.present)]
         if filter_tags:
             to_remove = set()
-            tags_and = filter_tags.split(',')
             for f in filtered_before_tags:
-                for t in [t for t in tags_and if t not in f.tags]:
+                for t in [t for t in filter_tags if t not in f.tags]:
                     to_remove.add(f)
             for f in to_remove:
                 filtered_before_tags.remove(f)
@@ -413,13 +416,14 @@ class Player:
     """MPV representation with some additional features."""
     _idx: int
 
-    def __init__(self) -> None:
+    def __init__(self, tags_prefilter: set[Tag]) -> None:
         self.last_update = DatetimeStr('')
         self._mpv: Optional[MPV] = None
         self._kill_queue: Queue = Queue()
         self._monitoring_kill = False
         self.filter_path = FilterStr('')
-        self.filter_tags = FilterStr('')
+        self._tags_prefilter = tags_prefilter
+        self.filter_tags: set[Tag] = set()
         self.load_files_and_start()
 
     def _monitor_kill(self) -> None:
@@ -448,7 +452,8 @@ class Player:
             known_files = {
                 f.full_path: f for f
                 in VideoFile.get_filtered(
-                    conn, self.filter_path, self.filter_tags)}
+                        conn, self.filter_path,
+                        self._tags_prefilter | self.filter_tags)}
         self.files = [known_files[p] for p in PATH_DOWNLOADS.iterdir()
                       if p in known_files
                       and p.is_file()