added some logging and better cache-identification via is-cache file

src/jarklin/cache/_cache_generator.py

@@ -32,6 +32,8 @@ def generate(self) -> None:
         self.dest.mkdir(parents=True)
 
         try:
+            logging.info(f"{self}.mark_cache()")
+            self.mark_cache()
             logging.info(f"{self}.generate_meta()")
             self.generate_meta()
             logging.info(f"{self}.generate_previews()")
@@ -48,6 +50,10 @@ def generate(self) -> None:
             shutil.rmtree(self.dest, ignore_errors=True)
             raise
 
+    @t.final
+    def mark_cache(self):
+        self.dest.joinpath("is-cache").touch()
+
     @abstractmethod
     def generate_meta(self) -> None: ...
 

src/jarklin/cache/cache.py

@@ -15,7 +15,7 @@
 from ._cache_generator import CacheGenerator
 from .video import VideoCacheGenerator
 from .gallery import GalleryCacheGenerator
-from .util import is_video_file, is_gallery, is_deprecated, is_incomplete, get_creation_time, get_modification_time
+from .util import is_video_file, is_gallery, is_deprecated, is_incomplete, get_creation_time, get_modification_time, is_cache
 try:
     from better_exceptions import format_exception
 except ModuleNotFoundError:
@@ -93,9 +93,10 @@ def invalidate(self) -> None:
             for dirname in dirnames:
                 dest = Path(root, dirname)
                 source = dest.relative_to(self.jarklin_cache)
-                if not dest.joinpath("meta.json").is_file():
+                if not is_cache(fp=dest):
                     continue
-                if not source.exists() or is_deprecated(source=source, dest=dest):
+                if not source.exists() or is_deprecated(source=source, dest=dest) or is_incomplete(dest=dest):
+                    logging.info(f"removing {str(source)!r} from cache")
                     shutil.rmtree(dest)
 
     def generate(self) -> None:

src/jarklin/cache/gallery.py

@@ -18,6 +18,7 @@
 │  ├─ 2.webp
 ├─ meta.json
 ├─ gallery.type
+├─ is-cache
 """
 import re
 import shutil

src/jarklin/cache/util.py

@@ -45,6 +45,26 @@ def is_gallery(fp: PathSource, boundary: int = 5) -> bool:
     ]) > boundary
 
 
+def is_cache(fp: PathSource) -> bool:
+    fp = Path(fp)
+    return fp.joinpath("is-cache").is_file()
+
+
+def is_gallery_cache(fp: PathSource) -> bool:
+    fp = Path(fp)
+    return is_cache(fp) and fp.joinpath("gallery.type").is_file()
+
+
+def is_video_cache(fp: PathSource) -> bool:
+    fp = Path(fp)
+    return is_cache(fp) and fp.joinpath("video.type").is_file()
+
+
+def is_incomplete(dest: PathSource) -> bool:
+    dest = Path(dest)
+    return next(dest.glob("*.type"), None) is None
+
+
 def is_deprecated(source: PathSource, dest: PathSource) -> bool:
     source = Path(source)
     dest = Path(dest)
@@ -59,11 +79,6 @@ def is_deprecated(source: PathSource, dest: PathSource) -> bool:
     return source_mtime > p.getmtime(dest)
 
 
-def is_incomplete(dest: PathSource) -> bool:
-    dest = Path(dest)
-    return next(dest.glob("*.type"), None) is None
-
-
 def get_creation_time(path: PathSource) -> float:
     # fixme: ctime != creation-time on unix
     path = Path(path)

src/jarklin/cache/video.py

@@ -8,6 +8,7 @@
 │  ├─ 2.webp
 ├─ meta.json
 ├─ video.type
+├─ is-cache
 """
 import logging
 import shutil