Merge branch 'hotfix/v0.6.1-1' into develop

This commit is contained in:
LecygneNoir 2019-03-09 11:35:58 +01:00
commit 8f0fc4cfb5
5 changed files with 12 additions and 21 deletions

View file

@ -6,7 +6,7 @@ prismedia_upload - tool to upload videos to Peertube and Youtube
Usage:
prismedia_upload.py --file=<FILE> [options]
prismedia_upload.py -f <FILE> --tags=STRING [--mt options]
prismedia_upload.py -f <FILE> --tags=STRING [options]
prismedia_upload.py -h | --help
prismedia_upload.py --version
@ -18,8 +18,6 @@ Options:
WARN: tags with space and special characters (!, ', ", ?, ...)
are not supported by Mastodon to be published from Peertube
use mastodon compatibility below
--mt Force Mastodon compatibility for tags (drop every incompatible characters inside tags)
This option requires --tags
-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)
@ -94,7 +92,7 @@ except ImportError:
'see https://github.com/ahupp/python-magic\n')
exit(1)
VERSION = "prismedia v0.6.1"
VERSION = "prismedia v0.6.1-1"
VALID_PRIVACY_STATUSES = ('public', 'private', 'unlisted')
VALID_CATEGORIES = (
@ -181,7 +179,6 @@ if __name__ == '__main__':
lambda x: not x.isdigit(),
error="Tags should be a string")
),
Optional('--mt'): bool,
Optional('--category'): Or(None, And(
str,
validateCategory,