Merge pull request #137 from vladak/duplicate_photo_handling

introduce FlickrDuplicate exception

Author: randomcascade

flickrapi/core.py

@@ -245,7 +245,13 @@ def parse_xmlnode(self, rest_xml):
             return rsp
 
         err = rsp.err[0]
-        raise FlickrError('Error: %(code)s: %(msg)s' % err, code=err['code'])
+        code = err['code']
+        if int(code) == 9:
+            dup_id = rsp.duplicate_photo_id[0].text
+            raise FlickrDuplicate('Duplicate photo',
+                                  duplicate_photo_id=dup_id)
+
+        raise FlickrError('Error: %(code)s: %(msg)s' % err, code=code)
 
     @rest_parser('parsed-json', 'json')
     def parse_json(self, json_string):
@@ -293,6 +299,11 @@ def parse_etree(self, rest_xml):
 
         err = rsp.find('err')
         code = err.attrib.get('code', None)
+        if int(code) == 9:
+            dup_id = rsp.find('duplicate_photo_id')
+            raise FlickrDuplicate('Duplicate photo',
+                                  duplicate_photo_id=dup_id.text)
+
         raise FlickrError('Error: %(code)s: %(msg)s' % err.attrib, code=code)
 
     def __getattr__(self, method_name):

flickrapi/exceptions.py

@@ -25,6 +25,22 @@ def __init__(self, message, code=None):
             self.code = int(code)
 
 
+class FlickrDuplicate(Exception):
+    """Raised when Flickr detects duplicate photo being uploaded.
+
+    The duplicate detection only happens if the upload request contains
+    the 'dedup_check' parameter set to either 1 or 2.
+
+    The exception contains ID of the duplicate photo as returned
+    from the API call.
+
+    """
+    def __init__(self, message, duplicate_photo_id):
+        super().__init__(self, message)
+
+        self.duplicate_photo_id = duplicate_photo_id
+
+
 class CancelUpload(Exception):
     """Raise this exception in an upload/replace callback function to
     abort the upload.