Fix

[redakcja.git] / apps / filebrowser / functions.py

diff --git a/apps/filebrowser/functions.py b/apps/filebrowser/functions.py
old mode 100755 (executable)
new mode 100644 (file)
index cef9dcd..c8cde3f
--- a/apps/filebrowser/functions.py
+++ b/apps/filebrowser/functions.py
@@ -1,11 +1,15 @@
-# coding: utf-8
+# -*- coding: utf-8
+
+import os
+import re
+import decimal

 
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from time import gmtime, strftime, localtime, mktime, time
 from django.core.files import File
 from django.core.files.storage import default_storage
 
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from time import gmtime, strftime, localtime, mktime, time
 from django.core.files import File
 from django.core.files.storage import default_storage

-import os, re, decimal
+

 from urlparse import urlparse
 
 # filebrowser imports
 from urlparse import urlparse
 
 # filebrowser imports


@@ -25,25 +29,26 @@ def _url_to_path(value):
     """
     Change URL to PATH.
     Value has to be an URL relative to MEDIA URL or a full URL (including MEDIA_URL).
     """
     Change URL to PATH.
     Value has to be an URL relative to MEDIA URL or a full URL (including MEDIA_URL).

-    
+

     Returns a PATH relative to MEDIA_ROOT.
     """
     Returns a PATH relative to MEDIA_ROOT.
     """

+    print "URL2PATH", repr(value)

     mediaurl_re = re.compile(r'^(%s)' % (MEDIA_URL))
     mediaurl_re = re.compile(r'^(%s)' % (MEDIA_URL))

-    value = mediaurl_re.sub('', value)
+    value = mediaurl_re.sub(u'', value)

     return value
     return value

-    
+

 
 def _path_to_url(value):
     """
     Change PATH to URL.
     Value has to be a PATH relative to MEDIA_ROOT.
 
 def _path_to_url(value):
     """
     Change PATH to URL.
     Value has to be a PATH relative to MEDIA_ROOT.

-    
+

     Return an URL relative to MEDIA_ROOT.
     """
     mediaroot_re = re.compile(r'^(%s)' % (MEDIA_ROOT))
     value = mediaroot_re.sub('', value)
     return _url_join(MEDIA_URL, value)
     Return an URL relative to MEDIA_ROOT.
     """
     mediaroot_re = re.compile(r'^(%s)' % (MEDIA_ROOT))
     value = mediaroot_re.sub('', value)
     return _url_join(MEDIA_URL, value)

-    
+

 
 def _dir_from_url(value):
     """
 
 def _dir_from_url(value):
     """


@@ -51,129 +56,113 @@ def _dir_from_url(value):
     URL has to be an absolute URL including MEDIA_URL or
     an URL relative to MEDIA_URL.
     """
     URL has to be an absolute URL including MEDIA_URL or
     an URL relative to MEDIA_URL.
     """

-    
+

     mediaurl_re = re.compile(r'^(%s)' % (MEDIA_URL))
     value = mediaurl_re.sub('', value)
     directory_re = re.compile(r'^(%s)' % (DIRECTORY))
     value = directory_re.sub('', value)
     return os.path.split(value)[0]
     mediaurl_re = re.compile(r'^(%s)' % (MEDIA_URL))
     value = mediaurl_re.sub('', value)
     directory_re = re.compile(r'^(%s)' % (DIRECTORY))
     value = directory_re.sub('', value)
     return os.path.split(value)[0]

-    
+

 
 def _get_version_path(value, version_prefix):
     """
     Construct the PATH to an Image version.
     Value has to be server-path, relative to MEDIA_ROOT.
 
 def _get_version_path(value, version_prefix):
     """
     Construct the PATH to an Image version.
     Value has to be server-path, relative to MEDIA_ROOT.

-    
+

     version_filename = filename + version_prefix + ext
     Returns a path relative to MEDIA_ROOT.
     """
     if os.path.isfile(os.path.join(MEDIA_ROOT, value)):
         path, filename = os.path.split(value)
         filename, ext = os.path.splitext(filename)
     version_filename = filename + version_prefix + ext
     Returns a path relative to MEDIA_ROOT.
     """
     if os.path.isfile(os.path.join(MEDIA_ROOT, value)):
         path, filename = os.path.split(value)
         filename, ext = os.path.splitext(filename)

