fix

[audio.git] / src / youtube / models.py

diff --git a/src/youtube/models.py b/src/youtube/models.py
index 219a682..35899b6 100644 (file)
--- a/src/youtube/models.py
+++ b/src/youtube/models.py
@@ -1,6 +1,5 @@
 import io
 from os import unlink
 import io
 from os import unlink

-from tempfile import NamedTemporaryFile

 from django.db import models
 from django.utils.translation import gettext_lazy as _
 from django.template import Template, Context
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 from django.template import Template, Context


@@ -24,6 +23,7 @@ YOUTUBE_TITLE_LIMIT = 100
 
 
 class YouTube(models.Model):
 
 
 class YouTube(models.Model):

+    name = models.CharField(max_length=255)

     title_template = models.CharField(max_length=1024, blank=True)
     description_template = models.TextField(blank=True)
     category = models.IntegerField(null=True, blank=True, choices=[
     title_template = models.CharField(max_length=1024, blank=True)
     description_template = models.TextField(blank=True)
     category = models.IntegerField(null=True, blank=True, choices=[


@@ -44,6 +44,9 @@ class YouTube(models.Model):
         verbose_name = _("YouTube configuration")
         verbose_name_plural = _("YouTube configurations")
 
         verbose_name = _("YouTube configuration")
         verbose_name_plural = _("YouTube configurations")
 

+    def __str__(self):
+        return self.name
+

     def get_context(self, audiobook):
         return Context(dict(
             audiobook=audiobook,
     def get_context(self, audiobook):
         return Context(dict(
             audiobook=audiobook,


@@ -212,10 +215,14 @@ class Font(models.Model):
 
 
 class ThumbnailTemplate(models.Model):
 
 
 class ThumbnailTemplate(models.Model):

+    youtube = models.ForeignKey(YouTube, models.CASCADE)

     order = models.SmallIntegerField()
     is_active = models.BooleanField()
     background = models.FileField(upload_to='youtube/thumbnail')
     definition = models.TextField()
     order = models.SmallIntegerField()
     is_active = models.BooleanField()
     background = models.FileField(upload_to='youtube/thumbnail')
     definition = models.TextField()

+    authors = models.CharField(max_length=255, blank=True)
+    epochs = models.CharField(max_length=255, blank=True)
+    kinds = models.CharField(max_length=255, blank=True)

     genres = models.CharField(max_length=255, blank=True)
     collections = models.CharField(max_length=255, blank=True)
 
     genres = models.CharField(max_length=255, blank=True)
     collections = models.CharField(max_length=255, blank=True)
 


@@ -224,13 +231,19 @@ class ThumbnailTemplate(models.Model):
 
     def generate(self, audiobook):
         try:
 
     def generate(self, audiobook):
         try:

+            title = audiobook.book['title']
+            if audiobook.book.get('parent'):
+                parent_title = audiobook.book['parent']['title']
+                if not title.startswith(parent_title):
+                    title = ", ".join((parent_title, title))
+

             img = create_thumbnail(
                 self.background.path,
                 self.definition,
                 {
                     "author": ', '.join((a['name'] for a in audiobook.book['authors'])),
             img = create_thumbnail(
                 self.background.path,
                 self.definition,
                 {
                     "author": ', '.join((a['name'] for a in audiobook.book['authors'])),

-                    "title": audiobook.book['title'],
-                    "part": (audiobook.youtube_volume or audiobook.part_name).strip(),
+                    "title": title,
+                    "part": (audiobook.youtube_volume or audiobook.part_name).strip() if audiobook.youtube_volume_count > 1 else '',

                 },
                 lambda name: Font.objects.get(name=name).truetype.path
             )
                 },
                 lambda name: Font.objects.get(name=name).truetype.path
             )


@@ -243,11 +256,12 @@ class ThumbnailTemplate(models.Model):
             return buf
 
     def is_for_audiobook(self, audiobook):
             return buf
 
     def is_for_audiobook(self, audiobook):

-        if self.genres:
-            book_genres = set([g['slug'] for g in audiobook.book['genres']])
-            template_genres = set([g.strip() for g in self.genres.split(',')])
-            if not book_genres.intersection(template_genres):
-                return False
+        for category in 'authors', 'epochs', 'kinds', 'genres':
+            if getattr(self, category):
+                book_slugs = set([g['slug'] for g in audiobook.book[category]])
+                template_slugs = set([g.strip() for g in getattr(self, category).split(',')])
+                if not book_slugs.intersection(template_slugs):
+                    return False

 
         if self.collections:
             template_collections = set([g.strip() for g in self.collections.split(',')])
 
         if self.collections:
             template_collections = set([g.strip() for g in self.collections.split(',')])