Merge branch 'master' into requests-http

Alex Schworer · Alex Schworer · commit 38d1e4eb7bf7 · 2013-05-20T17:52:42.000-07:00
Conflicts:
	zencoder/__init__.py
diff --git a/zencoder/__init__.py b/zencoder/__init__.py
@@ -1,9 +1,8 @@
 from .core import Zencoder
 from .core import ZencoderResponseError
-
 from .core import Account
+from .core import __version__
 
-__version__ = '0.5.2'
 __title__ = 'zencoder'
 __author__ = 'Alex Schworer'
 
diff --git a/zencoder/core.py b/zencoder/core.py
@@ -2,8 +2,6 @@
 import requests
 from datetime import datetime
 
-LIB_VERSION = '0.5.2'
-
 # Note: I've seen this pattern for dealing with json in different versions of
 # python in a lot of modules -- if there's a better way, I'd love to use it.
 try:
@@ -20,6 +18,8 @@
         from django.utils import simplejson
         json = simplejson
 
+__version__ = '0.5.2'
+
 class ZencoderError(Exception):
     pass
 
@@ -62,7 +62,7 @@ def headers(self):
             'Content-Type': 'application/json',
             'Accept': 'application/json',
             'Zencoder-Api-Key': self.api_key,
-            'User-Agent': 'zencoder-py v{0}'.format(LIB_VERSION)
+            'User-Agent': 'zencoder-py v{0}'.format(__version__)
         }
 
         return headers
@@ -237,17 +237,16 @@ def __init__(self, *args, **kwargs):
         kwargs['resource_name'] = 'jobs'
         super(Job, self).__init__(*args, **kwargs)
 
-    def create(self, input, outputs=None, options=None):
+    def create(self, input=None, live_stream=False, outputs=None, options=None):
         """
-        Creates a job
+        Creates a transcoding job.
 
         @param input: the input url as string
+        @param live_stream: starts an RTMP Live Stream
         @param outputs: a list of output dictionaries
         @param options: a dictionary of job options
         """
-        as_test = int(self.test)
-
-        data = {"input": input, "test": as_test}
+        data = {"input": input, "test": self.test}
         if outputs:
             data['outputs'] = outputs
 
@@ -304,6 +303,10 @@ def delete(self, job_id):
         """
         return self.cancel(job_id)
 
+    def finish(self, job_id):
+        """ Finishes the live stream for `job_id`. """
+        return self.put(self.base_url + '/%s/finish' % str(job_id))
+
 class Report(HTTPBackend):
     def __init__(self, *args, **kwargs):
         """
@@ -344,3 +347,4 @@ def minutes(self, start_date=None, end_date=None, grouping=None):
 
         url = self.base_url + '/minutes'
         return self.get(url, data=data)
+
