xtaodada/ytdlbot
1
0
Fork 0
mirror of https://github.com/omg-xtao/ytdlbot.git synced 2024-11-16 03:45:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable ffmpeg by default

Browse Source
This commit is contained in:
BennyThink 2022-03-12 22:05:42 +08:00
parent ff5259367b
commit 77a4b34674
No known key found for this signature in database
GPG Key ID: 6CD0DBDA5235D481
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ytdlbot/client_init.py
View File

@ -11,13 +11,13 @@ import os
from pyrogram import Client
from config import APP_HASH, APP_ID, PYRO_WORKERS, TOKEN
from config import APP_HASH, APP_ID, PYRO_WORKERS, TOKEN, IPv6
def create_app(session="ytdl", workers=PYRO_WORKERS):
_app = Client(session, APP_ID, APP_HASH,
bot_token=TOKEN, workers=workers,
ipv6=os.getenv("IPv6", False),
ipv6=IPv6,
# proxy={"hostname": "host.docker.internal", "port": 1080}
)

5
ytdlbot/config.py
View File

@ -31,7 +31,7 @@ MULTIPLY = os.getenv("MULTIPLY", 5) # VIP1 is 5*5-25G, VIP2 is 50G
USD2CNY = os.getenv("USD2CNY", 6) # $5 --> ¥30
ENABLE_VIP = os.getenv("VIP", False)
MAX_DURATION = int(os.getenv("MAX_DURATION", 0))
MAX_DURATION = int(os.getenv("MAX_DURATION", 60))
AFD_LINK = os.getenv("AFD_LINK", "https://afdian.net/@BennyThink")
COFFEE_LINK = os.getenv("COFFEE_LINK", "https://www.buymeacoffee.com/bennythink")
COFFEE_TOKEN = os.getenv("COFFEE_TOKEN")
@ -53,3 +53,6 @@ MYSQL_PASS = os.getenv("MYSQL_PASS", "root")
AUDIO_FORMAT = os.getenv("AUDIO_FORMAT", "m4a")
ARCHIVE_ID = os.getenv("ARCHIVE_ID")
IPv6 = os.getenv("IPv6", False)
ENABLE_FFMPEG = os.getenv("ENABLE_FFMPEG", False)

13
ytdlbot/downloader.py
View File

@ -25,7 +25,8 @@ import yt_dlp as ytdl
from tqdm import tqdm
from yt_dlp import DownloadError
from config import AUDIO_FORMAT, ENABLE_VIP, MAX_DURATION, TG_MAX_SIZE
from config import (AUDIO_FORMAT, ENABLE_FFMPEG, ENABLE_VIP, MAX_DURATION,
TG_MAX_SIZE, IPv6)
from db import Redis
from limit import VIP
from utils import (adjust_formats, apply_log_formatter, current_time,
@ -135,10 +136,8 @@ def convert_to_mp4(resp: dict, bot_msg):
mime = getattr(filetype.guess(path), "mime", "video/mp4")
if mime in default_type:
if not can_convert_mp4(path, bot_msg.chat.id):
logging.warning("Conversion abort for non VIP %s", bot_msg.chat.id)
bot_msg._client.send_message(
bot_msg.chat.id,
f"You're not VIP, so you can't convert video {MAX_DURATION}s to streaming formats.")
logging.warning("Conversion abort for %s", bot_msg.chat.id)
bot_msg._client.send_message(bot_msg.chat.id, "Can't convert your video to streaming format.")
break
edit_text(bot_msg, f"{current_time()}: Converting {path.name} to mp4. Please wait.")
new_file_path = path.with_suffix(".mp4")
@ -170,6 +169,8 @@ def run_ffmpeg(cmd_list, bm):
def can_convert_mp4(video_path, uid):
if not ENABLE_FFMPEG:
return False
if not ENABLE_VIP:
return True
video_streams = ffmpeg.probe(video_path, select_streams="v")
@ -202,7 +203,7 @@ def ytdl_download(url, tempdir, bm) -> dict:
adjust_formats(chat_id, url, formats)
add_instagram_cookies(url, ydl_opts)
address = ["::", "0.0.0.0"] if os.getenv("IPv6") else [None]
address = ["::", "0.0.0.0"] if IPv6 else [None]
for format_ in formats:
ydl_opts["format"] = format_