django-transcribe 0.8.0__py3-none-any.whl → 0.8.2__py3-none-any.whl

{django_transcribe-0.8.0.dist-info → django_transcribe-0.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-transcribe
-Version: 0.8.0
+Version: 0.8.2
 Summary: crowd source transcription
 Home-page: https://gitlab.com/byuhbll/lib/python/django-transcribe
 Author: BYU Library Software Engineering

{django_transcribe-0.8.0.dist-info → django_transcribe-0.8.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-transcribe/__init__.py,sha256=ImF9MiNHXiXNij30OnrUoNFX56QIW5ho0CDmr3s5FVo,78
+transcribe/__init__.py,sha256=1isuMN80nbm3Ivpv9Wx7GA5zko2BvLw-COJoQiQ0CEU,78
 transcribe/admin.py,sha256=qPLL0XNzK0abIRBVRtjQq8SaEK2gzb_yyshafbxk9B4,6766
 transcribe/api.py,sha256=2m_y44ilQh87CWksHHqiE4A14javR8omlXEXm65lmC4,74
 transcribe/apps.py,sha256=XUdPQkCjpqWAKDCIaE6Mh8Q4xN5upKv95MG1u2_5pig,246
@@ -6,7 +6,7 @@ transcribe/diff_match_patch.py,sha256=HZC5DNab5OVwbB4Zc7G17l1OHbBlH2g9-xOtT1zkQ1
 transcribe/filters.py,sha256=_ANh6XGDXgmD_wxQo5IPReQsv3_MDqThOwB06LKfbac,1264
 transcribe/forms.py,sha256=6j-MtheDtDeBo9B_hlKhkWkWkKVJsLrJIlSsZAlB7ic,5612
 transcribe/middleware.py,sha256=3SvvNmJMlVohD_4Liv1yT3hc_nudpvt2giAE7Wt9rx4,485
-transcribe/models.py,sha256=mcAs_mwX2ROgB5OjlY2ceu_yL34nr4K5wiRrPz3XCf8,38870
+transcribe/models.py,sha256=fvSdl-9N04T-tVSMWVCWF6xXKpf7tWHdg__G6xvjxUA,38592
 transcribe/settings.py,sha256=TNRFJstZF9X3l5qZSzv3xcrEuPMmOQbB-59mqADn9Dk,569
 transcribe/signals.py,sha256=pvRSWobg__Jw5ZvlFBZZAw3rDk1dvVyiq8Ka2lBGeSY,1105
 transcribe/urls.py,sha256=xgTkOdeC1cWmQAMzAp-VRwvmwyEAfEabncGgHyZiAL0,2040
@@ -143,9 +143,9 @@ transcribe/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 transcribe/views/mixins.py,sha256=QmFDhWb5VCEaGatLdbsTK72jiBG2OKrlncnz79FUmto,2727
 transcribe/views/reports.py,sha256=7YD5E6CPsIfWP8hG8IFTek29cM2T29NHuowAdlTAyBs,13408
 transcribe/views/web.py,sha256=WoVs-iwYc2hesuBxCmwfo-wza15C1fiMRY6S0TAdxQs,15213
-django_transcribe-0.8.0.dist-info/AUTHORS,sha256=rNmFConshTlNpyhcu4CKZSeQQMwuyVYXbeqXgRko-Yc,640
-django_transcribe-0.8.0.dist-info/LICENSE,sha256=I9xp13yeayqZikrv7rQrzsDWviTwy1R0phFlKtM1meg,1472
-django_transcribe-0.8.0.dist-info/METADATA,sha256=aOVYGiqY0N9n0R5JfnLRelfe91r8odmqIVHdiM5Dc80,1021
-django_transcribe-0.8.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-django_transcribe-0.8.0.dist-info/top_level.txt,sha256=NljSay7zO6czcjqjVmivw6VW58aXlYHVZQvnwmpy08g,11
-django_transcribe-0.8.0.dist-info/RECORD,,
+django_transcribe-0.8.2.dist-info/AUTHORS,sha256=rNmFConshTlNpyhcu4CKZSeQQMwuyVYXbeqXgRko-Yc,640
+django_transcribe-0.8.2.dist-info/LICENSE,sha256=I9xp13yeayqZikrv7rQrzsDWviTwy1R0phFlKtM1meg,1472
+django_transcribe-0.8.2.dist-info/METADATA,sha256=OBbssrIcSQeK78BvCgxKLLe06PQPlCLpMUK2sjjxZVo,1021
+django_transcribe-0.8.2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+django_transcribe-0.8.2.dist-info/top_level.txt,sha256=NljSay7zO6czcjqjVmivw6VW58aXlYHVZQvnwmpy08g,11
+django_transcribe-0.8.2.dist-info/RECORD,,

{django_transcribe-0.8.0.dist-info → django_transcribe-0.8.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

transcribe/__init__.py

@@ -1,2 +1,2 @@
 default_app_config = 'transcribe.apps.transcribeConfig'
-__version__ = '0.8.0'
+__version__ = '0.8.2'

transcribe/models.py

@@ -557,28 +557,20 @@ class Project(TimeStampedModel):
 
         # in progress tasks that are recent
         expired_dt = timezone.now() - timedelta(days=settings.TASK_EXPIRE_DAYS)
-        task_ids_already_being_reviewed = self.tasks.filter(
+        task_ids_being_reviewed_and_recent = self.tasks.filter(
             usertasks__status='in progress',
             usertasks__task_type='review',
             usertasks__modified__gte=expired_dt,
         ).values_list('id', flat=True)
 
-        # first priority is to assign a task that is not already
-        # in the process of being reviewed
+        # filter for tasks that are ready for review, not already skipped,
+        # and that haven't recently entered the review process
         task = (
             self.tasks.filter(id__in=task_ids_ready_for_review)
             .exclude(id__in=task_ids_already_skipped)
-            .exclude(id__in=task_ids_already_being_reviewed)
+            .exclude(id__in=task_ids_being_reviewed_and_recent)
             .first()
         )
-        if not task:
-            # if there was no task available in our first priority
-            # we will assign a task that is in the process of being reviewed
-            task = (
-                self.tasks.filter(id__in=task_ids_ready_for_review)
-                .exclude(id__in=task_ids_already_skipped)
-                .first()
-            )
         return task
 
     @cached_property
@@ -594,7 +586,9 @@ class Project(TimeStampedModel):
 
     def get_image_urls(self, task):
         # get a few tasks before and after task
-        tasks = Task.objects.filter(project=self, pk__gte=(task.pk - 5))[:10]
+        tasks = Task.objects.filter(
+            project=self, pk__gte=(task.pk - 5)
+        ).order_by('pk')[:10]
         urls = []
         for task in tasks:
             urls.append(task.file.url)