add support to provide an extension on the filename

fix #109

flickr_api/objects.py

@@ -29,6 +29,7 @@
 from . import auth
 import warnings
 from itertools import groupby
+import os.path
 
 try:
     from PIL import Image    
@@ -1314,6 +1315,17 @@ def getPhotoFile(self, size_label=None):
         except KeyError:
             raise FlickrError("The requested size is not available")
 
+    def _getOutputFilename(self, filename, size_label):
+        photo_file = self.getPhotoFile(size_label)
+        file_ext = ('.' + photo_file.split('.')[-1]) if self.media == "photo" else ".mp4"
+
+        output_filename = filename
+        if os.path.splitext(filename)[1] == '':
+            output_filename = filename + file_ext
+
+        return output_filename
+
+
     def save(self, filename, size_label=None):
         """
             saves the photo corresponding to the
@@ -1334,14 +1346,14 @@ def save(self, filename, size_label=None):
         """
         if size_label is None:
             size_label = self._getLargestSizeLabel()
-
-        photo_file = self.getPhotoFile(size_label)
-        file_ext = ('.' + photo_file.split('.')[-1]) if self.media == "photo" else ".mp4"
-        r = urllib.request.urlopen(photo_file)
+        output_filename = self._getOutputFilename(filename, size_label)
 
-        with open(filename + file_ext, 'wb') as f:
+        r = urllib.request.urlopen(photo_file)
+        with open(output_filename, 'wb') as f:
             f.write(r.read())
             f.close()
+
+        return output_filename
 
     def show(self, size_label=None):
         """

test/test_parse_sizes.py

@@ -26,6 +26,42 @@ def test_video_largest_size(self):
             media="video")
         self.assertEqual("HD MP4", p._getLargestSizeLabel())
 
+    def test_video_output_filename(self):
+        p = f.objects.Photo(
+            id=1234,
+            sizes={
+                "HD MP4":
+                dict(
+                    media="video",
+                    url="v@url",
+                    source="v@source",
+                    width=100,
+                    height=100,
+                )
+            },
+            media="video")
+        self.assertEqual("source.mp4", p._getOutputFilename("source", "HD MP4"))
+        self.assertEqual("source.mp4", p._getOutputFilename("source.mp4", "HD MP4"))
+        self.assertEqual("source.jpeg", p._getOutputFilename("source.jpeg", "HD MP4"))
+
+    def test_photo_output_filename(self):
+        p = f.objects.Photo(
+            id=1234,
+            sizes={
+                "Large":
+                dict(
+                    media="photo",
+                    url="p@url",
+                    source="p/source.jpg",
+                    width=2000,
+                    height=2000)
+            },
+            media="photo")
+        self.assertEqual("source.jpg", p._getOutputFilename("source", "Large"))
+        self.assertEqual("source.jpg", p._getOutputFilename("source.jpg", "Large"))
+        self.assertEqual("source.jpeg", p._getOutputFilename("source.jpeg", "Large"))
+
+
     def test_photo_largest_size(self):
         p = f.objects.Photo(
             id=1234,