X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/eee35e00bf0d0eb3d2a9f08f72c7052962fecbf6..c7d2e4daae13c7c1100ec0d42ace0e8c34b5ae24:/src/archive/models.py

diff --git a/src/archive/models.py b/src/archive/models.py
index c75a874..4a1d763 100644
--- a/src/archive/models.py
+++ b/src/archive/models.py
@@ -1,17 +1,13 @@
-# -*- coding: utf-8 -*-
 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 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 +20,7 @@ class Project(models.Model):
         verbose_name_plural = _("projects")
         ordering = ("name",)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 
@@ -54,27 +50,33 @@ 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)
 
-
     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
 
@@ -105,14 +107,14 @@ class Audiobook(models.Model):
     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,8 +126,8 @@ 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,