book/picture-only tags

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

diff --git a/src/catalogue/utils.py b/src/catalogue/utils.py
index bcc5a0b..2f3b949 100644 (file)
--- a/src/catalogue/utils.py
+++ b/src/catalogue/utils.py
@@ -2,23 +2,24 @@
 # 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 Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from collections import defaultdict

 import hashlib
 import hashlib

+import os.path

 import random
 import re
 import time
 from base64 import urlsafe_b64encode
 import random
 import re
 import time
 from base64 import urlsafe_b64encode

-
-from django.http import HttpResponse
-from django.core.files.uploadedfile import UploadedFile
-from django.core.files.storage import DefaultStorage
-from django.utils.encoding import force_unicode
-from django.conf import settings
-from os import mkdir, path, unlink
+from collections import defaultdict

 from errno import EEXIST, ENOENT
 from fcntl import flock, LOCK_EX
 from errno import EEXIST, ENOENT
 from fcntl import flock, LOCK_EX

+from os import mkdir, path, unlink

 from zipfile import ZipFile
 
 from zipfile import ZipFile
 

+from django.conf import settings
+from django.core.files.storage import DefaultStorage
+from django.core.files.uploadedfile import UploadedFile
+from django.http import HttpResponse
+from django.utils.encoding import force_unicode
+

 from reporting.utils import read_chunks
 
 # Use the system (hardware-based) random number generator if it exists.
 from reporting.utils import read_chunks
 
 # Use the system (hardware-based) random number generator if it exists.


@@ -30,9 +31,9 @@ MAX_SESSION_KEY = 18446744073709551616L     # 2 << 63
 
 
 def get_random_hash(seed):
 
 
 def get_random_hash(seed):

-    sha_digest = hashlib.sha1('%s%s%s%s' %
-        (randrange(0, MAX_SESSION_KEY), time.time(), unicode(seed).encode('utf-8', 'replace'),
-        settings.SECRET_KEY)).digest()
+    sha_digest = hashlib.sha1('%s%s%s%s' % (
+        randrange(0, MAX_SESSION_KEY), time.time(), unicode(seed).encode('utf-8', 'replace'), settings.SECRET_KEY)
+    ).digest()

     return urlsafe_b64encode(sha_digest).replace('=', '').replace('_', '-').lower()
 
 
     return urlsafe_b64encode(sha_digest).replace('=', '').replace('_', '-').lower()
 
 


@@ -84,12 +85,12 @@ class LockFile(object):
         try:
             unlink(self.lockname)
         except OSError as oe:
         try:
             unlink(self.lockname)
         except OSError as oe:

-            if oe.errno != EEXIST:
+            if oe.errno != ENOENT:

                 raise oe
         self.lock.close()
 
 
                 raise oe
         self.lock.close()
 
 

-#@task
+# @task

 def create_zip(paths, zip_slug):
     """
     Creates a zip in MEDIA_ROOT/zip directory containing files from path.
 def create_zip(paths, zip_slug):
     """
     Creates a zip in MEDIA_ROOT/zip directory containing files from path.


@@ -145,6 +146,7 @@ class AttachmentHttpResponse(HttpResponse):
             for chunk in read_chunks(f):
                 self.write(chunk)
 
             for chunk in read_chunks(f):
                 self.write(chunk)
 

+

 class MultiQuerySet(object):
     def __init__(self, *args, **kwargs):
         self.querysets = args
 class MultiQuerySet(object):
     def __init__(self, *args, **kwargs):
         self.querysets = args


@@ -163,7 +165,7 @@ class MultiQuerySet(object):
             (offset, stop, step) = item.indices(self.count())
         except AttributeError:
             # it's not a slice - make it one
             (offset, stop, step) = item.indices(self.count())
         except AttributeError:
             # it's not a slice - make it one

-            return self[item : item + 1][0]
+            return self[item:item + 1][0]

         items = []
         total_len = stop - offset
         for qs in self.querysets:
         items = []
         total_len = stop - offset
         for qs in self.querysets:


