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

account/rpc/member.py

@@ -12,6 +12,18 @@ def rest_on_member(request, pk=None):
     return am.Member.on_rest_request(request, pk)
 
 
+@rd.urlPOST('member/motd/reset')
+@rd.perm_required('manage_members')
+def rest_on_clear_motd(request):
+    key = request.DATA.get("key")
+    if key.startswith("viewed."):
+        key = key.split('.')[-1]
+        am.MemberMetaData.objects.filter(key=key, category="viewed").delete()
+    else:
+        am.MemberMetaData.objects.filter(key="saw_motd", category__isnull=True).delete()
+    return restStatus(request, True)
+
+
 @rd.url(r'^member/me$')
 @rd.login_optional
 def member_me_action(request):

auditlog/tq.py

@@ -10,10 +10,12 @@ from rest import settings
 
 AUDITLOG_PRUNE_DAYS = settings.get("AUDITLOG_PRUNE_DAYS", 90)
 REST_LOG_PRUNE_DAYS = settings.get("REST_LOG_PRUNE_DAYS", 90)
-ACCOUNT_LOG_PRUNE_DAYS = settings.get("ACCOUNT_LOG_PRUNE_DAYS", 360)
+ACCOUNT_LOG_PRUNE_DAYS = settings.get("ACCOUNT_LOG_PRUNE_DAYS", 640)
 ASYNC_LOG_PRUNE_DAYS = settings.get("ASYNC_LOG_PRUNE_DAYS", 14)
 SESSION_PRUNE_DAYS = settings.get("SESSION_PRUNE_DAYS", 180)
 
+ACCOUNT_LOG_COMPONENTS = settings.get("ACCOUNT_LOG_COMPONENTS", ["account.Member", "account.Group"])
+
 
 def on_cleanup(task):
     # cleanup log files in the var directory
@@ -41,21 +43,21 @@ def on_cleanup(task):
 def cleanupAuditLogs():
     if AUDITLOG_PRUNE_DAYS:
         before = datetime.now() - timedelta(days=AUDITLOG_PRUNE_DAYS)
-        return PersistentLog.objects.filter(when__lte=before).exclude(component__in=["account.Member", "account.Group"]).delete()[0]
+        return PersistentLog.objects.filter(when__lte=before).exclude(component__in=ACCOUNT_LOG_COMPONENTS).delete()[0]
     return 0
 
 
 def cleanupRestLogs():
     if REST_LOG_PRUNE_DAYS:
         before = datetime.now() - timedelta(days=REST_LOG_PRUNE_DAYS)
-        return PersistentLog.objects.filter(when__lte=before, component__in=["rest", "action"]).exclude(component__in=["account.Member", "account.Group"]).delete()[0]
+        return PersistentLog.objects.filter(when__lte=before, component__in=["rest", "action"]).exclude(component__in=ACCOUNT_LOG_COMPONENTS).delete()[0]
     return 0
 
 
 def cleanupAccountLogs():
     if ACCOUNT_LOG_PRUNE_DAYS:
         before = datetime.now() - timedelta(days=ACCOUNT_LOG_PRUNE_DAYS)
-        return PersistentLog.objects.filter(when__lte=before, component__in=["account.Member", "account.Group"]).delete()[0]
+        return PersistentLog.objects.filter(when__lte=before, component__in=ACCOUNT_LOG_COMPONENTS).delete()[0]
     return 0
 
 

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

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

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

@@ -45,7 +45,7 @@ account/rpc/__init__.py,sha256=SGF0M_-H0dKh3b1apSX29BotNWAvITYccGQVC0MIjL8,336
 account/rpc/auth.py,sha256=p62tyihWvSY2zn7eaVxKcCG9qLnnZBIkwdRH81sS5_Y,16615
 account/rpc/device.py,sha256=lU2BHNPreHV0dDTjAPc7Sc-5m2JP8SiWVqiKuBfV7Fo,2281
 account/rpc/group.py,sha256=riymUK6ttv8G6SG6K-v7UCvM40WQy3HaGSeF_sEiaU0,4929
-account/rpc/member.py,sha256=VNRSD38mmTUCbq3cCSy3qRyquzeVEwW_8zzrtS0-vAA,1817
+account/rpc/member.py,sha256=8XnJX-iri0Om4nc-V2_tDJzfCSzziKLw6dUx9egtEZE,2236
 account/rpc/notify.py,sha256=Q2YWejP36egeF060Hih5uX4Psv_B8NWlLLPi7iDYlIw,3344
 account/rpc/oauth.py,sha256=ISLVsR5HvKALANokaOFRvF4FTRxWtXPvVnZAYANKxpo,2864
 account/rpc/passkeys.py,sha256=5x28nYILJUMMSwfVuWYL66hfoGUXahMqOwiHhM4I3Do,1729