-        version_filename = filename + "_" + version_prefix + ext
+        version_filename = filename + u"_" + version_prefix + ext

         return os.path.join(VERSIONS_BASEDIR, path, version_filename)
     else:
         return None
         return os.path.join(VERSIONS_BASEDIR, path, version_filename)
     else:
         return None

-    

 
 

-def _sort_by_attr(seq, attr):
-    """
-    Sort the sequence of objects by object's attribute
-    
-    Arguments:
-    seq  - the list or any sequence (including immutable one) of objects to sort.
-    attr - the name of attribute to sort by
-    
-    Returns:
-    the sorted list of objects.
-    """
-    import operator
-    
-    # Use the "Schwartzian transform"
-    # Create the auxiliary list of tuples where every i-th tuple has form
-    # (seq[i].attr, i, seq[i]) and sort it. The second item of tuple is needed not
-    # only to provide stable sorting, but mainly to eliminate comparison of objects
-    # (which can be expensive or prohibited) in case of equal attribute values.
-    intermed = map(None, map(getattr, seq, (attr,)*len(seq)), xrange(len(seq)), seq)
-    intermed.sort()
-    return map(operator.getitem, intermed, (-1,) * len(intermed))
-    

 
 def _url_join(*args):
 
 def _url_join(*args):

-    if args[0].startswith("http://"):
-        url = "http://"
+    if args[0].startswith(u"http://"):
+        url = u"http://"

     else:
     else:

-        url = "/"
+        url = u"/"

     for arg in args:
     for arg in args:

-        arg = str(arg).replace("\\", "/")
-        arg_split = arg.split("/")
+        arg = unicode(arg).replace(u"\\", u"/")
+        arg_split = arg.split(u"/")

         for elem in arg_split:
         for elem in arg_split:

-            if elem != "" and elem != "http:":
-                url = url + elem + "/"
+            if elem != u"" and elem != u"http:":
+                url = url + elem + u"/"

     # remove trailing slash for filenames
     if os.path.splitext(args[-1])[1]:
     # remove trailing slash for filenames
     if os.path.splitext(args[-1])[1]:

-        url = url.rstrip("/")
+        url = url.rstrip(u"/")

     return url
     return url

-    
+

 
 def _get_path(path):
     """
     Get Path.
     """
 
 def _get_path(path):
     """
     Get Path.
     """

-    
+

     if os.path.isabs(path) or not os.path.isdir(os.path.join(MEDIA_ROOT, DIRECTORY, path)):
         return None
     return path
     if os.path.isabs(path) or not os.path.isdir(os.path.join(MEDIA_ROOT, DIRECTORY, path)):
         return None
     return path

-    
+

 
 def _get_file(path, filename):
     """
     Get File.
     """
 
 def _get_file(path, filename):
     """
     Get File.
     """

-    
+

     if not os.path.isfile(os.path.join(MEDIA_ROOT, DIRECTORY, path, filename)) and not os.path.isdir(os.path.join(MEDIA_ROOT, DIRECTORY, path, filename)):
         return None
     return filename
     if not os.path.isfile(os.path.join(MEDIA_ROOT, DIRECTORY, path, filename)) and not os.path.isdir(os.path.join(MEDIA_ROOT, DIRECTORY, path, filename)):
         return None
     return filename

-    
+

 
 def _get_breadcrumbs(query, path, title):
     """
     Get breadcrumbs.
     """
 
 def _get_breadcrumbs(query, path, title):
     """
     Get breadcrumbs.
     """

-    
+

     breadcrumbs = []
     dir_query = ""
     if path:
         for item in path.split(os.sep):
     breadcrumbs = []
     dir_query = ""
     if path:
         for item in path.split(os.sep):

-            dir_query = os.path.join(dir_query,item)
-            breadcrumbs.append([item,dir_query])
+            dir_query = os.path.join(dir_query, item)
+            breadcrumbs.append([item, dir_query])

     if title:
     if title:

-        breadcrumbs.append([title,''])
+        breadcrumbs.append([title, ''])

     return breadcrumbs
     return breadcrumbs

-    
+

 
 def _get_filterdate(filterDate, dateTime):
     """
     Get filterdate.
     """
 
 def _get_filterdate(filterDate, dateTime):
     """
     Get filterdate.
     """

-    
-    returnvalue = ''
+

     dateYear = strftime("%Y", gmtime(dateTime))
     dateMonth = strftime("%m", gmtime(dateTime))
     dateDay = strftime("%d", gmtime(dateTime))
     dateYear = strftime("%Y", gmtime(dateTime))
     dateMonth = strftime("%m", gmtime(dateTime))
     dateDay = strftime("%d", gmtime(dateTime))

-    if filterDate == 'today' and int(dateYear) == int(localtime()[0]) and int(dateMonth) == int(localtime()[1]) and int(dateDay) == int(localtime()[2]): returnvalue = 'true'
-    elif filterDate == 'thismonth' and dateTime >= time()-2592000: returnvalue = 'true'
-    elif filterDate == 'thisyear' and int(dateYear) == int(localtime()[0]): returnvalue = 'true'
-    elif filterDate == 'past7days' and dateTime >= time()-604800: returnvalue = 'true'
-    elif filterDate == '': returnvalue = 'true'
-    return returnvalue
-    
+
+    if filterDate == 'today' and int(dateYear) == int(localtime()[0]) and int(dateMonth) == int(localtime()[1]) and int(dateDay) == int(localtime()[2]):
+        return 'true'
+
+    if filterDate == 'thismonth' and dateTime >= time() - 2592000:
+        return 'true'
+
+    if filterDate == 'thisyear' and int(dateYear) == int(localtime()[0]):
+        return 'true'
+
+    if filterDate == 'past7days' and dateTime >= time() - 604800:
+        return 'true'
+
+    return 'true' if filterDate == '' else ''
+

 
 def _get_settings_var():
     """
     Get settings variables used for FileBrowser listing.
     """
 
 def _get_settings_var():
     """
     Get settings variables used for FileBrowser listing.
     """

-    
+

     settings_var = {}
     # Main
     settings_var['DEBUG'] = DEBUG
     settings_var = {}
     # Main
     settings_var['DEBUG'] = DEBUG


@@ -199,52 +188,49 @@ def _get_settings_var():
     # Convert Filenames
     settings_var['CONVERT_FILENAME'] = CONVERT_FILENAME
     return settings_var
     # Convert Filenames
     settings_var['CONVERT_FILENAME'] = CONVERT_FILENAME
     return settings_var

-    
+

 
 def _handle_file_upload(path, file):
     """
     Handle File Upload.
     """
 
 def _handle_file_upload(path, file):
     """
     Handle File Upload.
     """

-    
+

     file_path = os.path.join(path, file.name)
     uploadedfile = default_storage.save(file_path, file)
     return uploadedfile
     file_path = os.path.join(path, file.name)
     uploadedfile = default_storage.save(file_path, file)
     return uploadedfile

-    
+

 
 def _get_file_type(filename):
     """
     Get file type as defined in EXTENSIONS.
     """
 
 def _get_file_type(filename):
     """
     Get file type as defined in EXTENSIONS.
     """

-    

     file_extension = os.path.splitext(filename)[1].lower()
     file_extension = os.path.splitext(filename)[1].lower()

-    file_type = ''
-    for k,v in EXTENSIONS.iteritems():
-        for extension in v:
-            if file_extension == extension.lower():
-                file_type = k
-    return file_type
-    
+    for ftype, ext_list in EXTENSIONS.iteritems():
+        if file_extension in map(str.lower, ext_list):
+            return ftype
+    return u''
+

 
 def _is_selectable(filename, selecttype):
     """
     Get select type as defined in FORMATS.
     """
 
 def _is_selectable(filename, selecttype):
     """
     Get select type as defined in FORMATS.
     """

