Merge branch 'hotfix/v0.6.1' into develop

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.6.1
+
+### Fixes
+ - fix an error when playlists on Peertube have same names but not same display names (issue #20)
+ - fix an error where videos does not upload on Peertube when some characters are used in playlist(issue #19)
+
 ## v0.6
 
 ### Compatibility ###

lib/pt_upload.py

@@ -88,6 +88,11 @@ def create_playlist(oauth, url, options):
             jresponse = response.json()
             jresponse = jresponse['videoChannel']
             return jresponse['id']
+        if response.status_code == 409:
+            logging.error('Peertube: Error: It seems there is a conflict with an existing playlist, please beware '
+                          'Peertube internal name is compiled from 20 firsts characters of playlist name.'
+                          ' Please check your playlist name an retry.')
+            exit(1)
         else:
             logging.error(('Peertube: The upload failed with an unexpected response: '
                            '%s') % response)

prismedia_upload.py

@@ -94,7 +94,7 @@ except ImportError:
                   'see https://github.com/ahupp/python-magic\n')
     exit(1)
 
-VERSION = "prismedia v0.6"
+VERSION = "prismedia v0.6.1"
 
 VALID_PRIVACY_STATUSES = ('public', 'private', 'unlisted')
 VALID_CATEGORIES = (