From d6fc78d3b4f8afa49bd5c89d036dbe9ad8414391 Mon Sep 17 00:00:00 2001
From: Simon <simobilleter@gmail.com>
Date: Mon, 22 Jul 2024 22:53:45 +0200
Subject: [PATCH] clean up, consolidate config.json, celery hooks

---
 docker_assets/run.sh                            |  4 ++--
 tubearchivist/{home => appsettings}/config.json |  0
 tubearchivist/appsettings/src/config.py         |  2 +-
 tubearchivist/config/settings.py                |  1 -
 tubearchivist/home/__init__.py                  |  7 -------
 tubearchivist/home/admin.py                     |  0
 tubearchivist/home/apps.py                      | 10 ----------
 tubearchivist/home/models.py                    |  0
 tubearchivist/home/settings.py                  |  0
 tubearchivist/task/__init__.py                  |  7 +++++++
 tubearchivist/{home => task}/celery.py          |  0
 tubearchivist/task/src/task_manager.py          |  2 +-
 12 files changed, 11 insertions(+), 22 deletions(-)
 rename tubearchivist/{home => appsettings}/config.json (100%)
 delete mode 100644 tubearchivist/home/admin.py
 delete mode 100644 tubearchivist/home/apps.py
 delete mode 100644 tubearchivist/home/models.py
 delete mode 100644 tubearchivist/home/settings.py
 rename tubearchivist/{home => task}/celery.py (100%)

diff --git a/docker_assets/run.sh b/docker_assets/run.sh
index 8cda03c0..59fa8edb 100644
--- a/docker_assets/run.sh
+++ b/docker_assets/run.sh
@@ -17,7 +17,7 @@ python manage.py ta_startup
 
 # start all tasks
 nginx &
-celery -A home.celery worker --loglevel=INFO --max-tasks-per-child 10 &
-celery -A home beat --loglevel=INFO \
+celery -A task.celery worker --loglevel=INFO --max-tasks-per-child 10 &
+celery -A task beat --loglevel=INFO \
     --scheduler django_celery_beat.schedulers:DatabaseScheduler &
 uwsgi --ini uwsgi.ini
diff --git a/tubearchivist/home/config.json b/tubearchivist/appsettings/config.json
similarity index 100%
rename from tubearchivist/home/config.json
rename to tubearchivist/appsettings/config.json
diff --git a/tubearchivist/appsettings/src/config.py b/tubearchivist/appsettings/src/config.py
index 75948254..bd7b2d06 100644
--- a/tubearchivist/appsettings/src/config.py
+++ b/tubearchivist/appsettings/src/config.py
@@ -29,7 +29,7 @@ class AppConfig:
 
     def get_config_file(self):
         """read the defaults from config.json"""
-        with open("home/config.json", "r", encoding="utf-8") as f:
+        with open("appsettings/config.json", "r", encoding="utf-8") as f:
             config_file = json.load(f)
 
         return config_file
diff --git a/tubearchivist/config/settings.py b/tubearchivist/config/settings.py
index 09284cb5..7428c784 100644
--- a/tubearchivist/config/settings.py
+++ b/tubearchivist/config/settings.py
@@ -49,7 +49,6 @@ ALLOWED_HOSTS, CSRF_TRUSTED_ORIGINS = ta_host_parser(
 
 INSTALLED_APPS = [
     "django_celery_beat",
-    "home.apps.HomeConfig",
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
diff --git a/tubearchivist/home/__init__.py b/tubearchivist/home/__init__.py
index 2e00ac76..e69de29b 100644
--- a/tubearchivist/home/__init__.py
+++ b/tubearchivist/home/__init__.py
@@ -1,7 +0,0 @@
-"""start celery app"""
-
-from __future__ import absolute_import, unicode_literals
-
-from home.celery import app as celery_app
-
-__all__ = ("celery_app",)
diff --git a/tubearchivist/home/admin.py b/tubearchivist/home/admin.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tubearchivist/home/apps.py b/tubearchivist/home/apps.py
deleted file mode 100644
index 35d6959b..00000000
--- a/tubearchivist/home/apps.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""handle custom startup functions"""
-
-from django.apps import AppConfig
-
-
-class HomeConfig(AppConfig):
-    """call startup funcs"""
-
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "home"
diff --git a/tubearchivist/home/models.py b/tubearchivist/home/models.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tubearchivist/home/settings.py b/tubearchivist/home/settings.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tubearchivist/task/__init__.py b/tubearchivist/task/__init__.py
index e69de29b..bcbeaf0c 100644
--- a/tubearchivist/task/__init__.py
+++ b/tubearchivist/task/__init__.py
@@ -0,0 +1,7 @@
+"""start celery app"""
+
+from __future__ import absolute_import, unicode_literals
+
+from task.celery import app as celery_app
+
+__all__ = ("celery_app",)
diff --git a/tubearchivist/home/celery.py b/tubearchivist/task/celery.py
similarity index 100%
rename from tubearchivist/home/celery.py
rename to tubearchivist/task/celery.py
diff --git a/tubearchivist/task/src/task_manager.py b/tubearchivist/task/src/task_manager.py
index a63f384a..8606d54b 100644
--- a/tubearchivist/task/src/task_manager.py
+++ b/tubearchivist/task/src/task_manager.py
@@ -5,7 +5,7 @@ functionality:
 """
 
 from common.src.ta_redis import RedisArchivist, TaskRedis
-from home.celery import app as celery_app
+from task.celery import app as celery_app
 from task.src.task_config import TASK_CONFIG