@@ -72,7 +72,7 @@ auditlog/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 auditlog/models.py,sha256=skDAiuzR4chC-WNIaH2nm_VVcbnDD6ZtUxBwhk7UY8U,16517
 auditlog/periodic.py,sha256=AUhDeVsZtC47BJ-lklvYEegHoxAzj1RpIvRFSsM7g5E,363
 auditlog/rpc.py,sha256=gJgj3Wiar5pVsw8tuhy0jXLkqFkOr3Z-oI2DKelMRAQ,5592
-auditlog/tq.py,sha256=OgzJVspWI6FL92GEhDPtabYoP_Hd3zGNh0E297abz3Y,2415
+auditlog/tq.py,sha256=ROcCjQhCavOgW3-8yjLrboNTAYEC5Pu2UCoenom0Law,2478
 auditlog/urls.py,sha256=GNqpN74EpYlMND2UFUdPt5rOkTYYrdbTV0W3fg4zLfQ,163
 inbox/README.md,sha256=jsklDrzD5d94r7cwgaU6Gi1HCjBDfWq7jd92qB0JYPU,2169
 inbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -172,8 +172,9 @@ medialib/fixtures/medialib.json,sha256=Q2-30qjHI6gfHIT-8qsz8_WjL_ldrWIUIOKmJR9eJ
 medialib/fixtures/medialib_test_fixture.json,sha256=7M7zvGI2S5G3ENV8OQ3Ks4149lEiQ-bjH3nCFLwwRFo,16989
 medialib/forms.py,sha256=nrE6QTPNPiIeX7Nx4l9DEmAQeQXqFyCg1C3JEDBYJfE,5442
 medialib/migrations/0001_initial.py,sha256=H3JliH5aw7tiHef8MhrJr_9rGetqgA7UjTF-eKziRSM,20518
+medialib/migrations/0002_alter_mediaitemrendition_bytes.py,sha256=igC1R02smbNoWlk2T4uCi9cNilOsxGKD-D24fQv92dM,414
 medialib/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-medialib/models.py,sha256=snD9Lyskp6i1YTOcERrclPUPIbINkGOhGOTbDKC8dFk,54791
+medialib/models.py,sha256=hBq-xyUZB0X0TpYmywmMCuLFrOK4Su-zRfSGD1ULvk8,54995
 medialib/ocr.py,sha256=zlP7-NBiXhW7jR9pljmEPl5xzLVZpLN5QLAELQgU0Fk,1189
 medialib/pdf.py,sha256=l28WwM0JKbT9boV-b_9TFh9jhvGcrquR8GqC8wfEaLk,1275
 medialib/qrcode.py,sha256=vHyA5egXOX70EFiUDgr1njI9zcF6bXQJ_hKAQrppRow,545
@@ -376,7 +377,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=-RkqJ1C1aVmCpKUVK79846yJzPNqTf7-orNjsU35Rjo,122
+rest/__init__.py,sha256=YSY8pyO-bS3rDXGxnPSjIFrfIY1b-rATlrQzmmOQlMc,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
@@ -409,7 +410,7 @@ rest/middleware/request.py,sha256=JchRNy5L-bGd-7h-KFYekGRvREe2eCkZXKOYqIkP2hI,41
 rest/middleware/session.py,sha256=zHSoQpIzRLmpqr_JvW406wzpvU3W3gDbm5JhtzLAMlE,10240
 rest/middleware/session_store.py,sha256=1nSdeXK8PyuYgGgIufqrS6j6QpIrQ7zbMNT0ol75e6U,1901
 rest/models/__init__.py,sha256=M8pvFDq-WCF-QcM58X7pMufYYe0aaQ3U0PwGe9TKbbY,130
-rest/models/base.py,sha256=dLgJcxDzSJDn8wsdZJaH7BkJDYTgkhnJX7-asolO6TA,70968
+rest/models/base.py,sha256=asj1ehoq_LLcm99PbyICGG9I_GQikxilrc52tTs2YBY,71301
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=1nQ7CYo9bJHoaXE_hVNaj1-Y7yqhHlf2ZlaD1IfTzic,12904
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
@@ -485,7 +486,7 @@ wiki/migrations/0003_page_perms.py,sha256=qJBLI7t5mgiDTKCR9qhticmbhgo2KKYq7WbHax
 wiki/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wiki/models/__init__.py,sha256=jE-9r_Hqpyo7ysKu9BschXOn5Zg34wUt894GwJpxA28,132
 wiki/models/faq.py,sha256=nvcEFerllQKT61kIYlasvZzRKwpXyfmQpiqkpHP1V1o,1745
