X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/998a1e2aeaea0c5361e526365d1e94d7eaa9d4e8..ca8f4e8fef80cb603117ed579da8554f503698e5:/src/lesmianator/models.py diff --git a/src/lesmianator/models.py b/src/lesmianator/models.py index 47b431542..fbcee049c 100644 --- a/src/lesmianator/models.py +++ b/src/lesmianator/models.py @@ -1,5 +1,5 @@ -# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # from functools import reduce import pickle @@ -10,25 +10,23 @@ from random import randint from django.core.files.base import ContentFile from django.db import models from django.utils.timezone import utc -from django.utils.translation import ugettext_lazy as _ -from django.core.urlresolvers import reverse from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.fields import GenericForeignKey from django.conf import settings +from django.urls import reverse -from jsonfield import JSONField from catalogue.models import Book, Tag class Poem(models.Model): - slug = models.SlugField(_('slug'), max_length=120, db_index=True) - text = models.TextField(_('text')) - created_by = models.ForeignKey(User, null=True) - created_from = JSONField(_('extra information'), null=True, blank=True) - created_at = models.DateTimeField(_('creation date'), auto_now_add=True, editable=False) - seen_at = models.DateTimeField(_('last view date'), auto_now_add=True, editable=False) - view_count = models.IntegerField(_('view count'), default=1) + slug = models.SlugField('slug', max_length=120, db_index=True) + text = models.TextField('tekst') + created_by = models.ForeignKey(User, models.SET_NULL, null=True) + created_from = models.TextField('dodatkowe informacje', null=True, blank=True) + created_at = models.DateTimeField('data utworzenia', auto_now_add=True, editable=False) + seen_at = models.DateTimeField('data ostatniego obejrzenia', auto_now_add=True, editable=False) + view_count = models.IntegerField('licznik obejrzeń', default=1) try: f = open(settings.LESMIANATOR_PICKLE, 'rb') @@ -48,7 +46,7 @@ class Poem(models.Model): @staticmethod def choose_letter(word, continuations): if word not in continuations: - return u'\n' + return '\n' choices = sum((continuations[word][letter] for letter in continuations[word])) @@ -67,7 +65,7 @@ class Poem(models.Model): return '' letters = [] - word = u'' + word = '' finished_stanza_verses = 0 current_stanza_verses = 0 @@ -83,7 +81,7 @@ class Poem(models.Model): word = word[-length + 1:] + letter char_count += 1 - if letter == u'\n': + if letter == '\n': if verse_start: finished_stanza_verses += current_stanza_verses current_stanza_verses = 0 @@ -100,8 +98,8 @@ class Poem(models.Model): class Continuations(models.Model): - pickle = models.FileField(_('Continuations file'), upload_to='lesmianator') - content_type = models.ForeignKey(ContentType) + pickle = models.FileField('plik kontynuacji', upload_to='lesmianator') + content_type = models.ForeignKey(ContentType, models.CASCADE) object_id = models.PositiveIntegerField() content_object = GenericForeignKey('content_type', 'object_id')