@@ -178,6 +180,7 @@ class MultiQuerySet(object):
                     stop = total_len - len(items)
                     continue
 
                     stop = total_len - len(items)
                     continue
 

+

 class SortedMultiQuerySet(MultiQuerySet):
     def __init__(self, *args, **kwargs):
         self.order_by = kwargs.pop('order_by', None)
 class SortedMultiQuerySet(MultiQuerySet):
     def __init__(self, *args, **kwargs):
         self.order_by = kwargs.pop('order_by', None)


@@ -193,7 +196,7 @@ class SortedMultiQuerySet(MultiQuerySet):
             (offset, stop, step) = item.indices(self.count())
         except AttributeError:
             # it's not a slice - make it one
             (offset, stop, step) = item.indices(self.count())
         except AttributeError:
             # it's not a slice - make it one

-            return self[item : item + 1][0]
+            return self[item:item + 1][0]

         items = []
         total_len = stop - offset
         skipped = 0
         items = []
         total_len = stop - offset
         skipped = 0


@@ -215,14 +218,14 @@ class SortedMultiQuerySet(MultiQuerySet):
                             candidate = competitor
                             candidate_i = i
                 except IndexError:
                             candidate = competitor
                             candidate_i = i
                 except IndexError:

-                    continue # continue next sort_head
+                    continue  # continue next sort_head

             # we have no more elements:
             if candidate is None:
                 break
             sort_heads[candidate_i] += 1
             if skipped < offset:
                 skipped += 1
             # we have no more elements:
             if candidate is None:
                 break
             sort_heads[candidate_i] += 1
             if skipped < offset:
                 skipped += 1

-                continue # continue next item
+                continue  # continue next item

             items.append(candidate)
 
         return items
             items.append(candidate)
 
         return items


@@ -279,7 +282,8 @@ def truncate_html_words(s, num, end_text='...'):
             except ValueError:
                 pass
             else:
             except ValueError:
                 pass
             else:

-                # SGML: An end tag closes, back to the matching start tag, all unclosed intervening start tags with omitted end tags
+                # SGML: An end tag closes, back to the matching start tag,
+                # all unclosed intervening start tags with omitted end tags

                 open_tags = open_tags[i+1:]
         else:
             # Add it to the start of the open tags list
                 open_tags = open_tags[i+1:]
         else:
             # Add it to the start of the open tags list


@@ -333,26 +337,20 @@ class AppSettings(object):
     def __getattribute__(self, name):
         if name.startswith('_'):
             return object.__getattribute__(self, name)
     def __getattribute__(self, name):
         if name.startswith('_'):
             return object.__getattribute__(self, name)

-        value = getattr(settings,
-                         "%s_%s" % (self._prefix, name),
-                         object.__getattribute__(self, name))
+        value = getattr(settings, "%s_%s" % (self._prefix, name), object.__getattribute__(self, name))

         more = "_more_%s" % name
         if hasattr(self, more):
             value = getattr(self, more)(value)
         return value
 
 
         more = "_more_%s" % name
         if hasattr(self, more):
             value = getattr(self, more)(value)
         return value
 
 

-def trim_query_log(trim_to=25):
-    """
-connection.queries includes all SQL statements -- INSERTs, UPDATES, SELECTs, etc. Each time your app hits the database, the query will be recorded.
-This can sometimes occupy lots of memory, so trim it here a bit.
-    """
-    if settings.DEBUG:
-        from django.db import connection
-        connection.queries = trim_to > 0 \
-            and connection.queries[-trim_to:] \
-            or []
-
-

 def delete_from_cache_by_language(cache, key_template):
     cache.delete_many([key_template % lc for lc, ln in settings.LANGUAGES])
 def delete_from_cache_by_language(cache, key_template):
     cache.delete_many([key_template % lc for lc, ln in settings.LANGUAGES])

+
+
+def gallery_path(slug):
+    return os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, slug)
+
+
+def gallery_url(slug):
+    return '%s%s%s/' % (settings.MEDIA_URL, settings.IMAGE_DIR, slug)