Layout fixes, cover update for files.

[wolnelektury.git] / src / api / models.py

diff --git a/src/api/models.py b/src/api/models.py
index e72aaff..ffa4f9b 100644 (file)
--- a/src/api/models.py
+++ b/src/api/models.py
@@ -6,7 +6,7 @@ from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.db.models.signals import pre_delete
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.db.models.signals import pre_delete

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 from catalogue.models import Book, Tag
 
 
 from catalogue.models import Book, Tag
 


@@ -30,14 +30,17 @@ def _pre_delete_handler(sender, instance, **kwargs):
         if sender == Tag:
             if instance.category in ('book', 'set'):
                 return
         if sender == Tag:
             if instance.category in ('book', 'set'):
                 return

-            else:
-                category = instance.category
+            category = instance.category

         else:
             category = None
         content_type = ContentType.objects.get_for_model(sender)
         Deleted.objects.create(
         else:
             category = None
         content_type = ContentType.objects.get_for_model(sender)
         Deleted.objects.create(

-            content_type=content_type, object_id=instance.id, created_at=instance.created_at, category=category,
-            slug=instance.slug)
+            content_type=content_type,
+            object_id=instance.id,
+            created_at=instance.created_at,
+            category=category,
+            slug=instance.slug
+        )

 pre_delete.connect(_pre_delete_handler)
 
 
 pre_delete.connect(_pre_delete_handler)
 
 


@@ -47,6 +50,9 @@ class BookUserData(models.Model):
     complete = models.BooleanField(default=False)
     last_changed = models.DateTimeField(auto_now=True)
 
     complete = models.BooleanField(default=False)
     last_changed = models.DateTimeField(auto_now=True)
 

+    class Meta:
+        unique_together = [('user', 'book')]
+

     @property
     def state(self):
         return 'complete' if self.complete else 'reading'
     @property
     def state(self):
         return 'complete' if self.complete else 'reading'


@@ -57,7 +63,6 @@ class BookUserData(models.Model):
         instance.complete = state == 'complete'
         instance.save()
         return instance
         instance.complete = state == 'complete'
         instance.save()
         return instance

-from django.conf import settings

 
 
 KEY_SIZE = 18
 
 
 KEY_SIZE = 18


@@ -85,7 +90,10 @@ class Consumer(models.Model):
     key = models.CharField(max_length=KEY_SIZE)
     secret = models.CharField(max_length=SECRET_SIZE)
     status = models.CharField(max_length=16, choices=CONSUMER_STATES, default='pending')
     key = models.CharField(max_length=KEY_SIZE)
     secret = models.CharField(max_length=SECRET_SIZE)
     status = models.CharField(max_length=16, choices=CONSUMER_STATES, default='pending')

-    user = models.ForeignKey(settings.AUTH_USER_MODEL, models.CASCADE, null=True, blank=True, related_name='consumers')
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL, models.CASCADE,
+        null=True, blank=True, related_name='consumers'
+    )

 
     def __str__(self):
         return "Consumer %s with key %s" % (self.name, self.key)
 
     def __str__(self):
         return "Consumer %s with key %s" % (self.name, self.key)


@@ -101,7 +109,10 @@ class Token(models.Model):
     token_type = models.IntegerField(choices=TOKEN_TYPES)
     timestamp = models.IntegerField()
     is_approved = models.BooleanField(default=False)
     token_type = models.IntegerField(choices=TOKEN_TYPES)
     timestamp = models.IntegerField()
     is_approved = models.BooleanField(default=False)

-    user = models.ForeignKey(settings.AUTH_USER_MODEL, models.CASCADE, null=True, blank=True, related_name='tokens')
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL, models.CASCADE,
+        null=True, blank=True, related_name='tokens'
+    )

     consumer = models.ForeignKey(Consumer, models.CASCADE)
 
     def __str__(self):
     consumer = models.ForeignKey(Consumer, models.CASCADE)
 
     def __str__(self):