diff --git a/README.md b/README.md index 9bad074..a813848 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,8 @@ Options: --disable-comments Disable comments (Peertube only as YT API does not support) (default: comments are enabled) --nsfw Set the video as No Safe For Work (Peertube only as YT API does not support) (default: video is safe) --nfo=STRING Configure a specific nfo file to set options for the video. - By default Prismedia search a .txt based on video name + By default Prismedia search a .txt based on the video name and will + decode the file as UTF-8 (so make sure your nfo file is UTF-8 encoded) See nfo_example.txt for more details --platform=STRING List of platform(s) to upload to, comma separated. Supported platforms are youtube and peertube (default is both) diff --git a/prismedia_upload.py b/prismedia_upload.py index d2bfb8b..d97ca1b 100755 --- a/prismedia_upload.py +++ b/prismedia_upload.py @@ -167,17 +167,17 @@ if __name__ == '__main__': schema = Schema({ '--file': And(str, validateVideo, error='file is not supported, please use mp4'), Optional('--name'): Or(None, And( - unicode, + basestring, lambda x: not x.isdigit(), error="The video name should be a string") ), Optional('--description'): Or(None, And( - unicode, + basestring, lambda x: not x.isdigit(), error="The video description should be a string") ), Optional('--tags'): Or(None, And( - unicode, + basestring, lambda x: not x.isdigit(), error="Tags should be a string") ),