X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/eee35e00bf0d0eb3d2a9f08f72c7052962fecbf6..d7186e88fcc0cf5d5449a16d3907e01aaafc484e:/src/archive/models.py diff --git a/src/archive/models.py b/src/archive/models.py index c75a874..746f46b 100644 --- a/src/archive/models.py +++ b/src/archive/models.py @@ -1,17 +1,14 @@ -# -*- coding: utf-8 -*- +import json import os.path from django.db import models from time import sleep -from jsonfield.fields import JSONField -from django.utils.encoding import force_bytes -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ +from django_pglocks import advisory_lock from archive.constants import status from archive.settings import FILES_SAVE_PATH, ADVERT, LICENSE, ORGANIZATION, PROJECT from archive.utils import OverwriteStorage, sha1_file -# Create your models here. - class Project(models.Model): """ an audiobook project, needed for specyfing sponsors """ @@ -24,7 +21,7 @@ class Project(models.Model): verbose_name_plural = _("projects") ordering = ("name",) - def __unicode__(self): + def __str__(self): return self.name @@ -46,7 +43,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) @@ -54,65 +51,64 @@ class Audiobook(models.Model): # publishing process mp3_status = models.SmallIntegerField(null=True, editable=False, choices=status.choices) mp3_task = models.CharField(max_length=64, null=True, editable=False) - mp3_tags = JSONField(null=True, editable=False) + mp3_tags = models.TextField(null=True, editable=False) mp3_file = models.FileField(null=True, upload_to='archive/final', storage=OverwriteStorage(), editable=False) - mp3_published_tags = JSONField(null=True, editable=False) + mp3_published_tags = models.TextField(null=True, editable=False) mp3_published = models.DateTimeField(null=True, editable=False) ogg_status = models.SmallIntegerField(null=True, editable=False, choices=status.choices) ogg_task = models.CharField(max_length=64, null=True, editable=False) - ogg_tags = JSONField(null=True, editable=False) + ogg_tags = models.TextField(null=True, editable=False) ogg_file = models.FileField(null=True, upload_to='archive/final', storage=OverwriteStorage(), editable=False) - ogg_published_tags = JSONField(null=True, editable=False) + 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") ordering = ("title",) - def __unicode__(self): + def __str__(self): return self.title + def get_mp3_tags(self): return json.loads(self.mp3_tags) if self.mp3_tags else None + def get_ogg_tags(self): return json.loads(self.ogg_tags) if self.ogg_tags else None + def get_mp3_published_tags(self): return json.loads(self.mp3_published_tags) if self.mp3_published_tags else None + def get_ogg_published_tags_tags(self): return json.loads(self.ogg_published_tags) if self.ogg_published_tags else None + def set_mp3_tags(self, tags): self.mp3_tags = json.dumps(tags) + def set_ogg_tags(self, tags): self.ogg_tags = json.dumps(tags) + def published(self): 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 if self.translator: - title += u' (tłum. %s)' % self.translator + title += ' (tłum. %s)' % self.translator - copyright = u"%s %s. Licensed to the public under %s verify at %s" % ( + copyright = "%s %s. Licensed to the public under %s verify at %s" % ( self.date, ORGANIZATION, LICENSE, self.url) - comment = u"Audiobook nagrany w ramach projektu %s%s.\n%s" % ( + comment = "Audiobook nagrany w ramach projektu %s%s.\n%s" % ( self.project.name, - u" finansowanego przez %s" % self.project.sponsors if self.project.sponsors else "", + " finansowanego przez %s" % self.project.sponsors if self.project.sponsors else "", ADVERT) tags = { @@ -124,16 +120,15 @@ class Audiobook(models.Model): 'contact': self.url, 'copyright': copyright, 'date': self.date, - 'genre': u'Speech', - 'language': u'pol', + 'genre': 'Speech', + 'language': 'pol', '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.source_sha1: tags['flac_sha1'] = self.source_sha1 return tags