jenkins-bot merged this change.

View Change

[FIX] fix originalformat is empty.

This problem occurs only in rare cases, for example: https://www.flickr.com/photos/generated/8443/
Flickr API return  originalformat=""

Change-Id: If5507a5589ac8581a7062baf5ad89baf7117031b
---
M scripts/flickrripper.py
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py
index 1df16db..7de0d27 100755
--- a/scripts/flickrripper.py
+++ b/scripts/flickrripper.py
@@ -166,7 +166,7 @@
         'http://wikipedia.ramselehof.de/flinfo.php?%s' % parameters).text
 
 
-def getFilename(photoInfo, site=None, project='Flickr'):
+def getFilename(photoInfo, site=None, project='Flickr', photo_url=None):
     """Build a good filename for the upload based on the username and title.
 
     Prevents naming collisions.
@@ -198,6 +198,9 @@
             title = photoInfo.find('photo').attrib['id']
 
     fileformat = photoInfo.find('photo').attrib['originalformat']
+    if not fileformat and photo_url:
+        fileformat = photo_url.split('.')[-1]
+
     if pywikibot.Page(site, 'File:{} - {} - {}.{}'
                       .format(title, project, username, fileformat)).exists():
         i = 1
@@ -315,7 +318,7 @@
             pywikibot.output('Found duplicate image at {}'
                              .format(duplicates.pop()))
         else:
-            filename = getFilename(photoInfo)
+            filename = getFilename(photoInfo, photo_url=photoUrl)
             flinfoDescription = getFlinfoDescription(photo_id)
             photoDescription = buildDescription(flinfoDescription,
                                                 flickrreview, reviewer,

To view, visit change 577543. To unsubscribe, or for help writing mail filters, visit settings.