thm/delojza
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

tweak filename

Browse source
This commit is contained in:
Tomáš Mládek 2018-02-05 09:39:38 +01:00
parent 71cbe7231f
commit 0e0dd5a468
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
robot.py
View file

@ -69,8 +69,8 @@ def download_ydl(urls, subdir, date, extract=False):
shutil.move(globbed, out_dir) shutil.move(globbed, out_dir)
def download_raw(url, subdir, date): def download_raw(url, filename, subdir, date):
local_filename = f"{OUT_DIR}/{subdir}/" + "%s__%s" % (datestr(date), url.split('/')[-1]) local_filename = f"{OUT_DIR}/{subdir}/" + "%s__%s" % (datestr(date), filename or url.split('/')[-1])
# local_filename = OUT_DIR + '/' + ("%s/" % subdir) if subdir else '' + datestr(date) + '__' + url.split('/')[-1] # local_filename = OUT_DIR + '/' + ("%s/" % subdir) if subdir else '' + datestr(date) + '__' + url.split('/')[-1]
r = requests.get(url, stream=True) r = requests.get(url, stream=True)
with open(local_filename, 'wb') as f: with open(local_filename, 'wb') as f:
@ -122,13 +122,15 @@ def handle_url(bot, update):
# noinspection PyBroadException # noinspection PyBroadException
def handle_rest(bot, update): def handle_rest(bot, update):
file = None file, filename = None, None
if len(update.message.photo) > 0: if len(update.message.photo) > 0:
photo = max(update.message.photo, key=lambda p: p.width) photo = max(update.message.photo, key=lambda p: p.width)
file = photo.file_id file = photo.file_id
elif update.message.document is not None: elif update.message.document is not None:
filename = update.message.document.file_name
file = update.message.document.file_id file = update.message.document.file_id
elif update.message.audio is not None: elif update.message.audio is not None:
filename = update.message.audio.title
file = update.message.audio.file_id file = update.message.audio.file_id
elif update.message.video is not None: elif update.message.video is not None:
file = update.message.video.file_id file = update.message.video.file_id
@ -147,7 +149,7 @@ def handle_rest(bot, update):
update.message.reply_text(reply) update.message.reply_text(reply)
if hashtag: if hashtag:
mkdir_p(f'{OUT_DIR}/{hashtag}') mkdir_p(f'{OUT_DIR}/{hashtag}')
download_raw(url, hashtag or '.', update.message.date) download_raw(url, filename, hashtag or '.', update.message.date)
except: except:
type, value, _ = sys.exc_info() type, value, _ = sys.exc_info()
update.message.reply_text("Something is FUCKED: %s, %s" % (type, value)) update.message.reply_text("Something is FUCKED: %s, %s" % (type, value))
@ -173,7 +175,8 @@ def main():
dp.add_error_handler(error) dp.add_error_handler(error)
dp.add_handler(MessageHandler(Filters.entity(MessageEntity.URL), handle_url)) dp.add_handler(MessageHandler(Filters.entity(MessageEntity.URL), handle_url))
dp.add_handler(MessageHandler(Filters.photo | Filters.video | Filters.audio | Filters.voice | Filters.document, handle_rest)) dp.add_handler(
MessageHandler(Filters.photo | Filters.video | Filters.audio | Filters.voice | Filters.document, handle_rest))
updater.start_polling() updater.start_polling()