From 81943166d5b8c2606c1506bb1b6567fd0ce82282 Mon Sep 17 00:00:00 2001 From: Hodza Alban Date: Sun, 6 Aug 2017 15:04:48 +0200 Subject: [PATCH] update check_dimension and webm supports --- main.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index 0650450..4754c21 100644 --- a/main.py +++ b/main.py @@ -4,9 +4,9 @@ from glob import glob import youtube_dl from telegram.ext import Updater, MessageHandler, Filters +from vid_utils import check_dimension -logging.basicConfig(format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', - level=logging.INFO) +logging.basicConfig(format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', level=logging.INFO) logger = logging.getLogger(__name__) updater = Updater(token='TOKEN') # put here the bot's token @@ -17,16 +17,21 @@ ydl_opts = { } def download(bot, update): - for f in glob('*.mp4'): + for f in glob('*.mp4*') + glob('*.webm*'): # with glob it isn't possible to check multiple extension in one regex os.remove(f) # remove old video(s) try: with youtube_dl.YoutubeDL(ydl_opts) as ydl: ydl.download([update.message.text]) - for f in glob('*.mp4'): # TODO this way for find the file(s) IMHO is not elegant + for f in glob('*.mp4*') + glob('*.webm*'): # if the video is bigger than 50MB split it + check_dimension(f) + break # check first file + + for f in glob('*.mp4*') + glob('*.webm*'): # send document(s) bot.send_document(chat_id=update.message.chat_id, document=open(f, 'rb')) + except Exception as e: - bot.sendMessage(chat_id=update.message.chat_id, text='Error') + bot.sendMessage(chat_id=update.message.chat_id, text='Error: {}'.format(e)) logger.info(e) download_handler = MessageHandler(Filters.text, download)