purge tasks

Author: BennyThink

requirements.txt

@@ -11,8 +11,8 @@ flower==1.2.0
 psutil==5.9.4
 influxdb==5.3.1
 beautifulsoup4==4.11.1
-fakeredis==2.1.0
-supervisor==4.2.4
+fakeredis==2.4.0
+supervisor==4.2.5
 tgbot-ping==1.0.4
 redis==4.3.3
 requests==2.28.1

ytdlbot/tasks.py

@@ -27,16 +27,16 @@
 from apscheduler.schedulers.background import BackgroundScheduler
 from celery import Celery
 from celery.worker.control import Panel
-from pyrogram import Client, idle
+from pyrogram import idle
 from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, Message
 from requests_toolbelt import MultipartEncoder, MultipartEncoderMonitor
 
 from client_init import create_app
-from config import (ARCHIVE_ID, AUDIO_FORMAT, BROKER, ENABLE_CELERY,
+from config import (ARCHIVE_ID, BROKER, ENABLE_CELERY,
                     ENABLE_QUEUE, ENABLE_VIP, TG_MAX_SIZE, WORKERS)
 from constant import BotText
 from db import Redis
-from downloader import (edit_text, run_ffmpeg, sizeof_fmt, tqdm_progress,
+from downloader import (edit_text, sizeof_fmt, tqdm_progress,
                         upload_hook, ytdl_download)
 from limit import VIP
 from utils import (apply_log_formatter, auto_restart, customize_logger,
@@ -433,6 +433,9 @@ def run_celery():
         argv.extend(["-Q", worker_name])
     app.worker_main(argv)
 
+def purge_tasks():
+    count = app.control.purge()
+    return f"purged {count} tasks."
 
 if __name__ == '__main__':
     celery_client.start()

ytdlbot/ytdl_bot.py

@@ -23,7 +23,6 @@
 from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from tgbot_ping import get_runtime
 from token_bucket import Limiter, MemoryStorage
-from youtubesearchpython import VideosSearch
 
 from client_init import create_app
 from config import (AUTHORIZED_USER, BURST, ENABLE_CELERY, ENABLE_FFMPEG,
@@ -32,7 +31,7 @@
 from db import InfluxDB, MySQL, Redis
 from limit import VIP, verify_payment
 from tasks import app as celery_app
-from tasks import (audio_entrance, direct_download_entrance, hot_patch,
+from tasks import (audio_entrance, direct_download_entrance, hot_patch, purge_tasks,
                    ytdl_download_entrance)
 from utils import (auto_restart, customize_logger, get_revision,
                    get_user_settings, set_user_settings)
@@ -159,6 +158,13 @@ def uncache_handler(client: "Client", message: "types.Message"):
         message.reply_text(f"{count} cache(s) deleted.", quote=True)
 
 
+@app.on_message(filters.command(["purge"]))
+def purge_handler(client: "Client", message: "types.Message"):
+    username = message.from_user.username
+    if username == OWNER:
+        message.reply_text(purge_tasks, quote=True)
+
+
 @app.on_message(filters.command(["ping"]))
 def ping_handler(client: "Client", message: "types.Message"):
     chat_id = message.chat.id