storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #366 from Eswcvlad/master

Browse Source 
Fix YouTube package update logic
This commit is contained in:
azlux 2023-07-03 11:06:55 +02:00 committed by GitHub
commit 9f032c3a57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
util.py
View File

@ -12,13 +12,15 @@ import zipfile
import re import re
import subprocess as sp import subprocess as sp
import logging import logging
import yt_dlp as youtube_dl
from importlib import reload from importlib import reload
from sys import platform from sys import platform
import traceback import traceback
import requests import requests
from packaging import version from packaging import version
import yt_dlp as youtube_dl
YT_PKG_NAME = 'yt-dlp'
log = logging.getLogger("bot") log = logging.getLogger("bot")
@ -137,7 +139,7 @@ def update(current_version):
new_version = new_release_version(target) new_version = new_release_version(target)
msg = "" msg = ""
if target == "git": if target == "git":
msg = "git install, I do nothing" msg = "git install, I do nothing<br/>"
elif (target == "stable" and version.parse(new_version) > version.parse(current_version)) or \ elif (target == "stable" and version.parse(new_version) > version.parse(current_version)) or \
(target == "testing" and version.parse(new_version) != version.parse(current_version)): (target == "testing" and version.parse(new_version) != version.parse(current_version)):
@ -146,17 +148,17 @@ def update(current_version):
log.debug(tp) log.debug(tp)
log.info('update: update pip libraries dependencies') log.info('update: update pip libraries dependencies')
sp.check_output([var.config.get('bot', 'pip3_path'), 'install', '--upgrade', '-r', 'requirements.txt']).decode() sp.check_output([var.config.get('bot', 'pip3_path'), 'install', '--upgrade', '-r', 'requirements.txt']).decode()
msg = "New version installed, please restart the bot." msg = "New version installed, please restart the bot.<br/>"
log.info('update: starting update youtube-dl via pip3') log.info(f'update: starting update {YT_PKG_NAME} via pip3')
tp = sp.check_output([var.config.get('bot', 'pip3_path'), 'install', '--upgrade', 'youtube-dl']).decode() tp = sp.check_output([var.config.get('bot', 'pip3_path'), 'install', '--upgrade', YT_PKG_NAME]).decode()
if "Requirement already up-to-date" in tp: if f"Collecting {YT_PKG_NAME}" in tp.splitlines():
msg += "Youtube-dl is up-to-date"
else:
msg += "Update done: " + tp.split('Successfully installed')[1] msg += "Update done: " + tp.split('Successfully installed')[1]
else:
msg += YT_PKG_NAME.capitalize() + " is up-to-date"
reload(youtube_dl) reload(youtube_dl)
msg += "<br/> Youtube-dl reloaded" msg += "<br/>" + YT_PKG_NAME.capitalize() + " reloaded"
return msg return msg