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

speed up stream lookup

Browse source
This commit is contained in:
j 2023-08-18 14:59:45 +02:00
parent 61dd667a71
commit d7f087125e
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pandora/archive/migrations/0007_stream_archive_str_file_id_69a542_idx.py Normal file
View file

@ -0,0 +1,17 @@
# Generated by Django 4.2.3 on 2023-08-18 12:54
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('archive', '0006_alter_file_extension_alter_file_id_alter_file_info_and_more'),
]
operations = [
migrations.AddIndex(
model_name='stream',
index=models.Index(fields=['file', 'source', 'available'], name='archive_str_file_id_69a542_idx'),
),
]

3
pandora/archive/models.py
View file

@ -734,6 +734,9 @@ class Stream(models.Model):
class Meta: class Meta:
unique_together = ("file", "resolution", "format") unique_together = ("file", "resolution", "format")
indexes = [
models.Index(fields=['file', 'source', 'available'])
]
file = models.ForeignKey(File, related_name='streams', on_delete=models.CASCADE) file = models.ForeignKey(File, related_name='streams', on_delete=models.CASCADE)
resolution = models.IntegerField(default=96) resolution = models.IntegerField(default=96)

9
pandora/item/models.py
View file

@ -644,7 +644,7 @@ class Item(models.Model):
i['hasSource'] = self.streams().exclude(file__data='').exists() i['hasSource'] = self.streams().exclude(file__data='').exists()
streams = self.streams() streams = self.streams()
i['durations'] = [s.duration for s in streams] i['durations'] = [s[0] for s in streams.values_list('duration')]
i['duration'] = sum(i['durations']) i['duration'] = sum(i['durations'])
i['audioTracks'] = self.audio_tracks() i['audioTracks'] = self.audio_tracks()
if not i['audioTracks']: if not i['audioTracks']:
@ -1309,10 +1309,9 @@ class Item(models.Model):
return sorted(set(tracks)) return sorted(set(tracks))
def streams(self, track=None): def streams(self, track=None):
files = self.files.filter(selected=True).filter(Q(is_audio=True) | Q(is_video=True)),
qs = archive.models.Stream.objects.filter( qs = archive.models.Stream.objects.filter(
source=None, available=True, file__item=self, file__selected=True file__in=files, source=None, available=True
).filter(
Q(file__is_audio=True) | Q(file__is_video=True)
).select_related() ).select_related()
if not track: if not track:
tracks = self.audio_tracks() tracks = self.audio_tracks()
@ -1561,7 +1560,7 @@ class Item(models.Model):
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[0] for s in self.streams().values_list('duration')])
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]