From 1e72033846e2963a4bf14837f6e1c26dd30c71bb Mon Sep 17 00:00:00 2001 From: LecygneNoir Date: Sun, 19 Jan 2020 11:16:14 +0100 Subject: [PATCH] Update changelog, help and readme to finish the python3 feature --- CHANGELOG.md | 7 ++++--- README.md | 14 ++++++++------ prismedia_upload.py | 8 +++----- requirements.txt | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00c1786..100b580 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,13 @@ ## vX.X.X ### Breaking changes -Now work with python 3! support of python 2 is no longer available. +Now work with python 3! Support of python 2 is no longer available. You should now use python 3 in order to use prismedia ### Features -Added a requirements.txt file to make installing requirement easier. - + - Add a requirements.txt file to make installing requirement easier. + - Add a debug option to show some infos before uploading (thanks to @zykino) + - Now uploading to Peertube before Youtube (thanks to @zykino) ## v0.7.1 diff --git a/README.md b/README.md index 122a39c..2c9accc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prismedia -A scripting way to upload videos to Peertube and Youtube written in python3. +Scripting your way to upload videos to peertube and youtube. Works with Python 3.5+. ## Dependencies Search in your package manager, or with `pip` use ``pip install -r requirements.txt`` @@ -14,7 +14,7 @@ Search in your package manager, or with `pip` use ``pip install -r requirements. - httplib2 - oauthlib - python-magic - - python-magic-bin + - python-magic-bin (Windows only) - requests - requests-oauthlib - requests-toolbelt @@ -92,11 +92,11 @@ Use --help to get all available options: Options: -f, --file=STRING Path to the video file to upload in mp4 --name=NAME Name of the video to upload. (default to video filename) + --debug Trigger some debug information like options used (default: no) -d, --description=STRING Description of the video. (default: default description) -t, --tags=STRING Tags for the video. comma separated. - WARN: tags with space and special characters (!, ', ", ?, ...) + WARN: tags with punctuation (!, ', ", ?, ...) are not supported by Mastodon to be published from Peertube - use mastodon compatibility below -c, --category=STRING Category for the videos, see below. (default: Films) --cca License should be CreativeCommon Attribution (affects Youtube upload only) -p, --privacy=STRING Choose between public, unlisted or private. (default: private) @@ -112,7 +112,6 @@ Options: --publishAt=DATE Publish the video at the given DATE using local server timezone. DATE should be on the form YYYY-MM-DDThh:mm:ss eg: 2018-03-12T19:00:00 DATE should be in the future - For Peertube, requires the "atd" and "curl utilities installed on the system --thumbnail=STRING Path to a file to use as a thumbnail for the video. Supported types are jpg and jpeg. By default, prismedia search for an image based on video name followed by .jpg or .jpeg @@ -120,7 +119,7 @@ Options: If the channel is not found, spawn an error except if --channelCreate is set. --channelCreate Create the channel if not exists. (Peertube only, default do not create) Only relevant if --channel is set. - --playlist=STRING Set the playlist to use for the video. Also known as Channel for Peertube. + --playlist=STRING Set the playlist to use for the video. If the playlist is not found, spawn an error except if --playlistCreate is set. --playlistCreate Create the playlist if not exists. (default do not create) Only relevant if --playlist is set. @@ -173,3 +172,6 @@ Languages: ## Sources inspired by [peeror](https://git.rigelk.eu/rigelk/peeror) and [youtube-upload](https://github.com/tokland/youtube-upload) + +## Contributors +Thanks to: @Zykino, @meewan, @rigelk 😘 \ No newline at end of file diff --git a/prismedia_upload.py b/prismedia_upload.py index 21170b5..3a5e4f8 100755 --- a/prismedia_upload.py +++ b/prismedia_upload.py @@ -13,12 +13,11 @@ Usage: Options: -f, --file=STRING Path to the video file to upload in mp4 --name=NAME Name of the video to upload. (default to video filename) - --debug Show some debug informations like the option actually used (default: no debug info) + --debug Trigger some debug information like options used (default: no) -d, --description=STRING Description of the video. (default: default description) -t, --tags=STRING Tags for the video. comma separated. - WARN: tags with space and special characters (!, ', ", ?, ...) + WARN: tags with punctuation (!, ', ", ?, ...) are not supported by Mastodon to be published from Peertube - use mastodon compatibility below -c, --category=STRING Category for the videos, see below. (default: Films) --cca License should be CreativeCommon Attribution (affects Youtube upload only) -p, --privacy=STRING Choose between public, unlisted or private. (default: private) @@ -34,7 +33,6 @@ Options: --publishAt=DATE Publish the video at the given DATE using local server timezone. DATE should be on the form YYYY-MM-DDThh:mm:ss eg: 2018-03-12T19:00:00 DATE should be in the future - For Peertube, requires the "atd" and "curl utilities installed on the system --thumbnail=STRING Path to a file to use as a thumbnail for the video. Supported types are jpg and jpeg. By default, prismedia search for an image based on video name followed by .jpg or .jpeg @@ -42,7 +40,7 @@ Options: If the channel is not found, spawn an error except if --channelCreate is set. --channelCreate Create the channel if not exists. (Peertube only, default do not create) Only relevant if --channel is set. - --playlist=STRING Set the playlist to use for the video. Also known as Channel for Peertube. + --playlist=STRING Set the playlist to use for the video. If the playlist is not found, spawn an error except if --playlistCreate is set. --playlistCreate Create the playlist if not exists. (default do not create) Only relevant if --playlist is set. diff --git a/requirements.txt b/requirements.txt index e645e88..6fa06a7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ google-auth-oauthlib httplib2 oauthlib python-magic -python-magic-bin +python-magic-bin; platform_system == "Windows" requests requests-oauthlib requests-toolbelt