From 4a9fda5e771f3ec96fc49887de5a31d24deb11d1 Mon Sep 17 00:00:00 2001 From: LecygneNoir Date: Wed, 2 Dec 2020 11:28:07 +0100 Subject: [PATCH] Add one function to deal with date to avoid duplicate code --- prismedia/pt_upload.py | 17 +++++++++-------- prismedia/yt_upload.py | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/prismedia/pt_upload.py b/prismedia/pt_upload.py index 8267ecd..23c1453 100644 --- a/prismedia/pt_upload.py +++ b/prismedia/pt_upload.py @@ -63,6 +63,13 @@ def get_channel_by_name(user_info, options): return channel['id'] +def convert_peertube_date(date): + date = datetime.datetime.strptime(date, '%Y-%m-%dT%H:%M:%S') + tz = get_localzone() + tz = pytz.timezone(str(tz)) + return tz.localize(date).isoformat() + + def create_channel(oauth, url, options): template = ('Peertube: Channel %s does not exist, creating it.') logger.info(template % (str(options.get('--channel')))) @@ -255,10 +262,7 @@ def upload_video(oauth, secret, options): publishAt = options.get('--publishAt') if 'publishAt' in locals(): - publishAt = datetime.datetime.strptime(publishAt, '%Y-%m-%dT%H:%M:%S') - tz = get_localzone() - tz = pytz.timezone(str(tz)) - publishAt = tz.localize(publishAt).isoformat() + publishAt = convert_peertube_date(publishAt) fields.append(("scheduleUpdate[updateAt]", publishAt)) fields.append(("scheduleUpdate[privacy]", str(PEERTUBE_PRIVACY["public"]))) fields.append(("privacy", str(PEERTUBE_PRIVACY["private"]))) @@ -267,10 +271,7 @@ def upload_video(oauth, secret, options): # Set originalDate except if the user force no originalDate if not options.get('--no-originalDate'): - originalDate = datetime.datetime.strptime(options.get('--originalDate'), '%Y-%m-%dT%H:%M:%S') - tz = get_localzone() - tz = pytz.timezone(str(tz)) - originalDate = tz.localize(originalDate).isoformat() + originalDate = convert_peertube_date(options.get('--originalDate')) fields.append(("originallyPublishedAt", originalDate)) if options.get('--thumbnail'): diff --git a/prismedia/yt_upload.py b/prismedia/yt_upload.py index afccf1a..1ffc2a5 100644 --- a/prismedia/yt_upload.py +++ b/prismedia/yt_upload.py @@ -97,6 +97,7 @@ def convert_youtube_date(date): tz = pytz.timezone(str(tz)) return tz.localize(date).isoformat() + def initialize_upload(youtube, options): path = options.get('--file') tags = None