X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/c7d2e4daae13c7c1100ec0d42ace0e8c34b5ae24..d59a371f240c5fa1dbce1bd40a61e60c60a19d2a:/src/archive/models.py diff --git a/src/archive/models.py b/src/archive/models.py index 4a1d763..4a805f2 100644 --- a/src/archive/models.py +++ b/src/archive/models.py @@ -1,9 +1,12 @@ +import json import os.path from django.db import models from time import sleep -from django.utils.encoding import force_bytes -from django.utils.translation import ugettext_lazy as _ +from django.utils.functional import cached_property +from django.utils.translation import gettext_lazy as _ +from django_pglocks import advisory_lock +import requests from archive.constants import status from archive.settings import FILES_SAVE_PATH, ADVERT, LICENSE, ORGANIZATION, PROJECT from archive.utils import OverwriteStorage, sha1_file @@ -14,6 +17,7 @@ class Project(models.Model): name = models.CharField(max_length=128, unique=True, db_index=True, verbose_name="Nazwa") sponsors = models.TextField(blank=True, null=True, verbose_name="Sponsorzy") + description = models.TextField(blank=True, verbose_name="Opis") class Meta: verbose_name = _("project") @@ -23,6 +27,24 @@ class Project(models.Model): def __str__(self): return self.name + def get_description(self): + if self.description: + return self.description + return "Audiobook nagrany w ramach projektu %s%s." % ( + self.name, + " finansowanego przez %s" % self.sponsors if self.sponsors else "", + ) + + +class Piece(models.Model): + name = models.CharField(max_length=255) + source_file = models.FileField(upload_to='piece') + is_outro = models.BooleanField(default=False) + min_audiobook_duration = models.IntegerField(default=0) + + def __str__(self): + return self.name + def source_upload_to(intance, filename): return os.path.join(FILES_SAVE_PATH, filename) # FIXME: what about really long file names? @@ -42,7 +64,7 @@ class Audiobook(models.Model): conductor = models.CharField(max_length=255, verbose_name=_('conductor')) encoded_by = models.CharField(max_length=255, verbose_name=_('encoded by')) date = models.CharField(max_length=255, verbose_name=_('date')) - project = models.ForeignKey(Project, verbose_name=_('project')) + project = models.ForeignKey(Project, models.PROTECT, verbose_name=_('project')) url = models.URLField(max_length=255, verbose_name=_('book url')) translator = models.CharField(max_length=255, null=True, blank=True, verbose_name=_('translator')) modified = models.DateTimeField(null=True, editable=False) @@ -62,6 +84,14 @@ class Audiobook(models.Model): ogg_published_tags = models.TextField(null=True, editable=False) ogg_published = models.DateTimeField(null=True, editable=False) + youtube_status = models.SmallIntegerField(null=True, editable=False, choices=status.choices) + youtube_task = models.CharField(max_length=64, null=True, editable=False) + youtube_tags = models.TextField(null=True, editable=False) + youtube_file = models.FileField(null=True, upload_to='archive/final', storage=OverwriteStorage(), editable=False) + youtube_published_tags = models.TextField(null=True, editable=False) + youtube_published = models.DateTimeField(null=True, editable=False) + youtube_id = models.CharField(max_length=255, blank=True, default='') + class Meta: verbose_name = _("audiobook") verbose_name_plural = _("audiobooks") @@ -81,28 +111,13 @@ class Audiobook(models.Model): return self.mp3_published and self.ogg_published def get_source_sha1(self): - source_sha1 = self.source_sha1 - if self.pk: - source_sha1 = type(self).objects.get(pk=self.pk).source_sha1 - while source_sha1 == 'wait': - sleep(10) - if not source_sha1: - self.source_sha1 = 'wait' - if self.pk: - type(self).objects.filter(pk=self.pk).update(source_sha1='wait') - try: - f = open(force_bytes(self.source_file.path)) - source_sha1 = sha1_file(f) - self.source_sha1 = source_sha1 - if self.pk: - type(self).objects.filter(pk=self.pk).update(source_sha1=source_sha1) - except: - self.source_sha1 = '' - if self.pk: - type(self).objects.filter(pk=self.pk).update(source_sha1='') - return None - return source_sha1 - + assert self.pk or self.source_sha1 + if not self.source_sha1: + with advisory_lock(f'get_source_sha1_{self.pk}'): + with open(self.source_file.path, 'rb') as f: + self.source_sha1 = sha1_file(f) + self.save(update_fields=['source_sha1']) + return self.source_sha1 def new_publish_tags(self): title = self.title @@ -112,10 +127,10 @@ class Audiobook(models.Model): copyright = "%s %s. Licensed to the public under %s verify at %s" % ( self.date, ORGANIZATION, LICENSE, self.url) - comment = "Audiobook nagrany w ramach projektu %s%s.\n%s" % ( - self.project.name, - " finansowanego przez %s" % self.project.sponsors if self.project.sponsors else "", - ADVERT) + comment = "\n".join(( + self.project.get_description(), + ADVERT + )) tags = { 'album': PROJECT, @@ -131,11 +146,18 @@ class Audiobook(models.Model): 'license': LICENSE, 'organization': ORGANIZATION, 'title': title, - #'flac_sha1': self.get_source_sha1(), 'project': self.project.name, - 'funded_by': self.project.sponsors, } - if self.source_sha1 and self.source_sha1 != 'wait': + if self.project.sponsors: + tags['funded_by'] = self.project.sponsors + + if self.source_sha1: tags['flac_sha1'] = self.source_sha1 return tags + @cached_property + def book(self): + slug = self.url.rstrip('/').rsplit('/', 1)[-1] + apidata = requests.get(f'https://wolnelektury.pl/api/books/{slug}/').json() + return apidata +