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

flake8 + map->[]

Browse source
This commit is contained in:
j 2016-06-14 21:06:27 +02:00
parent 93734a4fbc
commit fd9d3bdabf
2 changed files with 114 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
pandora/item/models.py
View file

@ -142,10 +142,17 @@ def get_item(info, user=None, async=False):
tasks.update_poster.delay(item.public_id) tasks.update_poster.delay(item.public_id)
return item return item
def get_path(f, x): return f.path(x) def get_path(f, x):
def get_icon_path(f, x): return get_path(f, 'icon.jpg') return f.path(x)
def get_poster_path(f, x): return get_path(f, 'poster.jpg')
def get_torrent_path(f, x): return get_path(f, 'torrent.torrent') def get_icon_path(f, x):
return get_path(f, 'icon.jpg')
def get_poster_path(f, x):
return get_path(f, 'poster.jpg')
def get_torrent_path(f, x):
return get_path(f, 'torrent.torrent')
class Item(models.Model): class Item(models.Model):
created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
@ -154,9 +161,9 @@ class Item(models.Model):
user = models.ForeignKey(User, null=True, related_name='items') user = models.ForeignKey(User, null=True, related_name='items')
groups = models.ManyToManyField(Group, blank=True, related_name='items') groups = models.ManyToManyField(Group, blank=True, related_name='items')
#while metadata is updated, files are set to rendered=False # while metadata is updated, files are set to rendered=False
rendered = models.BooleanField(default=False, db_index=True) rendered = models.BooleanField(default=False, db_index=True)
#should be set based on user # should be set based on user
level = models.IntegerField(db_index=True) level = models.IntegerField(db_index=True)
public_id = models.CharField(max_length=128, unique=True, blank=True) public_id = models.CharField(max_length=128, unique=True, blank=True)
@ -175,7 +182,7 @@ class Item(models.Model):
torrent = models.FileField(default=None, blank=True, max_length=1000, upload_to=get_torrent_path) torrent = models.FileField(default=None, blank=True, max_length=1000, upload_to=get_torrent_path)
stream_info = fields.DictField(default={}, editable=False) stream_info = fields.DictField(default={}, editable=False)
#stream related fields # stream related fields
stream_aspect = models.FloatField(default=4/3) stream_aspect = models.FloatField(default=4/3)
objects = managers.ItemManager() objects = managers.ItemManager()
@ -227,9 +234,9 @@ class Item(models.Model):
def edit(self, data): def edit(self, data):
data = data.copy() data = data.copy()
#FIXME: how to map the keys to the right place to write them to? # FIXME: how to map the keys to the right place to write them to?
if 'id' in data: if 'id' in data:
#FIXME: check if id is valid and exists and move/merge items accordingly # FIXME: check if id is valid and exists and move/merge items accordingly
del data['id'] del data['id']
if 'groups' in data: if 'groups' in data:
groups = data.pop('groups') groups = data.pop('groups')
@ -354,7 +361,7 @@ class Item(models.Model):
if not settings.USE_IMDB: if not settings.USE_IMDB:
self.public_id = ox.toAZ(self.id) self.public_id = ox.toAZ(self.id)
#this does not work if another item without imdbid has the same metadata # this does not work if another item without imdbid has the same metadata
oxdbId = self.oxdb_id() oxdbId = self.oxdb_id()
if not settings.USE_IMDB: if not settings.USE_IMDB:
self.oxdbId = None self.oxdbId = None
@ -379,10 +386,10 @@ class Item(models.Model):
if len(self.public_id) != 7: if len(self.public_id) != 7:
update_ids = True update_ids = True
#id changed, what about existing item with new id? # id changed, what about existing item with new id?
if settings.USE_IMDB and len(self.public_id) != 7 and self.oxdbId != self.public_id: if settings.USE_IMDB and len(self.public_id) != 7 and self.oxdbId != self.public_id:
self.public_id = self.oxdbId self.public_id = self.oxdbId
#FIXME: move files to new id here # FIXME: move files to new id here
if settings.USE_IMDB and len(self.public_id) == 7: if settings.USE_IMDB and len(self.public_id) == 7:
for key in ('title', 'year', 'director', 'season', 'episode', for key in ('title', 'year', 'director', 'season', 'episode',
'seriesTitle', 'episodeTitle'): 'seriesTitle', 'episodeTitle'):
@ -415,7 +422,8 @@ class Item(models.Model):
self.update_sort() self.update_sort()
self.update_facets() self.update_facets()
if update_ids: if update_ids:
for c in self.clips.all(): c.save() for c in self.clips.all():
c.save()
for a in self.annotations.all(): for a in self.annotations.all():
public_id = a.public_id.split('/')[1] public_id = a.public_id.split('/')[1]
public_id = "%s/%s" % (self.public_id, public_id) public_id = "%s/%s" % (self.public_id, public_id)
@ -455,7 +463,7 @@ class Item(models.Model):
self.delete() self.delete()
if save: if save:
other.save() other.save()
#FIXME: update poster, stills and streams after this # FIXME: update poster, stills and streams after this
def merge_streams(self, output, resolution=None, format="webm"): def merge_streams(self, output, resolution=None, format="webm"):
streams = [s.get(resolution, format).media.path for s in self.streams()] streams = [s.get(resolution, format).media.path for s in self.streams()]
@ -569,7 +577,7 @@ class Item(models.Model):
if not keys or key in keys: if not keys or key in keys:
if key not in i: if key not in i:
value = self.get(key) value = self.get(key)
#also get values from sort table, i.e. numberof values # also get values from sort table, i.e. numberof values
if not value: if not value:
try: try:
if self.sort and hasattr(self.sort, key): if self.sort and hasattr(self.sort, key):
@ -582,7 +590,7 @@ class Item(models.Model):
if 'cast' in i and isinstance(i['cast'][0], basestring): if 'cast' in i and isinstance(i['cast'][0], basestring):
i['cast'] = [i['cast']] i['cast'] = [i['cast']]
if 'cast' in i and isinstance(i['cast'][0], list): if 'cast' in i and isinstance(i['cast'][0], list):
i['cast'] = map(lambda x: {'actor': x[0], 'character': x[1]}, i['cast']) i['cast'] = [{'actor': x[0], 'character': x[1]} for x in i['cast']]
if 'connections' in i: if 'connections' in i:
i['connections'] = self.expand_connections() i['connections'] = self.expand_connections()
@ -617,7 +625,7 @@ class Item(models.Model):
if k in i: if k in i:
del i[k] del i[k]
#only needed by admins # only needed by admins
if keys and 'posters' in keys: if keys and 'posters' in keys:
i['posters'] = self.get_posters() i['posters'] = self.get_posters()
@ -798,10 +806,9 @@ class Item(models.Model):
values = list(set(values)) values = list(set(values))
elif key == 'name': elif key == 'name':
values = [] values = []
for k in map(lambda x: x['id'], for k in settings.CONFIG['itemKeys']:
filter(lambda x: x.get('sortType') == 'person', if k.get('sortType') == 'person':
settings.CONFIG['itemKeys'])): values += self.get(k['id'], [])
values += self.get(k, [])
values = list(set(values)) values = list(set(values))
else: else:
values = self.get(key, '') values = self.get(key, '')
@ -882,7 +889,7 @@ class Item(models.Model):
'volume', 'volume',
) )
#sort keys based on database, these will always be available # sort keys based on database, these will always be available
s.public_id = self.public_id.replace('0x', 'xx') s.public_id = self.public_id.replace('0x', 'xx')
s.oxdbId = self.oxdbId s.oxdbId = self.oxdbId
if not settings.USE_IMDB and s.public_id.isupper() and s.public_id.isalpha(): if not settings.USE_IMDB and s.public_id.isupper() and s.public_id.isalpha():
@ -898,7 +905,7 @@ class Item(models.Model):
s.numberoffiles = self.files.all().count() s.numberoffiles = self.files.all().count()
videos = self.files.filter(selected=True).filter(Q(is_video=True) | Q(is_audio=True)) videos = self.files.filter(selected=True).filter(Q(is_video=True) | Q(is_audio=True))
if videos.count() > 0: if videos.count() > 0:
#s.duration = sum([v.duration for v in videos]) # s.duration = sum([v.duration for v in videos])
s.duration = sum([v.duration for v in self.streams()]) s.duration = sum([v.duration for v in self.streams()])
v = videos[0] v = videos[0]
if v.is_audio or not v.info.get('video'): if v.is_audio or not v.info.get('video'):
@ -914,7 +921,7 @@ class Item(models.Model):
s.aspectratio = float(utils.parse_decimal(v.display_aspect_ratio)) s.aspectratio = float(utils.parse_decimal(v.display_aspect_ratio))
s.pixels = sum([v.pixels for v in videos]) s.pixels = sum([v.pixels for v in videos])
s.parts = videos.count() s.parts = videos.count()
s.size = sum([v.size for v in videos]) #FIXME: only size of movies? s.size = sum([v.size for v in videos]) # FIXME: only size of movies?
if s.duration: if s.duration:
s.bitrate = s.size * 8 / s.duration s.bitrate = s.size * 8 / s.duration
else: else:
@ -980,7 +987,7 @@ class Item(models.Model):
value = value / (s.duration / 60) if value and s.duration else None value = value / (s.duration / 60) if value and s.duration else None
set_value(s, name, value) set_value(s, name, value)
elif sort_type in ('length', 'integer', 'time', 'float'): elif sort_type in ('length', 'integer', 'time', 'float'):
#can be length of strings or length of arrays, i.e. keywords # can be length of strings or length of arrays, i.e. keywords
if 'layer' in key.get('value', []): if 'layer' in key.get('value', []):
value = self.annotations.filter(layer=key['value']['layer']).count() value = self.annotations.filter(layer=key['value']['layer']).count()
else: else:
@ -1019,11 +1026,9 @@ class Item(models.Model):
for item in sublist] for item in sublist]
elif key == 'name': elif key == 'name':
current_values = [] current_values = []
#FIXME: is there a better way to build name collection? for k in settings.CONFIG['itemKeys']:
for k in map(lambda x: x['id'], if k.get('sortType') == 'person':
filter(lambda x: x.get('sortType') == 'person', current_values += self.get(k['id'], [])
settings.CONFIG['itemKeys'])):
current_values += self.get(k, [])
if not isinstance(current_values, list): if not isinstance(current_values, list):
if not current_values: if not current_values:
current_values = [] current_values = []
@ -1049,8 +1054,10 @@ class Item(models.Model):
for a in self.annotations.filter(layer=key).distinct().values('value')] for a in self.annotations.filter(layer=key).distinct().values('value')]
layer = utils.get_by_id(settings.CONFIG['layers'], key) layer = utils.get_by_id(settings.CONFIG['layers'], key)
if layer.get('type') == 'entity': if layer.get('type') == 'entity':
current_values = [a['name'] current_values = [
for a in Entity.objects.filter(id__in=[ox.fromAZ(i) for i in current_values]).values('name')] a['name']
for a in Entity.objects.filter(id__in=[ox.fromAZ(i) for i in current_values]).values('name')
]
current_values = [ox.decode_html(ox.strip_tags(v.replace('<br>', ' '))) for v in current_values] current_values = [ox.decode_html(ox.strip_tags(v.replace('<br>', ' '))) for v in current_values]
self.update_facet_values(key, current_values) self.update_facet_values(key, current_values)
@ -1138,8 +1145,8 @@ class Item(models.Model):
return User.objects.filter( return User.objects.filter(
volumes__files__file__item=self volumes__files__file__item=self
).order_by('date_joined').distinct() ).order_by('date_joined').distinct()
#FIXME: profile not showing up here # FIXME: profile not showing up here
#).order_by('-profile__level', 'date_joined').distinct() # ).order_by('-profile__level', 'date_joined').distinct()
def sets(self): def sets(self):
sets = [] sets = []
@ -1264,10 +1271,10 @@ class Item(models.Model):
if duration: if duration:
meta['playtime'] = ox.format_duration(duration*1000)[:-4] meta['playtime'] = ox.format_duration(duration*1000)[:-4]
#slightly bigger torrent file but better for streaming # slightly bigger torrent file but better for streaming
piece_size_pow2 = 15 #1 mbps -> 32KB pieces piece_size_pow2 = 15 # 1 mbps -> 32KB pieces
if size / duration >= 1000000: if size / duration >= 1000000:
piece_size_pow2 = 16 #2 mbps -> 64KB pieces piece_size_pow2 = 16 # 2 mbps -> 64KB pieces
meta['piece_size_pow2'] = piece_size_pow2 meta['piece_size_pow2'] = piece_size_pow2
ox.torrent.create_torrent(video, settings.TRACKER_URL, meta) ox.torrent.create_torrent(video, settings.TRACKER_URL, meta)
@ -1313,12 +1320,12 @@ class Item(models.Model):
n = streams.count() n = streams.count()
for s in streams: for s in streams:
self.data['volume'] += s.volume * s.duration self.data['volume'] += s.volume * s.duration
color = map(lambda a, b: (a+b)/n, color, ox.image.getRGB(s.color or [0.0] * 3)) color = [(a+b)/n for a, b in zip(color, ox.image.getRGB([1.0] * 3))]
offset += s.duration offset += s.duration
self.data['hue'], self.data['saturation'], self.data['lightness'] = ox.image.getHSL(color) self.data['hue'], self.data['saturation'], self.data['lightness'] = ox.image.getHSL(color)
if offset: if offset:
self.data['volume'] /= offset self.data['volume'] /= offset
#extract.timeline_strip(self, self.data['cuts'], stream.info, self.timeline_prefix[:-8]) # extract.timeline_strip(self, self.data['cuts'], stream.info, self.timeline_prefix[:-8])
self.json = self.get_json() self.json = self.get_json()
self.update_sort() self.update_sort()
self.select_frame() self.select_frame()
@ -1344,7 +1351,8 @@ class Item(models.Model):
if self.json.get('posterRatio') != self.poster_width / self.poster_height: if self.json.get('posterRatio') != self.poster_width / self.poster_height:
self.json = self.get_json() self.json = self.get_json()
Item.objects.filter(id=self.id).update(json=self.json, Item.objects.filter(id=self.id).update(json=self.json,
poster_width=self.poster_width, poster_height=self.poster_height) poster_width=self.poster_width,
poster_height=self.poster_height)
def prefered_poster_url(self): def prefered_poster_url(self):
if settings.DATA_SERVICE: if settings.DATA_SERVICE:
@ -1368,7 +1376,7 @@ class Item(models.Model):
durations.append(s.duration) durations.append(s.duration)
join_tiles(timelines, durations, self.timeline_prefix) join_tiles(timelines, durations, self.timeline_prefix)
else: else:
#remove joined timeline if it was created at some point # remove joined timeline if it was created at some point
for f in glob(os.path.join(settings.MEDIA_ROOT, self.path(), 'timeline*.jpg')): for f in glob(os.path.join(settings.MEDIA_ROOT, self.path(), 'timeline*.jpg')):
os.unlink(f) os.unlink(f)
@ -1438,7 +1446,8 @@ class Item(models.Model):
width, height = self.json['resolution'] width, height = self.json['resolution']
if width and height: if width and height:
pos = self.sort.duration / 2 pos = self.sort.duration / 2
for p in map(int, [pos/2, pos, pos+pos/2]): for p in [pos/2, pos, pos+pos/2]:
p = int(p)
path = self.frame(p, height) path = self.frame(p, height)
if path: if path:
frames.append({ frames.append({
@ -1489,7 +1498,7 @@ class Item(models.Model):
cmd += ['-f', frame] cmd += ['-f', frame]
p = subprocess.Popen(cmd, close_fds=True) p = subprocess.Popen(cmd, close_fds=True)
p.wait() p.wait()
#remove cached versions # remove cached versions
icon = os.path.abspath(os.path.join(settings.MEDIA_ROOT, icon)) icon = os.path.abspath(os.path.join(settings.MEDIA_ROOT, icon))
for f in glob(icon.replace('.jpg', '*.jpg')): for f in glob(icon.replace('.jpg', '*.jpg')):
if f != icon: if f != icon:
@ -1503,10 +1512,10 @@ class Item(models.Model):
subtitles = utils.get_by_key(settings.CONFIG['layers'], 'isSubtitles', True) subtitles = utils.get_by_key(settings.CONFIG['layers'], 'isSubtitles', True)
if not subtitles: if not subtitles:
return return
#otherwise add empty 5 seconds annotation every minute # otherwise add empty 5 seconds annotation every minute
duration = sum([s.duration for s in self.streams()]) duration = sum([s.duration for s in self.streams()])
layer = subtitles['id'] layer = subtitles['id']
#FIXME: allow annotations from no user instead? # FIXME: allow annotations from no user instead?
user = User.objects.all().order_by('id')[0] user = User.objects.all().order_by('id')[0]
clips = [(i, i+5) for i in range(0, int(duration) - 5, 60)] clips = [(i, i+5) for i in range(0, int(duration) - 5, 60)]
@ -1556,7 +1565,7 @@ class Item(models.Model):
else: else:
language = languages[0] language = languages[0]
#loop over all videos # loop over all videos
for f in self.files.filter(Q(is_audio=True) | Q(is_video=True)) \ for f in self.files.filter(Q(is_audio=True) | Q(is_video=True)) \
.filter(selected=True).order_by('sort_path'): .filter(selected=True).order_by('sort_path'):
subtitles_added = False subtitles_added = False
@ -1564,9 +1573,9 @@ class Item(models.Model):
if f.instances.all().count() > 0: if f.instances.all().count() > 0:
user = f.instances.all()[0].volume.user user = f.instances.all()[0].volume.user
else: else:
#FIXME: allow annotations from no user instead? # FIXME: allow annotations from no user instead?
user = User.objects.all().order_by('id')[0] user = User.objects.all().order_by('id')[0]
#if there is a subtitle with the same prefix, import # if there is a subtitle with the same prefix, import
q = subtitles.filter(path__startswith=prefix, q = subtitles.filter(path__startswith=prefix,
language=language) language=language)
if q.count() == 1: if q.count() == 1:
@ -1586,7 +1595,7 @@ class Item(models.Model):
user=user user=user
) )
annotation.save() annotation.save()
#otherwise add empty 5 seconds annotation every minute # otherwise add empty 5 seconds annotation every minute
if not subtitles_added: if not subtitles_added:
start = offset and int(offset / 60) * 60 + 60 or 0 start = offset and int(offset / 60) * 60 + 60 or 0
for i in range(start, for i in range(start,
@ -1602,7 +1611,7 @@ class Item(models.Model):
) )
annotation.save() annotation.save()
offset += f.duration offset += f.duration
#remove left over clips without annotations # remove left over clips without annotations
Clip.objects.filter(item=self, annotations__id=None).delete() Clip.objects.filter(item=self, annotations__id=None).delete()
return True return True
else: else:

63
pandora/item/views.py
View file

@ -80,7 +80,7 @@ def _order_by_group(query):
def parse_query(data, user): def parse_query(data, user):
query = {} query = {}
query['range'] = [0, 100] query['range'] = [0, 100]
query['sort'] = [{'key':'title', 'operator':'+'}] query['sort'] = [{'key': 'title', 'operator': '+'}]
for key in ('sort', 'keys', 'group', 'range', 'position', 'positions'): for key in ('sort', 'keys', 'group', 'range', 'position', 'positions'):
if key in data: if key in data:
query[key] = data[key] query[key] = data[key]
@ -96,7 +96,7 @@ def parse_query(data, user):
if not query['clip_keys']: if not query['clip_keys']:
query['clip_keys'] = ['id', 'in', 'out', 'annotations'] query['clip_keys'] = ['id', 'in', 'out', 'annotations']
#group by only allows sorting by name or number of itmes # group by only allows sorting by name or number of itmes
return query return query
def find(request, data): def find(request, data):
@ -239,6 +239,7 @@ def find(request, data):
if 'clip_qs' in query: if 'clip_qs' in query:
r['clips'] = get_clips(query['clip_qs'].filter(item=m)) r['clips'] = get_clips(query['clip_qs'].filter(item=m))
return r return r
def only_p(m): def only_p(m):
r = {} r = {}
if m: if m:
@ -250,7 +251,7 @@ def find(request, data):
r['clips'] = get_clips(query['clip_qs'].filter(item__public_id=m['id'])) r['clips'] = get_clips(query['clip_qs'].filter(item__public_id=m['id']))
return r return r
qs = qs[query['range'][0]:query['range'][1]] qs = qs[query['range'][0]:query['range'][1]]
#response['data']['items'] = [m.get_json(_p) for m in qs] # response['data']['items'] = [m.get_json(_p) for m in qs]
if filter(lambda p: p in ( if filter(lambda p: p in (
'accessed', 'modified', 'timesaccessed', 'viewed' 'accessed', 'modified', 'timesaccessed', 'viewed'
), _p): ), _p):
@ -267,9 +268,10 @@ def find(request, data):
Sum('pixels'), Sum('pixels'),
Sum('size') Sum('size')
) )
totals = [i['id'] totals = [
i['id']
for i in settings.CONFIG['totals'] for i in settings.CONFIG['totals']
if not 'capability' in i or has_capability(request.user, i['capability']) if 'capability' not in i or has_capability(request.user, i['capability'])
] ]
if 'duration' in totals: if 'duration' in totals:
response['data']['duration'] = r['duration__sum'] response['data']['duration'] = r['duration__sum']
@ -284,7 +286,7 @@ def find(request, data):
if 'size' in totals: if 'size' in totals:
response['data']['size'] = r['size__sum'] response['data']['size'] = r['size__sum']
for key in ('runtime', 'duration', 'pixels', 'size'): for key in ('runtime', 'duration', 'pixels', 'size'):
if key in totals and response['data'][key] == None: if key in totals and response['data'][key] is None:
response['data'][key] = 0 response['data'][key] = 0
return render_to_json_response(response) return render_to_json_response(response)
actions.register(find) actions.register(find)
@ -305,7 +307,7 @@ def autocomplete(request, data):
} }
see: autocompleteEntities see: autocompleteEntities
''' '''
if not 'range' in data: if 'range' not in data:
data['range'] = [0, 10] data['range'] = [0, 10]
op = data.get('operator', '=') op = data.get('operator', '=')
@ -313,7 +315,8 @@ def autocomplete(request, data):
order_by = key.get('autocompleteSort', False) order_by = key.get('autocompleteSort', False)
if order_by: if order_by:
for o in order_by: for o in order_by:
if o['operator'] != '-': o['operator'] = '' if o['operator'] != '-':
o['operator'] = ''
order_by = ['%(operator)ssort__%(key)s' % o for o in order_by] order_by = ['%(operator)ssort__%(key)s' % o for o in order_by]
else: else:
order_by = ['-items'] order_by = ['-items']
@ -486,7 +489,7 @@ def get(request, data):
info['editable'] = item.editable(request.user) info['editable'] = item.editable(request.user)
response['data'] = info response['data'] = info
else: else:
#response = json_response(status=403, text='permission denied') # response = json_response(status=403, text='permission denied')
response = json_response(status=404, text='not found') response = json_response(status=404, text='not found')
return render_to_json_response(response) return render_to_json_response(response)
actions.register(get) actions.register(get)
@ -544,7 +547,7 @@ def edit(request, data):
if item.editable(request.user): if item.editable(request.user):
response = json_response(status=200, text='ok') response = json_response(status=200, text='ok')
if 'rightslevel' in data: if 'rightslevel' in data:
if request.user.profile.capability('canEditRightsLevel') == True: if request.user.profile.capability('canEditRightsLevel'):
item.level = int(data['rightslevel']) item.level = int(data['rightslevel'])
else: else:
response = json_response(status=403, text='permission denied') response = json_response(status=403, text='permission denied')
@ -590,12 +593,12 @@ def remove(request, data):
response = json_response({}) response = json_response({})
item = get_object_or_404_json(models.Item, public_id=data['id']) item = get_object_or_404_json(models.Item, public_id=data['id'])
user = request.user user = request.user
if user.profile.capability('canRemoveItems') == True or \ if user.profile.capability('canRemoveItems') or \
user.is_staff or \ user.is_staff or \
item.user == user or \ item.user == user or \
item.groups.filter(id__in=user.groups.all()).count() > 0: item.groups.filter(id__in=user.groups.all()).count() > 0:
add_changelog(request, data) add_changelog(request, data)
#FIXME: is this cascading enough or do we end up with orphan files etc. # FIXME: is this cascading enough or do we end up with orphan files etc.
item.delete() item.delete()
response = json_response(status=200, text='removed') response = json_response(status=200, text='removed')
else: else:
@ -715,7 +718,7 @@ def lookup(request, data):
r = {'id': i.public_id} r = {'id': i.public_id}
for key in ('title', 'director', 'year'): for key in ('title', 'director', 'year'):
value = i.get(key) value = i.get(key)
if value != None: if value is not None:
r[key] = value r[key] = value
response = json_response(r) response = json_response(r)
else: else:
@ -749,7 +752,7 @@ def frame(request, id, size, position=None):
if not frame: if not frame:
frame = os.path.join(settings.STATIC_ROOT, 'jpg/list256.jpg') frame = os.path.join(settings.STATIC_ROOT, 'jpg/list256.jpg')
#raise Http404 # raise Http404
response = HttpFileResponse(frame, content_type='image/jpeg') response = HttpFileResponse(frame, content_type='image/jpeg')
if request.method == 'OPTIONS': if request.method == 'OPTIONS':
response.allow_access() response.allow_access()
@ -770,7 +773,7 @@ def poster_frame(request, id, position):
def image_to_response(image, size=None): def image_to_response(image, size=None):
if size: if size:
size = int(size) size = int(size)
path = image.path.replace('.jpg', '.%d.jpg'%size) path = image.path.replace('.jpg', '.%d.jpg' % size)
if not os.path.exists(path): if not os.path.exists(path):
image_size = max(image.width, image.height) image_size = max(image.width, image.height)
if size > image_size: if size > image_size:
@ -792,7 +795,7 @@ def siteposter(request, id, size=None):
image = Image.open(poster) image = Image.open(poster)
image_size = max(image.size) image_size = max(image.size)
if size < image_size: if size < image_size:
path = poster.replace('.jpg', '.%d.jpg'%size) path = poster.replace('.jpg', '.%d.jpg' % size)
extract.resize_image(poster, path, size=size) extract.resize_image(poster, path, size=size)
poster = path poster = path
return HttpFileResponse(poster, content_type='image/jpeg') return HttpFileResponse(poster, content_type='image/jpeg')
@ -847,6 +850,7 @@ def timeline(request, id, size, position=-1, format='jpg', mode=None):
modes.pop(modes.index(mode)) modes.pop(modes.index(mode))
prefix = os.path.join(item.timeline_prefix, 'timeline') prefix = os.path.join(item.timeline_prefix, 'timeline')
def timeline(): def timeline():
timeline = '%s%s%sp' % (prefix, mode, size) timeline = '%s%s%sp' % (prefix, mode, size)
if position > -1: if position > -1:
@ -881,7 +885,7 @@ def download(request, id, resolution=None, format='webm'):
r = item.merge_streams(video.name, resolution, format) r = item.merge_streams(video.name, resolution, format)
if not r: if not r:
return HttpResponseForbidden() return HttpResponseForbidden()
elif r == True: elif r is True:
response = HttpResponse(FileWrapper(video), content_type=content_type) response = HttpResponse(FileWrapper(video), content_type=content_type)
response['Content-Length'] = os.path.getsize(video.name) response['Content-Length'] = os.path.getsize(video.name)
else: else:
@ -931,8 +935,8 @@ def video(request, id, resolution, format, index=None, track=None):
raise Http404 raise Http404
path = stream.media.path path = stream.media.path
#server side cutting # server side cutting
#FIXME: this needs to join segments if needed # FIXME: this needs to join segments if needed
t = request.GET.get('t') t = request.GET.get('t')
if t: if t:
def parse_timestamp(s): def parse_timestamp(s):
@ -942,7 +946,7 @@ def video(request, id, resolution, format, index=None, track=None):
t = map(parse_timestamp, t.split(',')) t = map(parse_timestamp, t.split(','))
ext = '.%s' % format ext = '.%s' % format
content_type = mimetypes.guess_type(path)[0] content_type = mimetypes.guess_type(path)[0]
if len(t) == 2 and t[1] > t[0] and stream.info['duration']>=t[1]: if len(t) == 2 and t[1] > t[0] and stream.info['duration'] >= t[1]:
response = HttpResponse(extract.chop(path, t[0], t[1]), content_type=content_type) response = HttpResponse(extract.chop(path, t[0], t[1]), content_type=content_type)
filename = u"Clip of %s - %s-%s - %s %s%s" % ( filename = u"Clip of %s - %s-%s - %s %s%s" % (
item.get('title'), item.get('title'),
@ -1000,7 +1004,7 @@ def random_annotation(request):
n = item.annotations.all().count() n = item.annotations.all().count()
pos = random.randint(0, n) pos = random.randint(0, n)
clip = item.annotations.all()[pos] clip = item.annotations.all()[pos]
return redirect('/%s'% clip.public_id) return redirect('/%s' % clip.public_id)
def atom_xml(request): def atom_xml(request):
add_updated = True add_updated = True
@ -1111,14 +1115,14 @@ def atom_xml(request):
el.attrib['type'] = 'application/x-bittorrent' el.attrib['type'] = 'application/x-bittorrent'
el.attrib['href'] = '%s/torrent/' % page_link el.attrib['href'] = '%s/torrent/' % page_link
el.attrib['length'] = '%s' % ox.get_torrent_size(item.torrent.path) el.attrib['length'] = '%s' % ox.get_torrent_size(item.torrent.path)
#FIXME: loop over streams # FIXME: loop over streams
#for s in item.streams().filter(resolution=max(settings.CONFIG['video']['resolutions'])): # for s in item.streams().filter(resolution=max(settings.CONFIG['video']['resolutions'])):
for s in item.streams().filter(source=None): for s in item.streams().filter(source=None):
el = ET.SubElement(entry, "link") el = ET.SubElement(entry, "link")
el.attrib['rel'] = 'enclosure' el.attrib['rel'] = 'enclosure'
el.attrib['type'] = 'video/%s' % s.format el.attrib['type'] = 'video/%s' % s.format
el.attrib['href'] = '%s/%sp.%s' % (page_link, s.resolution, s.format) el.attrib['href'] = '%s/%sp.%s' % (page_link, s.resolution, s.format)
el.attrib['length'] = '%s'%s.media.size el.attrib['length'] = '%s' % s.media.size
el = ET.SubElement(entry, "media:thumbnail") el = ET.SubElement(entry, "media:thumbnail")
thumbheight = 96 thumbheight = 96
@ -1147,7 +1151,7 @@ def oembed(request):
embed_url = request.build_absolute_uri('/%s' % public_id) embed_url = request.build_absolute_uri('/%s' % public_id)
if url.startswith(embed_url): if url.startswith(embed_url):
embed_url = url embed_url = url
if not '#embed' in embed_url: if '#embed' not in embed_url:
embed_url = '%s#embed' % embed_url embed_url = '%s#embed' % embed_url
oembed = {} oembed = {}
@ -1156,8 +1160,8 @@ def oembed(request):
oembed['provider_name'] = settings.SITENAME oembed['provider_name'] = settings.SITENAME
oembed['provider_url'] = request.build_absolute_uri('/') oembed['provider_url'] = request.build_absolute_uri('/')
oembed['title'] = item.get('title') oembed['title'] = item.get('title')
#oembed['author_name'] = item.get('director') # oembed['author_name'] = item.get('director')
#oembed['author_url'] = ?? # oembed['author_url'] = ??
height = max(settings.CONFIG['video']['resolutions']) height = max(settings.CONFIG['video']['resolutions'])
height = min(height, maxheight) height = min(height, maxheight)
width = int(round(height * item.stream_aspect)) width = int(round(height * item.stream_aspect))
@ -1220,7 +1224,8 @@ def item_xml(request, id):
j = item.get_json() j = item.get_json()
j['layers'] = item.get_layers(request.user) j['layers'] = item.get_layers(request.user)
if 'resolution' in j: if 'resolution' in j:
j['resolution'] = {'width': j['resolution'][0], 'height':j['resolution'][1]} j['resolution'] = {'width': j['resolution'][0], 'height': j['resolution'][1]}
def xmltree(root, key, data): def xmltree(root, key, data):
if isinstance(data, list) or \ if isinstance(data, list) or \
isinstance(data, tuple): isinstance(data, tuple):
@ -1301,7 +1306,7 @@ def item(request, id):
data.append({'key': k, 'title': title, 'value': value}) data.append({'key': k, 'title': title, 'value': value})
clips = [] clips = []
clip = {'in': 0, 'annotations': []} clip = {'in': 0, 'annotations': []}
#logged in users should have javascript. not adding annotations makes load faster # logged in users should have javascript. not adding annotations makes load faster
if not settings.USE_IMDB and request.user.is_anonymous(): if not settings.USE_IMDB and request.user.is_anonymous():
for a in item.annotations.exclude( for a in item.annotations.exclude(
layer='subtitles' layer='subtitles'