From 605f1a8d673832a04212caf4e59334990b173646 Mon Sep 17 00:00:00 2001 From: LecygneNoir Date: Fri, 16 Mar 2018 09:09:43 +0100 Subject: [PATCH] Validate options schema after parsing NFO, to validate data imported from NFO (sanity checks) --- nfo_example.txt | 3 ++- prismedia_upload.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nfo_example.txt b/nfo_example.txt index c496603..d2edce5 100644 --- a/nfo_example.txt +++ b/nfo_example.txt @@ -13,4 +13,5 @@ category = Films cca = True privacy = private disable-comments = True -nsfw = True \ No newline at end of file +nsfw = True +platform = youtub \ No newline at end of file diff --git a/prismedia_upload.py b/prismedia_upload.py index 60bb11c..d0359d9 100755 --- a/prismedia_upload.py +++ b/prismedia_upload.py @@ -63,7 +63,7 @@ except ImportError: ' is installed, NOT the Python bindings to libmagic API \n' 'see https://github.com/ahupp/python-magic\n') -VERSION = "prismedia 0.3" +VERSION = "prismedia v0.3" VALID_PRIVACY_STATUSES = ('public', 'private', 'unlisted') VALID_CATEGORIES = ( "music", "films", "vehicles", @@ -145,13 +145,13 @@ if __name__ == '__main__': '--version': bool }) + options = utils.parseNFO(options) + try: options = schema.validate(options) except SchemaError as e: exit(e) - options = utils.parseNFO(options) - if options.get('--platform') is None or "youtube" in options.get('--platform'): yt_upload.run(options) if options.get('--platform') is None or "peertube" in options.get('--platform'):