streamline image hosting

Author: mueslo

pythonbits/bb.py

@@ -304,7 +304,7 @@ def _render_screenshots(self):
         return ffmpeg.take_screenshots(ns)
 
     def _finalize_screenshots(self):
-        return imagehosting.upload_files(*self['screenshots'])
+        return imagehosting.upload(*self['screenshots'])
 
     def _render_mediainfo(self):
         try:
@@ -530,7 +530,7 @@ def _render_cover(self):
         return self['summary']['cover']
 
     def _finalize_cover(self):
-        return imagehosting.upload_urls(self['cover'])
+        return imagehosting.upload(self['cover'])
 
 
 class TvSubmission(VideoSubmission):

pythonbits/imagehosting.py

@@ -10,17 +10,19 @@
                 ask=True)
 
 
-def upload_files(*images):
+def get_provider():
     provider = config.get('ImageHosting', 'provider')
     if provider.lower() == 'imgur':
-        return ImgurUploader().upload(*images)
+        return ImgurUploader
     elif provider.lower() == 'ptpimg':
-        return PtpImgUploader().upload_files(*images)
+        return PtpImgUploader
+    raise Exception('Unknown image hosting provider in config {}'.format(
+        config.config_path
+        ))
 
 
-def upload_urls(*images):
-    provider = config.get('ImageHosting', 'provider')
-    if provider.lower() == 'imgur':
-        return ImgurUploader().upload(*images)
-    elif provider.lower() == 'ptpimg':
-        return PtpImgUploader().upload_urls(*images)
+def upload(*images, provider=None):
+    if not provider:
+        provider = get_provider()
+        uploader = provider()
+    return list(uploader.upload(*images))

pythonbits/imgur.py

@@ -76,7 +76,6 @@ def __init__(self):
 
     def upload(self, *images):
         self.imgur_auth.prepare()
-        links = []
         for image in images:
             params = {'headers': self.imgur_auth.get_auth_headers()}
 
@@ -99,8 +98,4 @@ def upload(self, *images):
                          extensions[0], extensions[1])
 
             log.notice("Image URL: {}", link)
-            if len(images) == 1:
-                return link
-            else:
-                links.append(link)
-        return links
+            yield link

pythonbits/ptpimg.py

@@ -13,6 +13,7 @@
 import os
 from io import BytesIO
 from textwrap import dedent
+from urllib.parse import urlparse
 
 import requests
 
@@ -122,6 +123,16 @@ def upload_urls(self, *urls):
 
             return self._perform(files=files)
 
+    def upload(self, *images):
+        for image in images:
+            if urlparse(image).scheme in ('http', 'https'):
+                yield self.upload_urls(image)
+            elif urlparse(image).scheme in ('file', ''):
+                yield self.upload_files(image)
+            else:
+                raise Exception('Unknown image URI scheme '
+                                '{}'.format(urlparse(image).scheme))
+
 
 def _partition(files_or_urls):
     files, urls = [], []