Added configure_photo_timeout optional argument to upload_photo func

And return media info instead bool result

instabot/api/api.py

@@ -312,8 +312,8 @@ def expose(self):
         })
         return self.send_request('qe/expose/', data)
 
-    def upload_photo(self, photo, caption=None, upload_id=None, from_video=False):
-        return upload_photo(self, photo, caption, upload_id, from_video)
+    def upload_photo(self, photo, caption=None, upload_id=None, from_video=False, configure_photo_timeout=15):
+        return upload_photo(self, photo, caption, upload_id, from_video, configure_photo_timeout)
 
     def download_photo(self, media_id, filename, media=False, folder='photos'):
         return download_photo(self, media_id, filename, media, folder)

instabot/api/api_photo.py

@@ -86,7 +86,7 @@ def configure_photo(self, upload_id, photo, caption=''):
 
 
 def upload_photo(self, photo, caption=None, upload_id=None, from_video=False,
-                 force_rezize=False):
+                 force_rezize=False, configure_photo_timeout=15):
     if upload_id is None:
         upload_id = str(int(time.time() * 1000))
     if not photo:
@@ -121,11 +121,15 @@ def upload_photo(self, photo, caption=None, upload_id=None, from_video=False,
         config.API_URL + "upload/photo/", data=m.to_string())
 
     if response.status_code == 200:
-        if self.configure_photo(upload_id, photo, caption):
-            self.expose()
-            from os import rename
-            rename(photo, "{}.REMOVE_ME".format(photo))
-            return True
+        for attempt in range(4):
+            if configure_photo_timeout:
+                time.sleep(configure_photo_timeout)
+            if self.configure_photo(upload_id, photo, caption):
+                media = self.last_json.get('media')
+                self.expose()
+                from os import rename
+                rename(photo, "{}.REMOVE_ME".format(photo))
+                return media
     return False
 
 

instabot/bot/bot_photo.py

@@ -6,11 +6,12 @@
 
 def upload_photo(self, photo, caption=None, upload_id=None, from_video=False):
     self.small_delay()
-    if self.api.upload_photo(photo, caption, upload_id, from_video):
-        self.logger.info("Photo '{}' is uploaded.".format(photo))
-        return True
-    self.logger.info("Photo '{}' is not uploaded.".format(photo))
-    return False
+    result = self.api.upload_photo(photo, caption, upload_id, from_video)
+    if not result:
+        self.logger.info("Photo '{}' is not uploaded.".format(photo))
+        return False
+    self.logger.info("Photo '{}' is uploaded.".format(photo))
+    return result
 
 
 def download_photo(self, media_id, folder='photos', filename=None, save_description=False):

instabot/bot/bot_video.py

@@ -4,11 +4,12 @@
 def upload_video(self, video, caption='', thumbnail=None):
     self.small_delay()
     self.logger.info("Started uploading '{video}'".format(video=video))
-    if not self.api.upload_video(video, caption, thumbnail):
+    result = self.api.upload_video(video, caption, thumbnail)
+    if not result:
         self.logger.info("Video '%s' is not %s ." % (video, 'uploaded'))
         return False
     self.logger.info("Video '{video}' uploaded".format(video=video))
-    return True
+    return result
 
 
 def download_video(self, media_id, folder='videos', filename=None, save_description=False):