0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:61dd667a711ebb6cbd5817231893c070b85e5499
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:09e3f2bc7d031e08795920f0e1bc555999cb9c64
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "61dd667a711ebb6cbd5817231893c070b85e5499" and "09e3f2bc7d031e08795920f0e1bc555999cb9c64" have entirely different histories.
61dd667a71 ... 09e3f2bc7d

2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/item/models.py
View file

@ -640,8 +640,8 @@ class Item(models.Model):
if self.poster_height: if self.poster_height:
i['posterRatio'] = self.poster_width / self.poster_height i['posterRatio'] = self.poster_width / self.poster_height
if keys and 'hasSource' in keys: if keys and 'source' in keys:
i['hasSource'] = self.streams().exclude(file__data='').exists() i['source'] = self.streams().exclude(file__data='').exists()
streams = self.streams() streams = self.streams()
i['durations'] = [s.duration for s in streams] i['durations'] = [s.duration for s in streams]

2
pandora/item/tasks.py
View file

@ -2,7 +2,6 @@
from datetime import timedelta, datetime from datetime import timedelta, datetime
from urllib.parse import quote from urllib.parse import quote
import xml.etree.ElementTree as ET
import gzip import gzip
import os import os
import random import random
@ -13,6 +12,7 @@ from celery.schedules import crontab
from django.conf import settings from django.conf import settings
from django.db import connection, transaction from django.db import connection, transaction
from django.db.models import Q from django.db.models import Q
from ox.utils import ET
from app.utils import limit_rate from app.utils import limit_rate
from taskqueue.models import Task from taskqueue.models import Task