django-restit 4.2.131__py3-none-any.whl → 4.2.132__py3-none-any.whl

{django_restit-4.2.131.dist-info → django_restit-4.2.132.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.131
+Version: 4.2.132
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.131.dist-info → django_restit-4.2.132.dist-info}/RECORD

@@ -173,7 +173,7 @@ medialib/fixtures/medialib_test_fixture.json,sha256=7M7zvGI2S5G3ENV8OQ3Ks4149lEi
 medialib/forms.py,sha256=nrE6QTPNPiIeX7Nx4l9DEmAQeQXqFyCg1C3JEDBYJfE,5442
 medialib/migrations/0001_initial.py,sha256=H3JliH5aw7tiHef8MhrJr_9rGetqgA7UjTF-eKziRSM,20518
 medialib/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-medialib/models.py,sha256=XVqqyMeikK5qPGQ_kMsM9H9VcTPko9s3JmTGGfIScvs,53647
+medialib/models.py,sha256=snD9Lyskp6i1YTOcERrclPUPIbINkGOhGOTbDKC8dFk,54791
 medialib/ocr.py,sha256=zlP7-NBiXhW7jR9pljmEPl5xzLVZpLN5QLAELQgU0Fk,1189
 medialib/pdf.py,sha256=l28WwM0JKbT9boV-b_9TFh9jhvGcrquR8GqC8wfEaLk,1275
 medialib/qrcode.py,sha256=vHyA5egXOX70EFiUDgr1njI9zcF6bXQJ_hKAQrppRow,545
@@ -205,7 +205,7 @@ medialib/render/presets/video_still.py,sha256=VSWtr6k3UJta3YdOpEfU9d7p46XKi98aPt
 medialib/render/presets/video_validate.py,sha256=pC6MzzgVWZKGJj6NkQ8SHcDj8z45kxHMuwxK82f8vIU,3228
 medialib/render/presets/websnap.py,sha256=RSxJ7T2ICU_KQn48yHWLj4qXCABTC7uVIPwe-z_CSkI,863
 medialib/render/presets/youtube.py,sha256=M4bTZju1u7rrvwLOG89cNUaelHUtnRFss7hggvZCAuE,2282
-medialib/render/render_utils.py,sha256=ld0hMfiAWSqC8Nhi408ZPSjKHWYuQXtPdjbeBfav41o,16451
+medialib/render/render_utils.py,sha256=kJlluBmkXoABQqZ6cJFQ3u07cl5ela-Gvu6w96hd6uA,16460
 medialib/render/schedule.py,sha256=iDSekfsY31SEXF-MR-YdJ9-a3UJ3SoJsZJpiEcbiNZA,370
 medialib/rpc/__init__.py,sha256=K84yMB6sUr7zTeECxca-_2jyHiUGCHTM-XYmJK6jQCo,82
 medialib/rpc/legacy.py,sha256=KTNmNJIxfFkZfAj0LXx9-e8bJonOfCoNE0-c_cugsNc,37925
@@ -376,7 +376,7 @@ pushit/utils.py,sha256=IeTCGa-164nmB1jIsK1lu1O1QzUhS3BKfuXHGjCW-ck,2121
 rest/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 rest/README.md,sha256=V3ETc-cJu8PZIbKr9xSe_pA4JEUpC8Dhw4bQeVCDJPw,5460
 rest/RemoteEvents.py,sha256=nL46U7AuxIrlw2JunphR1tsXyqi-ep_gD9CYGpYbNgE,72
-rest/__init__.py,sha256=NmUDpJwDRPihaYYG56xnn8xE0-EGE9ysndPTc4P9bDQ,122
+rest/__init__.py,sha256=-RkqJ1C1aVmCpKUVK79846yJzPNqTf7-orNjsU35Rjo,122
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -492,7 +492,7 @@ wiki/renderers/__init__.py,sha256=lLEoJvjU3ezXwBGcjleKk_kMyNeMD9MpfBlEiKayEiM,46
 wiki/renderers/mistune/__init__.py,sha256=baClLWELOwy5n8UUFi7qmoFBU6QaeegD-wRNZ7fIW_w,84
 wiki/renderers/mistune/highlight.py,sha256=BosglMQUxc_KVbLapQ4gCt6rCc0rAF1vCtUR7R1Ad4c,1264
 wiki/renderers/mistune/math.py,sha256=dgQpH9CIDiqyESphoK5XUVFxK5Yb5VhEIoLgjp3Vtcs,1901
