version 1.0.1

vinta · vinta · commit ec55876b7b49 · 2017-06-09T17:30:21.000+08:00
diff --git a/dj_elastictranscoder/__init__.py b/dj_elastictranscoder/__init__.py
@@ -1 +1 @@
-__version__ = '1.0.0'
+__version__ = '1.0.1'
diff --git a/dj_elastictranscoder/views.py b/dj_elastictranscoder/views.py
@@ -20,7 +20,8 @@ def aws_endpoint(request):
     """
 
     try:
-        data = json.loads(request.read().decode('utf-8'))
+        webhook = request.read().decode('utf-8')
+        data = json.loads(webhook)
     except ValueError:
         return HttpResponseBadRequest('Invalid JSON')
 
@@ -43,15 +44,17 @@ def aws_endpoint(request):
 
     # https://docs.aws.amazon.com/elastictranscoder/latest/developerguide/notifications.html
     if state == 'PROGRESSING':
+        job.message = webhook
         job.state = 1
         job.save()
         transcode_onprogress.send(sender=None, job=job, job_response=data)
     elif state == 'COMPLETED':
+        job.message = webhook
         job.state = 4
         job.save()
         transcode_oncomplete.send(sender=None, job=job, job_response=data)
     elif state == 'ERROR':
-        job.message = message['messageDetails']
+        job.message = webhook
         job.state = 2
         job.save()
         transcode_onerror.send(sender=None, job=job, job_response=data)
@@ -69,27 +72,29 @@ def qiniu_endpoint(request):
     """
 
     try:
-        data = json.loads(request.body)
+        webhook = request.read().decode('utf-8')
+        data = json.loads(webhook)
     except ValueError:
         return HttpResponseBadRequest('Invalid JSON')
 
     code = data['code']
-    desc = data['desc']
     job_id = data['id']
 
     job = EncodeJob.objects.get(pk=job_id)
 
     # https://developer.qiniu.com/dora/manual/1294/persistent-processing-status-query-prefop
     if code in (1, 2):  # Progressing
+        job.message = webhook
         job.state = 1
         job.save()
         transcode_onprogress.send(sender=None, job=job, job_response=data)
     elif code == 0:  # Complete
+        job.message = webhook
         job.state = 4
         job.save()
         transcode_oncomplete.send(sender=None, job=job, job_response=data)
     elif code == 3 or code == 4:  # Error
-        job.message = desc
+        job.message = webhook
         job.state = 2
         job.save()
         transcode_onerror.send(sender=None, job=job, job_response=data)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '1.0.0'`
	`1`	`+__version__ = '1.0.1'`