Fix

[redakcja.git] / apps / api / handlers / library_handlers.py

diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py
index 84881ce..93d650b 100644 (file)
--- a/apps/api/handlers/library_handlers.py
+++ b/apps/api/handlers/library_handlers.py
@@ -60,8 +60,7 @@ class LibraryHandler(BaseHandler):
 
         documents = {}
         
-        for docid in lib.documents():
-            docid = docid.decode('utf-8')
+        for docid in lib.documents():            
             documents[docid] = {
                 'url': reverse('document_view', args=[docid]),
                 'name': docid,
@@ -255,17 +254,20 @@ class DocumentGalleryHandler(BaseHandler):
 
             gallery = {'name': assoc.name, 'pages': []}
             
-            for file in sorted(os.listdir(dirpath)):
+            for file in os.listdir(dirpath):
+                file = file.decode('utf-8')
+                
                 log.info(file)
                 name, ext = os.path.splitext(os.path.basename(file))
 
-                if ext.lower() not in ['.png', '.jpeg', '.jpg']:
+                if ext.lower() not in [u'.png', u'.jpeg', u'.jpg']:
                     log.info("Ignoring: %s %s", name, ext)
                     continue
 
-                url = settings.MEDIA_URL + assoc.subpath + u'/' + file.decode('utf-8');
+                url = settings.MEDIA_URL + assoc.subpath + u'/' + file;
                 gallery['pages'].append(url)
-                
+
+            gallery['pages'].sort()
             galleries.append(gallery)
 
         return galleries