Compare commits

...

2 commits

Author SHA1 Message Date
j
cff1c06546 fix annotation links 2023-07-15 12:23:19 +05:30
j
9b1f482a21 fix post update 2023-07-15 12:16:32 +05:30
2 changed files with 17 additions and 10 deletions

View file

@ -5,7 +5,7 @@ import ox
def index(request, fragment): def index(request, fragment):
from item.models import Item from item.models import Item, Annotation
from edit.models import Edit from edit.models import Edit
from document.models import Document from document.models import Document
context = {} context = {}
@ -52,19 +52,26 @@ def index(request, fragment):
type = 'item' type = 'item'
id = parts[0] id = parts[0]
item = Item.objects.filter(public_id=id).first() item = Item.objects.filter(public_id=id).first()
if item and item.accessible(request.user): if item and item.access(request.user):
link = request.build_absolute_uri(item.get_absolute_url()) link = request.build_absolute_uri(item.get_absolute_url())
if len(parts) > 1 and parts[1] in ('editor', 'player'): if len(parts) > 1 and parts[1] in ('editor', 'player'):
parts = [parts[0]] + parts[2:] parts = [parts[0]] + parts[2:]
if len(parts) > 1: if len(parts) > 1:
inout = parts[1] aid = '%s/%s' % (id, parts[1])
if '-' in inout: annotation = Annotation.objects.filter(public_id=aid).first()
inout = inout.split('-') if annotation:
inout = [annotation.start, annotation.end]
else: else:
inout = inout.split(',') inout = parts[1]
inout = [ox.parse_timecode(p) for p in inout] if '-' in inout:
if len(inout) == 3: inout = inout.split('-')
inout.pop(1) else:
inout = inout.split(',')
print(inout)
if len(inout) == 3:
inout.pop(1)
if len(inout) == 2:
inout = [ox.parse_timecode(p) for p in inout]
context['preview'] = link + '/480p%s.jpg' % inout[0] context['preview'] = link + '/480p%s.jpg' % inout[0]
else: else:
context['preview'] = link + '/480p.jpg' context['preview'] = link + '/480p.jpg'

View file

@ -303,7 +303,7 @@ if __name__ == "__main__":
run('./bin/pip', 'install', 'yt-dlp>=2022.3.8.2') run('./bin/pip', 'install', 'yt-dlp>=2022.3.8.2')
if old < 6465: if old < 6465:
run('./bin/pip', 'install', '-r', 'requirements.txt') run('./bin/pip', 'install', '-r', 'requirements.txt')
if old < 6507: if old < 6506:
run('./bin/pip', 'install', '-r', 'requirements.txt') run('./bin/pip', 'install', '-r', 'requirements.txt')
else: else:
if len(sys.argv) == 1: if len(sys.argv) == 1: