X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/967eed676fc83d15b26149047f353ac61faa8217..30ceb98e6272767f8f271ecb0de30858e1c1a88e:/src/lesmianator/models.py diff --git a/src/lesmianator/models.py b/src/lesmianator/models.py index 0595810cc..28dbdba90 100644 --- a/src/lesmianator/models.py +++ b/src/lesmianator/models.py @@ -1,7 +1,7 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from functools import reduce import pickle from pickle import PickleError from datetime import datetime @@ -10,28 +10,27 @@ 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.utils.translation import gettext_lazy as _ 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_by = models.ForeignKey(User, models.SET_NULL, null=True) + created_from = models.TextField(_('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) try: - f = open(settings.LESMIANATOR_PICKLE) + f = open(settings.LESMIANATOR_PICKLE, 'rb') global_dictionary = pickle.load(f) f.close() except (IOError, AttributeError, PickleError): @@ -48,7 +47,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 +66,7 @@ class Poem(models.Model): return '' letters = [] - word = u'' + word = '' finished_stanza_verses = 0 current_stanza_verses = 0 @@ -83,7 +82,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 @@ -101,7 +100,7 @@ class Poem(models.Model): class Continuations(models.Model): pickle = models.FileField(_('Continuations file'), upload_to='lesmianator') - content_type = models.ForeignKey(ContentType) + content_type = models.ForeignKey(ContentType, models.CASCADE) object_id = models.PositiveIntegerField() content_object = GenericForeignKey('content_type', 'object_id') @@ -155,7 +154,7 @@ class Continuations(models.Model): obj = cls.objects.get(content_type=object_type, object_id=sth.id) if not obj.pickle: raise cls.DoesNotExist - f = open(obj.pickle.path) + f = open(obj.pickle.path, 'rb') keys, conts = pickle.load(f) f.close() if set(keys) != should_keys: