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

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

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

{django_restit-4.2.130.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=CrTS5znW8JMuj8gaAnJ5boYvN-deF8zyOuCmW3cFQVE,52228
+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,11 +205,11 @@ 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
-medialib/rpc/media.py,sha256=nZf5OvTZ6vMoJATqOiGJjWBecXkxoXQK9VU521xnVT0,617
+medialib/rpc/media.py,sha256=118Ra_MnCtPZ-oSouA8x3inMb590JH9mwdF--cCqKdM,876
 medialib/rpc/tools.py,sha256=PQYP0r0NMLU_QdrnKxrMIPNbefzguwe-U8QBm_jhung,956
 medialib/scripts/init_config,sha256=jfXtOwYcSRFedKeSC8qcZo-ZpyvN8OvYZnQP0uXdURo,7875
 medialib/static/css/base_medialibui.css,sha256=yxhNcfzSfrx7vkHjBf_KWq-txLdbnVxjCG_dtb7pTqI,4499
@@ -273,7 +273,7 @@ medialib/stores/oauth2client/tools.py,sha256=OLSW5Iu7rtjGankFpjXlHBw8aAFOcIsWdDh
 medialib/stores/oauth2client/util.py,sha256=1Uc6qwqNhI3b507VtFnklX4sEZNt0MZbLAME2o6kCgg,5706
 medialib/stores/oauth2client/xsrfutil.py,sha256=4Plq0y5xEkDwvrveVA32gBRP0A3FkJ_36dIsyGHeJeA,3367
 medialib/stores/rtmpstore.py,sha256=CFRP6Ss4hbLKngbdaLvA8_oKCSe18B29-oWVgvTXMPA,500
-medialib/stores/s3.py,sha256=gAFiVHQkbYHZQ_2LU5nl2EXyoSs1mW4VdVCjsImisuE,5836
+medialib/stores/s3.py,sha256=behvLC-ftoMVddJmgK5jfZsC5PVjRBPrSgXkwngNP9A,6280
 medialib/stores/s3store.py,sha256=uKO6I-X83sD9xefCQytLyrV-7t9TSX2p476n_ZBkSHw,4583
 medialib/stores/uritemplate/__init__.py,sha256=ONWR_KRz9au0O-XUUTrO_UN7GHTmZCTKyvflUQb8wxM,4996
 medialib/stores/youtubestore.py,sha256=swXOJYfbhgzAv1NjOehjKtfYRZYk2wiPK7a7_boAulc,406
@@ -299,7 +299,7 @@ medialib/templates/medialib/testpicker.html,sha256=I7KnrAu9e4kQhuEEN-51HGzcuJ06E
 medialib/tests.py,sha256=z1THDMo-R9HWMvCCOgX6aH6-2W2uWqrtbJ_k-zfpgyc,6045
 medialib/tq.py,sha256=ZDRBZ9qEsqNAsk48cciLyX7DIziqD2uPEawtQny1Ja8,544
 medialib/urls.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-medialib/utils.py,sha256=Hw2lZ5vZg_JFjgbt2nhqTYdXwbERCvgnefl8rEdCUKQ,3756
+medialib/utils.py,sha256=StQY7k9dOCksdTsYqUb3aGpwwrcYg07z7vskBQqCPnw,3774
 medialib/views.py,sha256=h_Fm3FOX04VV2G-J141wEHxT36d46HVdzPJg_u8r2vI,4321
 medialib/youtube/__init__.py,sha256=fmu9XPaDpadkb2OuroQsKiWpUPo7c5y8o83HmLLMIHA,4303
 medialib/youtube/apiclient/__init__.py,sha256=iGdQFKwzm0VxArl8X183-_ZBhIsETZlbXxhBAUz3MfI,601
@@ -376,14 +376,14 @@ 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=SVzE--w6i3jhZDS773pK0TONhXDz7k3o4fmQrPAa99w,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
 rest/crypto/aes.py,sha256=NOVRBRSHCV-om68YpGySWWG-4kako3iEVjq8hxZWPUU,4372
 rest/crypto/privpub.py,sha256=_FioylVcbMmDP80yPYjURmafEiDmEAMkskbc7WF10ac,4082
 rest/crypto/util.py,sha256=agFN2OCPHC70tHNGWrMkkZX4Tt_Ty6imoKEMdTkZpKA,4514
-rest/datem.py,sha256=JHMvWG8A-n4g915wrZiCtfuhgcLMgNYMXuzXIEtgaPg,12335
+rest/datem.py,sha256=hX6bTbl5mQSg0x2hDK5P1TynkZFUfVTDwYkTuFObgbw,12626
 rest/decorators.py,sha256=AuB4agpog587CUsF8HkAZiHDfs_pueb2rdxXZD7dUUE,15327
 rest/encryption.py,sha256=x6Kiez0tVqfxK26MSsRL3k8OS05ni1gEX2aj3I0S9V0,788
 rest/errors.py,sha256=uKwG9OkLme36etabqK54DMjMQc1fgEoUIAUxXa7WFQw,612
@@ -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.130.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.130.dist-info/METADATA,sha256=9xgoIJG_Or13Bbw9zbbFb5sByRnWrAdkF2pKjC_0jTU,7663
-django_restit-4.2.130.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.130.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
@@ -330,6 +332,7 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
     Media Item (a video or image)
     """
     class RestMeta:
+        POST_SAVE_FIELDS = ["rendernow"]
         SEARCH_FIELDS = ["name", "description"]
         VIEW_PERMS = ["view_media", "manage_users", "manage_media"]
         SAVE_PERMS = ["manage_media", "manage_users"]
@@ -451,6 +454,12 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
             return self.library.default_store()
         return settings.MEDIALIB_DEFAULT_STORE
 
+    def s3_store(self):
+        return f's3://{settings.AWS_S3_BUCKET}'
+
+    def set_rendernow(self, value):
+        self.new_render()
+
     def uses(self):
         """
         List uses available for this item
@@ -551,6 +560,11 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
         return super(MediaItem, self).save()
 
     def save(self, *args, **kwargs):
+        if self.pk is None:
+            return self.saveNew(*args, **kwargs)
+        return super(MediaItem, self).save(*args, **kwargs)
+
+    def saveNew(self, *args, **kwargs):
         """
         When saving MediaItem set newfile attribute to upload new file and start rendering
         """
@@ -1023,6 +1037,25 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
         media.save()
         return media
 
+    @staticmethod
+    def on_upload_s3(request):
+        filename = request.DATA.get("filename")
+        filesize = request.DATA.get("filesize")
+        filetype = request.DATA.get("filetype")
+        kind = utils.guessMediaKindByName(filename)
+        if kind is None:
+            kind = "*"
+        obj = MediaItem(name=filename, owner=request.member, kind=kind, group=request.group)
+        obj.save()
+        rendition = MediaItemRendition(
+            mediaitem=obj, name="Original", bytes=filesize,
+            use='original', kind=kind, is_original=True)
+        rendition.save()
+        rendition.url = rendition.generateURL(filename, store=obj.s3_store())
+        rendition.save()
+        return dict(url=rendition.generateUploadURL(filetype), id=obj.pk)
+
+
 class MediaItemMetaData(MetaDataBase):
     parent = models.ForeignKey(MediaItem, related_name="properties", on_delete=models.CASCADE)
 
@@ -1073,6 +1106,7 @@ class CuePointMeta(models.Model):
     def __str__(self):
         return self.key
 
+
 class MediaItemRendition(models.Model):
     """
     A rendition of a media item
@@ -1119,34 +1153,70 @@ class MediaItemRendition(models.Model):
         except IndexError:
             return ''
 
-    def upload(self, fp, prefix=""):
-        """
-        Upload rendition to non-volatile storage
-        """
-        doclose = False
-        if type(fp) == str:
-            doclose = True
-            fp = open(fp)
+    def generateUploadURL(self, filetype):
+        from medialib.stores import s3
+        return s3.generate_upload_url(self.url, filetype)
+
+    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(self.mediaitem.default_store())
+        paths.append(store)
         paths.append("/{}/".format(int_to_base36(self.mediaitem.pk)))
         path = "".join(paths)
-        if self.rendition_definition != None:
+        if self.rendition_definition is not None:
             paths.append(int_to_base36(self.rendition_definition.pk))
         else:
             paths.append("0")
         paths.append("_")
         paths.append(utils.toMD5(path, int(time.time())))
         paths.append(".")
-        ext = ".dat"
-        if "." in fp.name:
-            ext = fp.name.split('.')[-1]
+        ext = "dat"
+        if "." in name:
+            ext = name.split('.')[-1]
         elif hasattr(self.mediaitem, "ext"):
             ext = self.mediaitem.ext
         paths.append(ext)
         # print(paths)
-        self.url = "".join(paths)
+        return "".join(paths)
+
+    def upload(self, fp, prefix=""):
+        """
+        Upload rendition to non-volatile storage
+        """
+        doclose = False
+        if type(fp) == str:
+            doclose = True
+            fp = open(fp)
+
+        self.url = self.generateURL(fp.name, prefix)
         stores.upload(self.url, fp, background=True)
         try:
             self.bytes = fp.size

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:

medialib/rpc/media.py

@@ -1,4 +1,5 @@
 from rest import decorators as rd
+from rest import views as rv
 from medialib import models as medialib
 
 
@@ -9,6 +10,13 @@ def rest_on_media_item(request, pk=None):
     return medialib.MediaItem.on_rest_request(request, pk)
 
 
+@rd.urlPOST('media/item/s3')
+@rd.login_required
+@rd.requires_params(["filename", "filesize"])
+def rest_on_media_upload_s3(request, pk=None):
+    return rv.restReturn(request, dict(data=medialib.MediaItem.on_upload_s3(request)))
+
+
 @rd.url(r'media/ref/$')
 @rd.url(r'media/ref/(?P<pk>\d+)$')
 @rd.login_required

medialib/stores/s3.py

@@ -170,6 +170,20 @@ def get_file(url, fp=None):
     return obj.download(fp)
 
 
+def generate_upload_url(url, filetype, expires=3600, acl="public-read"):
+    u = urlparse(url)
+    bucket_name = u.netloc
+    key = u.path.lstrip('/')
+    client = getS3(False)
+    params = dict(Bucket=bucket_name, Key=key, ContentType=filetype)
+    from rest import helpers
+    helpers.log_error("generate_upload_url", params)
+    return client.generate_presigned_url(
+        'put_object',
+        ExpiresIn=expires,
+        Params=params)
+
+
 def delete(url):
     if url[-1] == "/":
         prefix = url.path.lstrip("/")

medialib/utils.py

@@ -14,7 +14,8 @@ EXT_MAP = {
 KIND_MAP = {
     "video": "V",
     "image": "I",
-    "http": "E"
+    "http": "E",
+    "other": "O"
 }
 
 def getFileExt(file):

rest/__init__.py

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

rest/datem.py

@@ -182,7 +182,9 @@ def getWeek(start, start_day=0):
     return week_start, week_end
 
 
-def getStartOfMonth(d):
+def getStartOfMonth(d, clear_time=False):
+    if clear_time:
+        return d.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
     return d.replace(day=1)
 
 
@@ -190,13 +192,19 @@ def nextMonth(d):
     return getStartOfMonth(getStartOfMonth(d) + timedelta(days=32))
 
 
-def getEndOfMonth(start):
+def getEndOfMonthNoTime(start):
     start = start.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
     end = start + timedelta(days=calendar.monthrange(start.year, start.month)[1])
     end = end.replace(hour=0, minute=0, second=0, microsecond=0)
     return end
 
 
+def getEndOfMonth(d, clear_time=False):
+    if clear_time:
+        return getEndOfMonthNoTime(d)
+    return getStartOfMonth(nextMonth(d)) - timedelta(days=1) 
+
+
 def parseDate(date_str, is_future=False, is_past=False, month_end=True, as_date=False):
     res = parseDateTime(date_str, is_future, is_past, month_end)
     if as_date and res:
@@ -284,10 +292,10 @@ def getDateRange(start, end=None, kind=None, zone=None, hour=0, eod=None, end_eo
             start, end = getWeek(start)
         elif kind == "month":
             start = start.replace(hour=0, day=1)
-            end = getEndOfMonth(start)
+            end = getEndOfMonth(start, True)
         elif kind == "year":
             start = start.replace(hour=0, day=1, month=1)
-            end = getEndOfMonth(start.replace(month=12))
+            end = getEndOfMonth(start.replace(month=12), True)
         elif isinstance(kind, int) or (isinstance(kind, str) and kind.isdigit()):
             end = start + timedelta(days=1)
             start = end - timedelta(days=int(kind))

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()))