From b2861e03695942aa3f76ecfc0988681fe26b6bb2 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 2 Dec 2021 18:37:54 +0700 Subject: [PATCH] ScheduleBuilder config class for celery beat --- tubearchivist/home/src/config.py | 56 ++++++++++++++++++++++++++++++++ tubearchivist/home/views.py | 9 ++++- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/tubearchivist/home/src/config.py b/tubearchivist/home/src/config.py index 06cf386..89a6081 100644 --- a/tubearchivist/home/src/config.py +++ b/tubearchivist/home/src/config.py @@ -8,6 +8,7 @@ Functionality: import json import os +from celery.schedules import crontab from home.src.helper import RedisArchivist @@ -150,3 +151,58 @@ class AppConfig: if needs_update: RedisArchivist().set_message("config", redis_config, expire=False) + + +class ScheduleBuilder: + """build schedule dicts for beat""" + + SCHEDULES = [ + "update_subscribed", + "download_pending", + "check_reindex", + "thumbnail_check", + "run_backup", + ] + + def __init__(self): + self.config = AppConfig().config + + def update_schedule_conf(self, form_post): + """process form post""" + print("processing form, restart container for changes to take effect") + redis_config = self.config + for key, value in form_post.items(): + if key in self.SCHEDULES and value[0]: + print(f"change schedule for {key} to {value[0]}") + if value[0] == "0": + to_write = False + else: + keys = ["minute", "hour", "day_of_week"] + to_write = dict(zip(keys, value[0].split())) + redis_config["scheduler"][key] = to_write + RedisArchivist().set_message("config", redis_config, expire=False) + + def build_schedule(self): + """build schedule dict as expected by app.conf.beat_schedule""" + schedule_dict = {} + + for schedule_item in self.SCHEDULES: + item_conf = self.config["scheduler"][schedule_item] + if not item_conf: + continue + + minute = item_conf["minute"] + hour = item_conf["hour"] + day_of_week = item_conf["day_of_week"] + schedule_name = f"schedule_{schedule_item}" + to_add = { + schedule_name: { + "task": schedule_item, + "schedule": crontab( + minute=minute, hour=hour, day_of_week=day_of_week + ), + } + } + schedule_dict.update(to_add) + + return schedule_dict diff --git a/tubearchivist/home/views.py b/tubearchivist/home/views.py index d3ee3f8..6face69 100644 --- a/tubearchivist/home/views.py +++ b/tubearchivist/home/views.py @@ -21,12 +21,13 @@ from home.forms import ( ChannelSearchForm, CustomAuthForm, PlaylistSearchForm, + SchedulerSettingsForm, SubscribeToChannelForm, SubscribeToPlaylistForm, UserSettingsForm, VideoSearchForm, ) -from home.src.config import AppConfig +from home.src.config import AppConfig, ScheduleBuilder from home.src.frontend import PostData from home.src.helper import RedisArchivist, UrlListParser from home.src.index import YoutubePlaylist @@ -889,6 +890,7 @@ class SettingsView(View): user_form = UserSettingsForm() app_form = ApplicationSettingsForm() + scheduler_form = SchedulerSettingsForm() context = { "title": "Settings", @@ -896,6 +898,7 @@ class SettingsView(View): "colors": colors, "user_form": user_form, "app_form": app_form, + "scheduler_form": scheduler_form, } return render(request, "home/settings.html", context) @@ -916,6 +919,10 @@ class SettingsView(View): elif "user-settings" in form_post: del form_post["user-settings"] config_handler.set_user_config(form_post, request.user.id) + elif "scheduler-settings" in form_post: + del form_post["scheduler-settings"] + print(form_post) + ScheduleBuilder().update_schedule_conf(form_post) return redirect("settings", permanent=True)