concurrency: no model save at file save in tasks

[audio.git] / apps / archive / models.py

diff --git a/apps/archive/models.py b/apps/archive/models.py
index 81a8594..f9e86f6 100644 (file)
--- a/apps/archive/models.py
+++ b/apps/archive/models.py
@@ -1,6 +1,10 @@
+# -*- coding: utf-8 -*-
+

 from django.db import models
 from jsonfield.fields import JSONField
 from django.utils.translation import ugettext_lazy as _
 from django.db import models
 from jsonfield.fields import JSONField
 from django.utils.translation import ugettext_lazy as _

+from archive.constants import status
+from archive.settings import FILES_PATH, ADVERT, LICENSE, ORGANIZATION, PROJECT

 
 # Create your models here.
 
 
 # Create your models here.
 


@@ -21,7 +25,9 @@ class Project(models.Model):
 
 
 class Audiobook(models.Model):
 
 
 class Audiobook(models.Model):

-    source_file = models.FileField(upload_to='archive/files', verbose_name=_('source file'), editable=False)
+    source_file = models.FileField(upload_to='archive/files', max_length=255, 
+            verbose_name=_('source file'), editable=False)
+    source_sha1 = models.CharField(max_length=40, editable=False)

 
     title = models.CharField(max_length=255, verbose_name=_('title'))
     artist = models.CharField(max_length=255, verbose_name=_('artist'))
 
     title = models.CharField(max_length=255, verbose_name=_('title'))
     artist = models.CharField(max_length=255, verbose_name=_('artist'))


@@ -30,16 +36,24 @@ class Audiobook(models.Model):
     date = models.CharField(max_length=255, verbose_name=_('date'))
     project = models.ForeignKey(Project, verbose_name=_('project'))
     url = models.URLField(max_length=255, verbose_name=_('book url'))
     date = models.CharField(max_length=255, verbose_name=_('date'))
     project = models.ForeignKey(Project, 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)
 
     modified = models.DateTimeField(null=True, editable=False)
 

-    published_tags = JSONField(null=True, editable=False)
+    # 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_file = models.FileField(null=True, upload_to='archive/final', editable=False)
     mp3_file = models.FileField(null=True, upload_to='archive/final', editable=False)

+    mp3_published_tags = JSONField(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_file = models.FileField(null=True, upload_to='archive/final', editable=False)
     ogg_file = models.FileField(null=True, upload_to='archive/final', editable=False)

-    publishing_tags = JSONField(null=True, editable=False)
+    ogg_published_tags = JSONField(null=True, editable=False)
+    ogg_published = models.DateTimeField(null=True, editable=False)

 
 

-    publish_wait = models.DateTimeField(null=True, editable=False) # somebody hit "publish"
-    publishing = models.BooleanField(default=False, editable=False)
-    published = models.DateTimeField(null=True, editable=False)

 
     class Meta:
         verbose_name = _("audiobook")
 
     class Meta:
         verbose_name = _("audiobook")


@@ -49,8 +63,35 @@ class Audiobook(models.Model):
     def __unicode__(self):
         return self.title
 
     def __unicode__(self):
         return self.title
 

+    def published(self):
+        return self.mp3_published and self.ogg_published
+

     def new_publish_tags(self):
     def new_publish_tags(self):

+        title = self.title
+        if self.translator:
+            title += u' (tłum. %s)' % self.translator
+
+        copyright = u"%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" % (
+                    self.project.name,
+                    u" finansowanego przez %s" % self.project.sponsors if self.project.sponsors else "",
+                    ADVERT)
+

         return {
         return {

-            'title': self.title,
-            'copyright': 'Fundacja Nowoczesna Polska',
+            'album': PROJECT,
+            'albumartist': ORGANIZATION,
+            'artist': self.artist,
+            'comment': comment,
+            'conductor': self.conductor,
+            'contact': self.url,
+            'copyright': copyright,
+            'date': self.date,
+            'genre': u'Speech',
+            'language': u'pol',
+            'license': LICENSE,
+            'organization': ORGANIZATION,
+            'title': title,
+            'flac_sha1': self.source_sha1,

         }
         }