decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

inline django 1.9 version of ox.django

Browse source
This commit is contained in:
j 2016-02-20 09:06:41 +00:00
commit 051a3578b4
74 changed files with 712 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pandora/archive/migrations/0001_initial.py
View file

@ -6,7 +6,7 @@ import archive.models
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import ox.django.fields
import oxdjango.fields
class Migration(migrations.Migration):
@ -35,7 +35,7 @@ class Migration(migrations.Migration):
('version', models.CharField(default=b'', max_length=255, null=True)),
('size', models.BigIntegerField(default=0)),
('duration', models.FloatField(null=True)),
('info', ox.django.fields.DictField(default={})),
('info', oxdjango.fields.DictField(default={})),
('video_codec', models.CharField(max_length=255)),
('pixel_format', models.CharField(max_length=255)),
('display_aspect_ratio', models.CharField(max_length=255)),
@ -96,11 +96,11 @@ class Migration(migrations.Migration):
('media', models.FileField(blank=True, default=None, upload_to=archive.models.get_path)),
('available', models.BooleanField(default=False)),
('oshash', models.CharField(db_index=True, max_length=16, null=True)),
('info', ox.django.fields.DictField(default={})),
('info', oxdjango.fields.DictField(default={})),
('duration', models.FloatField(default=0)),
('aspect_ratio', models.FloatField(default=0)),
('cuts', ox.django.fields.TupleField(default=[])),
('color', ox.django.fields.TupleField(default=[])),
('cuts', oxdjango.fields.TupleField(default=[])),
('color', oxdjango.fields.TupleField(default=[])),
('volume', models.FloatField(default=0)),
('error', models.TextField(blank=True, default=b'')),
('file', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='streams', to='archive.File')),

2
pandora/archive/models.py
View file

@ -12,7 +12,7 @@ from django.contrib.auth.models import User
from django.db import models
from django.db.models.signals import pre_delete
from ox.django import fields
from oxdjango import fields
import ox
import ox.iso

27
pandora/archive/views.py
View file

@ -4,22 +4,21 @@ from __future__ import division
import os.path
from datetime import datetime
from django import forms
from django.shortcuts import get_object_or_404, redirect, render
from django.conf import settings
from django.db.models import Count, Q
from celery.utils import get_full_cls_name
from celery.backends import default_backend
import ox
from ox.utils import json
from ox.django.decorators import login_required_json
from ox.django.shortcuts import render_to_json_response, get_object_or_404_json, json_response
from ox.django.views import task_status
from oxdjango.decorators import login_required_json
from oxdjango.shortcuts import render_to_json_response, get_object_or_404_json, json_response
from item import utils
from item.models import get_item, Item
from item.views import parse_query
import item.tasks
from ox.django.api import actions
from oxdjango.api import actions
from changelog.models import add_changelog
import models
@ -358,7 +357,21 @@ def taskStatus(request, data):
task_id = data['taskId']
else:
task_id = data['task_id']
response = task_status(request, task_id)
response = json_response(status=200, text='ok')
status = default_backend.get_status(task_id)
res = default_backend.get_result(task_id)
response['data'] = {
'id': task_id,
'status': status,
'result': res
}
if status in default_backend.EXCEPTION_STATES:
traceback = default_backend.get_traceback(task_id)
response['data'].update({
'result': str(res.args[0]),
'exc': get_full_cls_name(res.__class__),
'traceback': traceback
})
return render_to_json_response(response)
actions.register(taskStatus, cache=False)