diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml index 3331398..5c5b1e9 100644 --- a/.github/workflows/upgrade.yml +++ b/.github/workflows/upgrade.yml @@ -18,6 +18,7 @@ jobs: username: root key: ${{ secrets.SSH_KEY }} script: | + docker save bennythink/ytdlbot > ~/ytdlbot-old.tar cd /home/ytdlbot make bot make upgrade-all-worker diff --git a/ytdlbot/utils.py b/ytdlbot/utils.py index 7300c8d..8e3cad8 100644 --- a/ytdlbot/utils.py +++ b/ytdlbot/utils.py @@ -98,7 +98,6 @@ def current_time(): return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) -def get_revision_tag(): +def get_revision(): revision = subprocess.check_output("git -C ../ rev-parse --short HEAD".split()).decode("u8").replace("\n", "") - tag = subprocess.check_output("git -C ../ describe --tags".split()).decode("u8").replace("\n", "") - return revision, tag + return revision diff --git a/ytdlbot/ytdl_bot.py b/ytdlbot/ytdl_bot.py index 145bd30..a75a895 100644 --- a/ytdlbot/ytdl_bot.py +++ b/ytdlbot/ytdl_bot.py @@ -27,7 +27,7 @@ from db import MySQL, Redis from downloader import convert_flac from limit import verify_payment from tasks import download_entrance -from utils import (customize_logger, get_revision_tag, get_user_settings, +from utils import (customize_logger, get_revision, get_user_settings, set_user_settings) customize_logger(["pyrogram.client", "pyrogram.session.session", "pyrogram.connection.connection"]) @@ -220,7 +220,6 @@ def audio_callback(client: "Client", callback_query: types.CallbackQuery): if __name__ == '__main__': MySQL() - revision_tag = get_revision_tag() scheduler = BackgroundScheduler() scheduler.add_job(Redis().reset_today, 'cron', hour=0, minute=0) scheduler.start() @@ -231,7 +230,7 @@ if __name__ == '__main__': ▘ ▝▀ ▝▀▘ ▘ ▝▀▘ ▀▀ ▝▀▘ ▀▀ ▝▀ ▘▘ ▘ ▘ ▘ ▝▀ ▝▀▘ ▝▀▘ By @BennyThink, VIP mode: {ENABLE_VIP}, Distribution: {ENABLE_CELERY} -Version: {revision_tag[0]}@{revision_tag[1]} +Version: {get_revision()} """ print(banner) app.run()