-wiki/renderers/mistune/media.py,sha256=xD3NJSTYjyZr1mUTeL1QLzB_E5BFprV_12KqPNPYhq8,2610
+wiki/renderers/mistune/media.py,sha256=SYwjhX6_DKfqJ00yLxfKrIHu6JnnwKnroqRm6ySDMfY,2688
 wiki/renderers/mistune/meta.py,sha256=1lry9m-4wiwsivWnqYHYjwmGv91BGUSB7niJuZ1Xx54,805
 wiki/renderers/mistune/task_list.py,sha256=Ex0gUPX_d9jtbPbnEEktlqAJsM6wIt5Md2wsltX7LIY,1889
 wiki/renderers/mistune/toc.py,sha256=TKGiuMVpKqzDGUx5bAjJYpZIzG6n3wTjtuBdBc-TM_8,2302
@@ -512,7 +512,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.131.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.131.dist-info/METADATA,sha256=lsS45ob1xhvxwvB4KRvDhmmLZSXP04I4797ajfnV5uc,7663
-django_restit-4.2.131.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.131.dist-info/RECORD,,
+django_restit-4.2.132.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.132.dist-info/METADATA,sha256=NeQ9W-DZO4uEAlKI7xrNkeWyD8YQ60YuSsK3cxTsxjg,7663
+django_restit-4.2.132.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.132.dist-info/RECORD,,

medialib/models.py

@@ -20,6 +20,7 @@ import hashlib
 import time
 import mimetypes
 import tempfile
+import re
 
 from medialib import utils
 from rest import settings
@@ -29,6 +30,7 @@ from rest.decorators import rest_async
 from taskqueue.models import Task
 
 
+MEDIA_FRIENDLY_FILENAMES = settings.get("MEDIA_FRIENDLY_FILENAMES", True)
 TASKQUEUE_RENDERING = settings.get("TASKQUEUE_RENDERING", False)
 
 from rest.log import getLogger
@@ -1155,9 +1157,36 @@ class MediaItemRendition(models.Model):
         from medialib.stores import s3
         return s3.generate_upload_url(self.url, filetype)
 
-    def generateURL(self, name, prefix="", store=None):
+    def generateFriendlyURL(self, name, prefix="", store=None):
+        from rest import helpers as rh
+        rh.log_error("generateFriendlyURL", name, self.use, self.mediaitem.name, " ")
         if store is None:
             store = self.mediaitem.default_store()
+        if self.use != "original":
+            if "." in self.mediaitem.name:
+                orig_name = self.mediaitem.name.split('.')
+                orig_ext = orig_name.pop()
+                orig_name = "".join(orig_name)
+                if "." in name:
+                    ext = name.split('.')[-1]
+                else:
+                    ext = orig_ext
+                name = f"{orig_name}__{self.name}.{ext}"
+        rh.log_error("--- now ---", name, "  ")
+        name = name.replace(" ", "_")
+        name = re.sub(r'[^A-Za-z0-9._-]', '', name)
+        paths = []
+        paths.append(store)
+        paths.append("/")
+        paths.append(int_to_base36(self.mediaitem.pk))
+        paths.append("/")
+        paths.append(name)
+        return "".join(paths)
+
+    def generateURL(self, name, prefix="", store=None):
+        if MEDIA_FRIENDLY_FILENAMES:
+            return self.generateFriendlyURL(name, prefix, store)
+
         paths = []
         paths.append(store)
         paths.append("/{}/".format(int_to_base36(self.mediaitem.pk)))
@@ -1169,7 +1198,7 @@ class MediaItemRendition(models.Model):
         paths.append("_")
         paths.append(utils.toMD5(path, int(time.time())))
         paths.append(".")
-        ext = ".dat"
+        ext = "dat"
         if "." in name:
             ext = name.split('.')[-1]
         elif hasattr(self.mediaitem, "ext"):

medialib/render/render_utils.py

@@ -343,7 +343,7 @@ def new_rendition(item, renditiondef, fp, kind, width=None, height=None, bytes=N
     if fp:
         rendition.upload(fp)
     elif direct:
-        rendition.url = fname
+        rendition.url = fname + ".bob"
     rendition.save()
 
     if fp:

rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.131"
+__version__ = "4.2.132"

wiki/renderers/mistune/media.py

@@ -38,6 +38,7 @@ class MediaMixin(object):
         return url
 
     def link(self, link, text=None, title=None):
+        label = text
         if text is None:
             text = link
         o = urllib.parse.urlparse(link)
@@ -47,6 +48,8 @@ class MediaMixin(object):
         params = {"href":href}
         if title:
             params["title"] = title
+        if label:
+            params["download"] = label
         if not href.startswith("http"):
             params["data-action"] = "local_page"
         flat_params = ' '.join("{}='{}'".format(key,val) for (key,val) in list(params.items()))