Bump version: 0.3.1 → 0.3.2

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.1
+current_version = 0.3.2
 commit = True
 tag = True
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ucast"
-version = "0.3.1"
+version = "0.3.2"
 description = "YouTube to Podcast converter"
 authors = ["Theta-Dev <t.testboy@gmail.com>"]
 packages = [

ucast/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 
 
 def template_context(request):

ucast/service/storage.py

@@ -1,5 +1,7 @@
 import os
+import shutil
 import tempfile
+from datetime import datetime, timedelta
 from pathlib import Path
 
 from django.conf import settings
@@ -73,3 +75,18 @@ class Cache:
 
     def create_tmpdir(self, prefix="dld") -> tempfile.TemporaryDirectory:
         return tempfile.TemporaryDirectory(prefix=prefix + "_", dir=self.dir_cache)
+
+    def cleanup(self):
+        """
+        Delete temporary directories that are older than 24h and are most likely left
+        over after unexpected shutdowns.
+        """
+        for dirname in os.listdir(self.dir_cache):
+            if dirname == "yt_dlp":
+                continue
+
+            ctime = os.path.getctime(dirname)
+            age = datetime.now() - datetime.fromtimestamp(ctime)
+
+            if age > timedelta(days=1):
+                shutil.rmtree(self.dir_cache / dirname)

ucast/tasks/library.py

@@ -105,3 +105,8 @@ def update_channel_info(channel: Channel):
 def update_channel_infos():
     for channel in Channel.objects.filter(active=True):
         queue.enqueue(update_channel_info, channel)
+
+
+def clean_cache():
+    cache = storage.Cache()
+    cache.cleanup()

ucast/tasks/schedule.py

@@ -1,5 +1,5 @@
 import logging
-from datetime import datetime
+from datetime import datetime, timedelta
 
 from django.conf import settings
 
@@ -28,8 +28,15 @@ def register_scheduled_jobs():
     )
 
     scheduler.schedule(
-        datetime.utcnow(),
+        datetime.utcnow() + timedelta(days=1),
         library.update_channel_infos,
         id="schedule_update_channel_infos",
         interval=24 * 3600,
     )
+
+    scheduler.schedule(
+        datetime.utcnow() + timedelta(days=1),
+        library.clean_cache,
+        id="schedule_clean_cache",
+        interval=24 * 3600,
+    )

ucast/tests/service/test_storage.py

@@ -1,5 +1,6 @@
 import os
 import tempfile
+from datetime import datetime, timedelta
 from pathlib import Path
 
 from ucast.service import storage
@@ -54,3 +55,30 @@ def test_channel_folder():
         == ucast_dir / "thumbnails" / "my_video_title_sm.webp"
     )
     assert cf.get_audio("my_video_title") == tmpdir / "my_video_title.mp3"
+
+
+def test_clean_cache(settings, mocker):
+    tmpdir_o = tempfile.TemporaryDirectory()
+    tmpdir = Path(tmpdir_o.name)
+
+    os.mkdir(tmpdir / "yt_dlp")
+    os.mkdir(tmpdir / "dld_old")
+    os.mkdir(tmpdir / "dld_new")
+
+    def mock_ctime(path):
+        if path == "dld_new":
+            return datetime.now().timestamp()
+        if path == "dld_old":
+            return (datetime.now() - timedelta(days=1, minutes=1)).timestamp()
+        raise Exception("invalid path")
+
+    mocker.patch.object(os.path, "getctime", mock_ctime)
+
+    settings.CACHE_ROOT = tmpdir
+    cache = storage.Cache()
+
+    cache.cleanup()
+
+    assert os.path.isdir(tmpdir / "yt_dlp")
+    assert os.path.isdir(tmpdir / "dld_new")
+    assert not os.path.exists(tmpdir / "dld_old")

ucast_project/settings.py

@@ -32,8 +32,11 @@ def get_env(name, default=None):
 def get_env_path(name, default=None):
     raw_env = get_env(name)
     if not raw_env:
-        return default
+        folder = default
-    return Path(raw_env).absolute()
+    else:
+        folder = Path(raw_env).absolute()
+    os.makedirs(folder, exist_ok=True)
+    return folder
 
 
 def get_env_list(name):
@@ -142,7 +145,7 @@ def _get_db_config() -> dict:
     if db_engine == "sqlite":
         return {
             "ENGINE": "django.db.backends.sqlite3",
-            "NAME": BASE_DIR / f"{db_name}.sqlite",
+            "NAME": DB_DIR / f"{db_name}.sqlite",
         }
 
     db_port = get_env("DB_PORT")
@@ -162,6 +165,18 @@ def _get_db_config() -> dict:
     }
 
 
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/4.0/howto/static-files/
+
+STATIC_URL = "static/"
+STATIC_ROOT = get_env_path("STATIC_ROOT", BASE_DIR / "static")
+DOWNLOAD_ROOT = get_env_path("DOWNLOAD_ROOT", BASE_DIR / "data")
+CACHE_ROOT = get_env_path("CACHE_ROOT", BASE_DIR / "cache")
+DB_DIR = get_env_path("DB_DIR", BASE_DIR / "db")
+
+STATICFILES_DIRS = [resources.path("ucast", "static")]
+
+
 # Database
 # https://docs.djangoproject.com/en/4.0/ref/settings/#databases
 DATABASES = {
@@ -202,16 +217,6 @@ USE_I18N = True
 
 USE_TZ = True
 
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/4.0/howto/static-files/
-
-STATIC_URL = "static/"
-STATIC_ROOT = get_env_path("STATIC_ROOT", BASE_DIR / "static")
-DOWNLOAD_ROOT = get_env_path("DOWNLOAD_ROOT", BASE_DIR / "data")
-CACHE_ROOT = get_env_path("CACHE_ROOT", BASE_DIR / "cache")
-
-STATICFILES_DIRS = [resources.path("ucast", "static")]
-
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field