-wiki/models/page.py,sha256=06wyZsDX57B-d_wZhSNcrNAOv-ERHlKveJ15MZc9haQ,8751
+wiki/models/page.py,sha256=uIu-jVdf1Y9qXKbb5k15-8RLTltyTtoXobZJFcx8_0A,8836
 wiki/models/revision.py,sha256=St5-vz8SGvogsDL6jTWqHLE23PS5mp9iA0DUt3hWTsU,729
 wiki/periodic.py,sha256=t-UgXJIug-OLslJM_r03-5WrNKj39TxrvfuNFjVAhDs,334
 wiki/renderers/__init__.py,sha256=lLEoJvjU3ezXwBGcjleKk_kMyNeMD9MpfBlEiKayEiM,461
@@ -512,7 +513,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.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,,
+django_restit-4.2.134.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.134.dist-info/METADATA,sha256=LxqKyOSlOPA71uj2Qp3pJYUjXAliEynIVPEeOE_sNSc,7663
+django_restit-4.2.134.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.134.dist-info/RECORD,,

medialib/migrations/0002_alter_mediaitemrendition_bytes.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2024-08-14 19:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('medialib', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='mediaitemrendition',
+            name='bytes',
+            field=models.BigIntegerField(help_text='Size of rendition file'),
+        ),
+    ]

medialib/models.py

@@ -458,7 +458,10 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
         return f's3://{settings.AWS_S3_BUCKET}'
 
     def set_rendernow(self, value):
-        self.new_render()
+        if self.kind == "*":
+            self.saveState(200)
+            return
+        self.new_render(force_task=(self.kind == "V"))
 
     def uses(self):
         """
@@ -475,8 +478,8 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
     def async_render(self, files={}):
         return self.new_render()
 
-    def new_render(self, files={}):
-        if TASKQUEUE_RENDERING:
+    def new_render(self, files={}, force_task=False):
+        if TASKQUEUE_RENDERING or force_task:
             Task.Publish("medialib", "on_render", {"id": self.id, "name": self.name, "kind": self.kind}, channel="tq_app_handler_medialib")
         else:
             self.createRenditions()
@@ -556,8 +559,10 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
             self.kind = '*'
 
     def saveState(self, state):
-        self.state = state
-        return super(MediaItem, self).save()
+        if self.state != state:
+            self.state = state
+            return super(MediaItem, self).save()
+        return True
 
     def save(self, *args, **kwargs):
         if self.pk is None:
@@ -1120,7 +1125,7 @@ class MediaItemRendition(models.Model):
     created = models.DateTimeField(auto_now_add=True, editable=False, help_text="When item was created")
     width = models.IntegerField(null=True, help_text="Width (if available)")
     height = models.IntegerField(null=True, help_text="Height (if available)")
-    bytes = models.IntegerField(help_text="Size of rendition file")
+    bytes = models.BigIntegerField(help_text="Size of rendition file")
     kind = models.CharField(max_length=1, choices=RenditionKinds, help_text="Kind of rendition")
     is_original = models.BooleanField(default=False, help_text="Whether is original of kind")
 

rest/__init__.py

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

rest/models/base.py

@@ -881,6 +881,15 @@ class RestModel(object):
             response_params=dict(graph=graph),
             **cls.getGraph(graph))
 
+    @classmethod
+    def restListSort(cls, request, qset):
+        from rest.serializers.collection import sort_list
+        sort = request.DATA.get("sort", getattr(cls.RestMeta, "DEFAULT_SORT", "-id"))
+        sort = request.DATA.get("sort")
+        if sort:
+            qset, sort_args = sort_list(qset, sort)
+        return qset
+
     @classmethod
     def toList(cls, qset, graph=None, totals=None, request=None):
         if request is None:

wiki/models/page.py

@@ -176,6 +176,8 @@ class Page(dm.Model, rm.RestModel, rm.MetaDataModel):
 
     @classmethod
     def on_rest_list_ready(cls, request, qset=None):
+        # need to first sort our list
+        qset = cls.restListSort(request, qset)
         out = []
         for page in qset:
             if page.on_rest_can_get(request):