From 17d6da828264cf7978dbf96b7946fc3cdb740dcf Mon Sep 17 00:00:00 2001 From: j Date: Sat, 21 Oct 2023 15:32:55 +0100 Subject: [PATCH 1/3] only use selected files --- management/commands/generate_clips.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/management/commands/generate_clips.py b/management/commands/generate_clips.py index b9e46f3..4f2c9e0 100644 --- a/management/commands/generate_clips.py +++ b/management/commands/generate_clips.py @@ -26,7 +26,7 @@ class Command(BaseCommand): for e in item.models.Item.objects.filter(data__title=i.data['title']): if 'type' not in e.data: print("ignoring invalid video", e) - source = e.files.all()[0].data.path + source = e.files.filter(selected=True)[0].data.path ext = os.path.splitext(source)[1] type_ = e.data['type'][0].lower() target = os.path.join(prefix, type_, i.data['title'] + ext) @@ -35,7 +35,7 @@ class Command(BaseCommand): os.unlink(target) os.symlink(source, target) clip[type_] = target - durations.append(e.files.all()[0].duration) + durations.append(e.files.filter(selected=True)[0].duration) clip["duration"] = min(durations) clip['tags'] = i.data.get('tags', []) clip['editingtags'] = i.data.get('editingtags', []) @@ -52,7 +52,7 @@ class Command(BaseCommand): data__type__contains="Voice Over", ): fragment_id = int(vo.get('title').split('_')[0]) - source = vo.files.all()[0] + source = vo.files.filter(selected=True)[0] batch = vo.get('batch')[0].replace('Text-', '') src = source.data.path target = os.path.join(prefix, 'voice_over', batch, '%s.wav' % fragment_id) From fe62266c4fa07736c08bded43ee9d2dc855f2e83 Mon Sep 17 00:00:00 2001 From: j Date: Sat, 21 Oct 2023 15:33:28 +0100 Subject: [PATCH 2/3] utils to merge and cleanup --- utils.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 utils.py diff --git a/utils.py b/utils.py new file mode 100644 index 0000000..7352a40 --- /dev/null +++ b/utils.py @@ -0,0 +1,24 @@ + + +def upgrade_originals(): + import item.models + import itemlist.models + nt = itemlist.models.List.objects.get(name='No Type') + for i in nt.get_items(nt.user): + orig = item.models.Item.objects.get(data__title=i.get('title'), data__type=["Original"]) + print(i, orig) + orig.files.all().update(selected=False) + i.files.all().update(item=orig) + orig.save() + orig.remove_poster() + orig.make_poster() + i.data['type'] = ['Empty'] + i.save() + + +def remove_deselected_files(): + il = itemlist.models.List.objects.get(name='New Originals') + for i in il.items.all(): + for f in i.files.filter(selected=False): + f.data.delete() + f.delete() From de96448137a1c1bef44e273ddd55091b46692887 Mon Sep 17 00:00:00 2001 From: j Date: Sat, 21 Oct 2023 15:33:35 +0100 Subject: [PATCH 3/3] ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c9b568f..1559f2e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.pyc *.swp +*.swo