automatic detection of the status server

Author: obhodny

qencode/client.py

@@ -13,6 +13,7 @@ def __init__(self, api_key, api_url=None, version=None, **kwargs):
     self.version = version if version else 'v1'
     self.connect = Http(self.version, self.api_url)
     self.access_token = None
+    self.expire = None
     self.error = None
     self.message = ''
     self._get_access_token()
@@ -24,6 +25,7 @@ def refresh_access_token(self, **kwargs):
     response = self.connect.request('access_token', dict(api_key=self.api_key))
     if not response['error']:
       self.access_token = response['token']
+      self.expire = response['expire']
     else:
       self.error = response['error']
       self.message = response.get('message')
@@ -32,6 +34,7 @@ def _get_access_token(self):
     response = self.connect.request('access_token', dict(api_key=self.api_key))
     if not response['error']:
       self.access_token = response['token']
+      self.expire = response['expire']
     else:
      self.error = response['error']
      self.message = response.get('message')

qencode/task.py

@@ -61,22 +61,26 @@ def _start_encode(self, api_name, data):
       self.message = res.get('message')
 
   def _status(self):
-    response = self.connect.post(self.status_url, dict(task_tokens=self.task_token))
+    response = self.connect.post(self.status_url, dict(task_tokens=self.task_token))   
     if not response['error']:
         status = response['statuses'][self.task_token]
         if not status:
           status = self._status2()
+        if status.get('status_url'):
+          self.status_url = status.get('status_url')
         return status
     else:
       status = self._status2()
       return status
 
 
   def _status2(self):
-    response = self.connect.request('status', {'task_tokens[]': self.task_token})
+    response = self.connect.request('status', {'task_tokens[]': self.task_token})    
     if not response['error']:
       res = response['statuses'][self.task_token]
       if res:
+        if res.get('status_url'):
+          self.status_url = res.get('status_url')
         return res
       else:
         return dict(error=True, message='Error getting status')