-    
+

     file_extension = os.path.splitext(filename)[1].lower()
     select_types = []
     file_extension = os.path.splitext(filename)[1].lower()
     select_types = []

-    for k,v in SELECT_FORMATS.iteritems():
+    for k, v in SELECT_FORMATS.iteritems():

         for extension in v:
             if file_extension == extension.lower():
                 select_types.append(k)
     return select_types
         for extension in v:
             if file_extension == extension.lower():
                 select_types.append(k)
     return select_types

-    
+

 
 def _version_generator(value, version_prefix, force=None):
     """
     Generate Version for an Image.
     value has to be a serverpath relative to MEDIA_ROOT.
     """
 
 def _version_generator(value, version_prefix, force=None):
     """
     Generate Version for an Image.
     value has to be a serverpath relative to MEDIA_ROOT.
     """

-    
+

     # PIL's Error "Suspension not allowed here" work around:
     # s. http://mail.python.org/pipermail/image-sig/1999-August/000816.html
     if STRICT_PIL:
     # PIL's Error "Suspension not allowed here" work around:
     # s. http://mail.python.org/pipermail/image-sig/1999-August/000816.html
     if STRICT_PIL:


@@ -254,8 +240,8 @@ def _version_generator(value, version_prefix, force=None):
             from PIL import ImageFile
         except ImportError:
             import ImageFile
             from PIL import ImageFile
         except ImportError:
             import ImageFile

-    ImageFile.MAXBLOCK = IMAGE_MAXBLOCK # default is 64k
-    
+    ImageFile.MAXBLOCK = IMAGE_MAXBLOCK  # default is 64k
+

     try:
         im = Image.open(os.path.join(MEDIA_ROOT, value))
         version_path = _get_version_path(value, version_prefix)
     try:
         im = Image.open(os.path.join(MEDIA_ROOT, value))
         version_path = _get_version_path(value, version_prefix)


@@ -272,32 +258,32 @@ def _version_generator(value, version_prefix, force=None):
         return version_path
     except:
         return None
         return version_path
     except:
         return None

-    
+

 
 def scale_and_crop(im, width, height, opts):
 
 def scale_and_crop(im, width, height, opts):

-    x, y   = [float(v) for v in im.size]
+    x, y = [float(v) for v in im.size]

     if width:
         xr = float(width)
     else:
     if width:
         xr = float(width)
     else:

-        xr = float(x*height/y)
+        xr = float(x * height / y)

     if height:
         yr = float(height)
     else:
     if height:
         yr = float(height)
     else:

-        yr = float(y*width/x)
-    
+        yr = float(y * width / x)
+

     if 'crop' in opts:
     if 'crop' in opts:

-        r = max(xr/x, yr/y)
+        r = max(xr / x, yr / y)

     else:
     else:

-        r = min(xr/x, yr/y)
-    
+        r = min(xr / x, yr / y)
+

     if r < 1.0 or (r > 1.0 and 'upscale' in opts):
     if r < 1.0 or (r > 1.0 and 'upscale' in opts):

-        im = im.resize((int(x*r), int(y*r)), resample=Image.ANTIALIAS)
-    
+        im = im.resize((int(x * r), int(y * r)), resample=Image.ANTIALIAS)
+

     if 'crop' in opts:
     if 'crop' in opts:

-        x, y   = [float(v) for v in im.size]
-        ex, ey = (x-min(x, xr))/2, (y-min(y, yr))/2
+        x, y = [float(v) for v in im.size]
+        ex, ey = (x - min(x, xr)) / 2, (y - min(y, yr)) / 2

         if ex or ey:
         if ex or ey:

-            im = im.crop((int(ex), int(ey), int(x-ex), int(y-ey)))
+            im = im.crop((int(ex), int(ey), int(x - ex), int(y - ey)))

     return im
 scale_and_crop.valid_options = ('crop', 'upscale')
 
     return im
 scale_and_crop.valid_options = ('crop', 'upscale')
 


@@ -307,6 +293,3 @@ def _convert_filename(value):
         return value.replace(" ", "_").lower()
     else:
         return value
         return value.replace(" ", "_").lower()
     else:
         return value

-        
-    
-