updates for status

Author: obhodny

qencode/__init__.py

@@ -29,7 +29,7 @@ def x265_video_codec():
 
 from exeptions import QencodeClientException, QencodeTaskException
 
-__version__ = "0.9.28"
+__version__ = "0.9.29"
 __status__ = "Beta"
 __author__ = "Qencode"
 

qencode/const.py

@@ -1,4 +1,20 @@
 REPEAT = 32
 SLEEP_REGULAR = 10
 SLEEP_ERROR = 60
-COMPLETED_STATUS = ['completed', 'saved']
+COMPLETED_STATUS = ['completed', 'saved']
+
+ERROR_OK                = 0
+ERROR_SERVER_INTERNAL   = 1
+ERROR_BAD_APP_ID        = 2
+ERROR_APP_ID_NOT_FOUND  = 3
+ERROR_BAD_TOKEN         = 4
+ERROR_TOKEN_NOT_FOUND   = 5
+ERROR_TARIFF_NOT_PAID   = 6
+ERROR_MASTER_NOT_FOUND  = 7
+ERROR_SYSTEM_BUSY       = 8
+ERROR_BAD_PAYLOAD       = 9
+ERROR_PROJECT_NOT_FOUND = 10
+ERROR_BAD_PROFILE       = 11
+ERROR_PROFILE_NOT_FOUND = 12
+ERROR_BAD_TOKENS        = 13
+ERROR_FIELD_REQUIRED    = 14

qencode/httptools.py

@@ -11,7 +11,7 @@ def __init__(self, version, url, debug=False):
 
   def _call_server(self, url, post_data):
     if not url:
-      response = dict(error=True, message='AttributeError: not URL')
+      response = dict(error=True, message='AttributeError: Bad URL')
       return json.dumps(response)
     data = urllib.urlencode(post_data)
     request = urllib2.Request(url, data)

qencode/task.py

@@ -9,6 +9,7 @@ class Task(object):
   def __init__(self, access_token, connect, debug=False, **kwargs):
     self.connect = connect
     self.status_url = None
+    self.main_status_url = '{0}/{1}/status'.format(self.connect.url, self.connect.version)
     self.task_token = None
     self.upload_url = None
     self.access_token = access_token
@@ -60,9 +61,6 @@ def custom_start(self, data,  **kwargs):
     if not self.error and self.task_token:
       self._start_encode('start_encode2', data)
 
-   
-      
-
   def status(self):
     return self._status()
 
@@ -121,7 +119,6 @@ def _prepare_query(self, params):
         finally:
           self.message = "JSON is not well formatted"
 
-
   def _prepare_data(self, profiles, video_url, **kwargs):
     data = dict(
       task_token=self.task_token,
@@ -161,38 +158,34 @@ def _create_task(self, count):
         time.sleep(SLEEP_ERROR)
         self._create_task(count + 1)
 
+
   def _start_encode(self, api_name, data):
     res = self.connect.request(api_name, data)
-    if not res['error']:
-      self.status_url = res.get('status_url')
+    if not res['error'] and res.get('status_url'):
+      self.status_url = res['status_url']
     else:
-      self.status_url = '{0}/{1}/status'.format(self.connect.url, self.connect.version)
-      self.error = res['error']
+      self.status_url = self.main_status_url
+      self.error = res.get('error')
       self.message = res.get('message')
 
   def _status(self):
     response = self.connect.post(self.status_url, dict(task_tokens=self.task_token))
-    if not response['error']:
+    status = None
+
+    if response['error'] == ERROR_BAD_TOKENS:
+      raise ValueError('Bad token: ' + str(self.task_token))
+
+    if 'statuses' in response and self.task_token in response['statuses']:
+      status = response['statuses'][self.task_token]
+
+    if not status and self.status_url != self.main_status_url:
+      self.status_url = self.main_status_url
+      response = self.connect.post(self.status_url, dict(task_tokens=self.task_token))
+      if 'statuses' in response and self.task_token in response['statuses']:
         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})
-    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')
-    else:
-      return response
+
+    if status and 'status_url' in status:
+      self.status_url = status['status_url']
+
+    return status
 

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='qencode',
-    version='0.9.28',
+    version='0.9.29',
     description="Client library for main features and functionality of Qencode for Python v2.x.",
     long_description=long_description,
     long_description_content_type='text/markdown',