change document urls to be /documents/ID/name.ext

pandora/document/models.py

@@ -72,26 +72,13 @@ class Document(models.Model):
 
     @classmethod
     def get(cls, id):
-        username, name, extension = cls.parse_id(id)
-        return cls.objects.get(user__username=username, name=name, extension=extension)
-
-    @classmethod
-    def parse_id(cls, id):
-        public_id = id.replace('_', ' ').replace('\t', '_').split(':')
-        username = public_id[0]
-        name = ":".join(public_id[1:])
-        extension = name.split('.')
-        name = '.'.join(extension[:-1])
-        extension = extension[-1].lower()
-        return username, name, extension
+        return cls.objects.get(pk=ox.fromAZ(id))
 
     def get_absolute_url(self):
         return ('/documents/%s' % quote(self.get_id())).replace('%3A', ':')
 
     def get_id(self):
-        id = u'%s:%s.%s' % (self.user.username, self.name, self.extension)
-        id = id.replace('_', '%09').replace(' ', '_')
-        return id
+        return ox.toAZ(self.id)
 
     def editable(self, user):
         if not user or user.is_anonymous():
@@ -180,7 +167,11 @@ class Document(models.Model):
         return False
 
     def thumbnail(self):
-        return '%s.jpg' % self.file.path
+        if self.extension == 'pdf':
+            thumbnail = '%s.jpg' % self.file.path
+        else:
+            thumbnail = self.file.path
+        return thumbnail
 
     def make_thumbnail(self, force=False):
         thumb = self.thumbnail()

pandora/document/views.py

@@ -14,8 +14,7 @@ from item.models import Item
 import models
 
 def get_document_or_404_json(id):
-    username, name, extension = models.Document.parse_id(id)
-    return get_object_or_404_json(models.Document, user__username=username, name=name, extension=extension)
+    return models.Document.get(id)
 
 @login_required_json
 def addDocument(request):
@@ -221,11 +220,12 @@ def sortDocuments(request):
     return render_to_json_response(response)
 actions.register(sortDocuments, cache=False)
 
-def file(request, id):
+def file(request, id, name=None):
     document = models.Document.get(id)
     return HttpFileResponse(document.file.path)
 
-def thumbnail(request, id):
+def thumbnail(request, id, size=256):
+    size = int(size)
     document = models.Document.get(id)
     return HttpFileResponse(document.thumbnail())
 

pandora/urls.py

@@ -30,8 +30,8 @@ urlpatterns = patterns('',
     (r'^file/(?P<oshash>.*)$', 'archive.views.lookup_file'),
     (r'^api/?$', include(ox.django.api.urls)),
     (r'^resetUI$', 'user.views.reset_ui'),
-    (r'^documents/(?P<id>.*?.pdf).jpg$', 'document.views.thumbnail'),
-    (r'^documents/(?P<id>.*?.)$', 'document.views.file'),
+    (r'^documents/(?P<id>[A-Z0-9].+)/(?P<size>\d*)p.jpg$', 'document.views.thumbnail'),
+    (r'^documents/(?P<id>[A-Z0-9].+)/(?P<name>.*?\..+)$', 'document.views.file'),
     (r'^edit/(?P<id>.*?)/icon(?P<size>\d*).jpg$', 'edit.views.icon'),
     (r'^list/(?P<id>.*?)/icon(?P<size>\d*).jpg$', 'itemlist.views.icon'),
     (r'^text/(?P<id>.*?)/icon(?P<size>\d*).jpg$', 'text.views.icon'),