Request validation fix.

[wolnelektury.git] / src / catalogue / __init__.py

diff --git a/src/catalogue/__init__.py b/src/catalogue/__init__.py
index 16c1326..da120b5 100644 (file)
--- a/src/catalogue/__init__.py
+++ b/src/catalogue/__init__.py
@@ -1,9 +1,9 @@
-# -*- 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.
 #
 import logging
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import logging

-from django.conf import settings as settings
+from django.conf import settings
+from django.utils.module_loading import import_string

 from catalogue.utils import AppSettings
 
 
 from catalogue.utils import AppSettings
 
 


@@ -12,19 +12,20 @@ default_app_config = 'catalogue.apps.CatalogueConfig'
 
 class Settings(AppSettings):
     """Default settings for catalogue app."""
 
 class Settings(AppSettings):
     """Default settings for catalogue app."""

-    DEFAULT_LANGUAGE = u'pol'
+    DEFAULT_LANGUAGE = 'pol'

     # PDF needs TeXML + XeLaTeX, MOBI needs Calibre.
     DONT_BUILD = {'pdf', 'mobi'}
     FORMAT_ZIPS = {
     # PDF needs TeXML + XeLaTeX, MOBI needs Calibre.
     DONT_BUILD = {'pdf', 'mobi'}
     FORMAT_ZIPS = {

-            'epub': 'wolnelektury_pl_epub',
-            'pdf': 'wolnelektury_pl_pdf',
-            'mobi': 'wolnelektury_pl_mobi',
-            'fb2': 'wolnelektury_pl_fb2',
-        }
+        'epub': 'wolnelektury_pl_epub',
+        'pdf': 'wolnelektury_pl_pdf',
+        'mobi': 'wolnelektury_pl_mobi',
+        'fb2': 'wolnelektury_pl_fb2',
+    }

 
     REDAKCJA_URL = "http://redakcja.wolnelektury.pl"
     GOOD_LICENSES = {r'CC BY \d\.\d', r'CC BY-SA \d\.\d'}
     RELATED_RANDOM_PICTURE_CHANCE = .5
 
     REDAKCJA_URL = "http://redakcja.wolnelektury.pl"
     GOOD_LICENSES = {r'CC BY \d\.\d', r'CC BY-SA \d\.\d'}
     RELATED_RANDOM_PICTURE_CHANCE = .5

+    GET_MP3_LENGTH = 'catalogue.utils.get_mp3_length'

 
     def _more_DONT_BUILD(self, value):
         for format_ in ['cover', 'pdf', 'epub', 'mobi', 'fb2', 'txt']:
 
     def _more_DONT_BUILD(self, value):
         for format_ in ['cover', 'pdf', 'epub', 'mobi', 'fb2', 'txt']:


@@ -41,9 +42,15 @@ class Settings(AppSettings):
         for format_ in ['epub', 'pdf', 'mobi', 'fb2']:
             attname = 'ALL_%s_ZIP' % format_.upper()
             if hasattr(settings, attname):
         for format_ in ['epub', 'pdf', 'mobi', 'fb2']:
             attname = 'ALL_%s_ZIP' % format_.upper()
             if hasattr(settings, attname):

-                logging.warn("%s is deprecated, use CATALOGUE_FORMAT_ZIPS[%s] instead", attname, format_)
+                logging.warn(
+                    "%s is deprecated, use CATALOGUE_FORMAT_ZIPS[%s] instead",
+                    attname, format_
+                )

                 value[format_] = getattr(settings, attname)
         return value
 
                 value[format_] = getattr(settings, attname)
         return value
 

+    def _more_GET_MP3_LENGTH(self, value):
+        return import_string(value)
+

 
 app_settings = Settings('CATALOGUE')
 
 app_settings = Settings('CATALOGUE')