From cd158ef0d6adf9061db147682413b655c2e08fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20K=C3=B6gl?= Date: Sun, 13 Aug 2017 09:27:16 +0200 Subject: [PATCH] Rename MergeQueue to MergeTask --- mygpo/administration/tasks.py | 4 ++-- mygpo/administration/views.py | 6 ++--- mygpo/maintenance/admin.py | 12 +++++----- mygpo/maintenance/merge.py | 2 +- .../migrations/0004_rename_mergetask.py | 23 +++++++++++++++++++ mygpo/maintenance/models.py | 8 +++---- mygpo/maintenance/tasks.py | 6 ++--- 7 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 mygpo/maintenance/migrations/0004_rename_mergetask.py diff --git a/mygpo/administration/tasks.py b/mygpo/administration/tasks.py index 684244ef4..1607e5bc5 100644 --- a/mygpo/administration/tasks.py +++ b/mygpo/administration/tasks.py @@ -4,7 +4,7 @@ from mygpo.podcasts.models import Podcast from mygpo.celery import celery from mygpo.maintenance.merge import PodcastMerger -from mygpo.maintenance.models import MergeQueue +from mygpo.maintenance.models import MergeTask from celery.utils.log import get_task_logger logger = get_task_logger(__name__) @@ -28,6 +28,6 @@ def merge_podcasts(podcast_ids, num_groups, queue_id=''): if queue_id: qid = uuid.UUID(queue_id) logger.info('Deleting merge queue entry {}'.format(qid)) - MergeQueue.objects.filter(id=qid).delete() + MergeTask.objects.filter(id=qid).delete() return podcast diff --git a/mygpo/administration/views.py b/mygpo/administration/views.py index 27e93e257..5c769c85e 100644 --- a/mygpo/administration/views.py +++ b/mygpo/administration/views.py @@ -24,7 +24,7 @@ from mygpo.administration.auth import require_staff from mygpo.administration.group import PodcastGrouper from mygpo.maintenance.merge import PodcastMerger, IncorrectMergeException -from mygpo.maintenance.models import MergeQueue +from mygpo.maintenance.models import MergeTask from mygpo.administration.clients import UserAgentStats, ClientStats from mygpo.administration.tasks import merge_podcasts from mygpo.utils import get_git_head @@ -91,11 +91,11 @@ class MergeSelect(AdminView): template_name = 'admin/merge-select.html' def get(self, request): - queue_length = MergeQueue.objects.count() + queue_length = MergeTask.objects.count() use_queue = bool(request.GET.get('queue', False)) if use_queue: - queue = MergeQueue.objects.first() + queue = MergeTask.objects.first() urls = [podcast.url for podcast in queue.podcasts] queue_id = queue.id.hex diff --git a/mygpo/maintenance/admin.py b/mygpo/maintenance/admin.py index f75c1f701..7ace1acee 100644 --- a/mygpo/maintenance/admin.py +++ b/mygpo/maintenance/admin.py @@ -3,17 +3,17 @@ from . import models -class MergeQueueEntryInline(admin.TabularInline): - model = models.MergeQueueEntry +class MergeTaskEntryInline(admin.TabularInline): + model = models.MergeTaskEntry fields = ['podcast', ] readonly_fields = ['podcast', ] -@admin.register(models.MergeQueue) -class MergeQueueAdmin(admin.ModelAdmin): +@admin.register(models.MergeTask) +class MergeTaskAdmin(admin.ModelAdmin): - model = models.MergeQueue + model = models.MergeTask readonly_fields = ['id', ] list_display = ['id', 'num_entries',] @@ -21,7 +21,7 @@ class MergeQueueAdmin(admin.ModelAdmin): show_full_result_count = False inlines = [ - MergeQueueEntryInline, + MergeTaskEntryInline, ] def num_entries(self, obj): diff --git a/mygpo/maintenance/merge.py b/mygpo/maintenance/merge.py index dabef97fb..740f5ea2b 100644 --- a/mygpo/maintenance/merge.py +++ b/mygpo/maintenance/merge.py @@ -237,7 +237,7 @@ def reassigned(obj, new): elif isinstance(obj, HistoryEntry): pass - elif isinstance(obj, models.MergeQueueEntry): + elif isinstance(obj, models.MergeTaskEntry): obj.delete() return True diff --git a/mygpo/maintenance/migrations/0004_rename_mergetask.py b/mygpo/maintenance/migrations/0004_rename_mergetask.py new file mode 100644 index 000000000..a06238377 --- /dev/null +++ b/mygpo/maintenance/migrations/0004_rename_mergetask.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2017-08-13 07:23 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('maintenance', '0003_rel_name'), + ] + + operations = [ + migrations.RenameModel( + old_name='MergeQueue', + new_name='MergeTask', + ), + migrations.RenameModel( + old_name='MergeQueueEntry', + new_name='MergeTaskEntry', + ), + ] diff --git a/mygpo/maintenance/models.py b/mygpo/maintenance/models.py index 17c28b5a2..d49ff7a2a 100644 --- a/mygpo/maintenance/models.py +++ b/mygpo/maintenance/models.py @@ -4,7 +4,7 @@ from mygpo.podcasts.models import Podcast -class MergeQueue(UUIDModel): +class MergeTask(UUIDModel): """ A Group of podcasts that could be merged """ @property @@ -16,12 +16,12 @@ def podcasts(self): return podcasts -class MergeQueueEntry(UUIDModel): - """ An entry in a MergeQueue """ +class MergeTaskEntry(UUIDModel): + """ An entry in a MergeTask """ podcast = models.ForeignKey(Podcast, on_delete=models.CASCADE) - queue = models.ForeignKey(MergeQueue, + queue = models.ForeignKey(MergeTask, on_delete=models.CASCADE, related_name='entries', related_query_name='entry') diff --git a/mygpo/maintenance/tasks.py b/mygpo/maintenance/tasks.py index 7adfd5793..c30c3bb61 100644 --- a/mygpo/maintenance/tasks.py +++ b/mygpo/maintenance/tasks.py @@ -38,7 +38,7 @@ def populate_merge_queue(): mqs = _get_merge_queues(podcasts) if len(mqs) == 0: - mq = models.MergeQueue.objects.create(id=uuid.uuid4()) + mq = models.MergeTask.objects.create(id=uuid.uuid4()) if len(mqs) == 1: mq = mqs.pop() @@ -53,7 +53,7 @@ def populate_merge_queue(): continue # add to merge queue - mqe = models.MergeQueueEntry.objects.create( + mqe = models.MergeTaskEntry.objects.create( id=uuid.uuid4(), podcast=podcast, queue=mq, @@ -61,7 +61,7 @@ def populate_merge_queue(): def _get_merge_queues(podcasts): - mqs = models.MergeQueue.objects.filter( + mqs = models.MergeTask.objects.filter( mergequeueentry__podcast__in=podcasts, ).distinct() return set(mqs)