added new samples code. added support JSON format. minor bugfix

Author: obhodny

qencode/__init__.py

@@ -27,5 +27,7 @@ def x265_video_codec():
   from custom_params import Libx265_VideoCodecParameters
   return Libx265_VideoCodecParameters()
 
+from exeptions import QencodeClientException, QencodeTaskException
+
 
 

qencode/client.py

@@ -7,34 +7,39 @@ class QencodeApiClient(object):
       :return: encoder object
 
   """
-  def __init__(self, api_key, api_url=None, version=None, **kwargs):
+  def __init__(self, api_key, api_url=None, version=None):
     self.api_key = api_key
     self.api_url = api_url if api_url else 'https://api.qencode.com/'
     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.code = None
     self.message = ''
     self._get_access_token()
 
+
   def create_task(self, **kwargs):
     return Task(self.access_token, self.connect, **kwargs)
 
-  def refresh_access_token(self, **kwargs):
+  def refresh_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.code = response['error']
       self.message = response.get('message')
 
+
   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')
+      self.error = response['error']
+      self.code = response['error']
+      self.message = response.get('message')

qencode/custom_params.py

@@ -1,6 +1,6 @@
 import json
 from json import JSONEncoder
-from utils import rm_key_if_null
+from utils import rm_attributes_if_null
 
 class CustomTranscodingParams(object):
   """CustomTranscodingParams
@@ -13,10 +13,10 @@ def __init__(self):
     self.source = None
     self.format = None
     self.callback_url = None
-    rm_key_if_null(self)
+    rm_attributes_if_null(self)
 
   def remove_null_params(self):
-    rm_key_if_null(self)
+    rm_attributes_if_null(self)
 
 class Format(object):
   """
@@ -45,10 +45,10 @@ def __init__(self):
     self.time = None
     self.path = None
     self.resize_mod = None
-    rm_key_if_null(self)
+    rm_attributes_if_null(self)
 
   def remove_null_params(self):
-    rm_key_if_null(self)
+    rm_attributes_if_null(self)
 
 class Destination(object):
   def __init__(self):
@@ -57,10 +57,10 @@ def __init__(self):
     self.secret = None
     self.permissions = None
     self.storage_class = None
-    rm_key_if_null(self)
+    rm_attributes_if_null(self)
 
   def remove_null_params(self):
-    rm_key_if_null(self)
+    rm_attributes_if_null(self)
 
 class Stream(object):
   def __init__(self):
@@ -84,12 +84,10 @@ def __init__(self):
     self.downmix_mode = None
     self.logo = None
     self.aspect_ratio = None
-    rm_key_if_null(self)
+    rm_attributes_if_null(self)
 
   def remove_null_params(self):
-    rm_key_if_null(self)
-
-
+    rm_attributes_if_null(self)
 
 class Libx264_VideoCodecParameters(object):
   def __init__(self):
@@ -101,10 +99,10 @@ def __init__(self):
     self.bf = None
     self.directpred = None
     self.me_method = None
-    rm_key_if_null(self)
+    rm_attributes_if_null(self)
 
   def remove_null_params(self):
-    rm_key_if_null(self)
+    rm_attributes_if_null(self)
 
 class Libx265_VideoCodecParameters(object):
   def __init__(self):
@@ -134,7 +132,7 @@ def prepare_params(self):
   def validate_params(self):
     if not self.params:
       self.error = True
-      self.message = 'for custom start encode - params is required'
+      self.message = 'Params is required'
       return
     if not 'source' in self.params.__dict__:
       self.error = True
@@ -143,20 +141,4 @@ def validate_params(self):
     if not 'format' in self.params.__dict__:
       self.error = True
       self.message = 'Params: format is required'
-      return
-    for format in self.params.format:
-      if not 'stream' in format.__dict__:
-        self.error = True
-        self.message = 'Params: stream is required in the format list'
-        return
-      if not 'output' in format.__dict__:
-        self.error = True
-        self.message = 'Params: output format is required in the format list'
-        return
-      for stream in format.stream:
-        if not 'size' in stream.__dict__:
-          self.error = True
-          self.message = 'Params: size is required in the stream list'
-          return
-
-
+      return

qencode/exeptions.py

@@ -1,7 +1,18 @@
 class QencodeException(Exception):
-  def __init__(self):
-    pass
+  def __init__(self, message,  *args):
+    super(QencodeException, self).__init__(message, *args)
+    self.error = message
+    self.arg = [i for i in args]
+
+class QencodeClientException(QencodeException):
+  def __init__(self, message,  *args):
+    super(QencodeClientException, self).__init__(message, *args)
+
+
+class QencodeTaskException(QencodeException):
+  def __init__(self, message,  *args):
+    super(QencodeTaskException, self).__init__(message, *args)
+
+
+
 
-class QencodeApiException(QencodeException):
-  def __init__(self):
-    pass