WIP

Author: stefankoegl

mygpo/administration/group.py

@@ -3,31 +3,24 @@
 
 from mygpo.podcasts.models import Podcast
 from mygpo.celery import celery
-from mygpo.maintenance.merge import PodcastMerger
 from mygpo.maintenance.models import MergeTask
 
 from celery.utils.log import get_task_logger
 logger = get_task_logger(__name__)
 
 
 @celery.task
-def merge_podcasts(podcast_ids, num_groups, queue_id=''):
+def merge_podcasts(task_id):
     """ Task to merge some podcasts"""
 
-    logger.info('merging podcast ids %s', podcast_ids)
+    task = MergeTask.objects.get(id=task_id)
 
-    podcasts = list(Podcast.objects.filter(id__in=podcast_ids))
+    logger.info('Processing merge task {}'.format(task_id))
 
-    logger.info('merging podcasts %s', podcasts)
-
-    pm = PodcastMerger(podcasts, num_groups)
-    podcast = pm.merge()
+    podcast = task.merge()
 
     logger.info('merging successful')
 
-    if queue_id:
-        qid = uuid.UUID(queue_id)
-        logger.info('Deleting merge queue entry {}'.format(qid))
-        MergeTask.objects.filter(id=qid).delete()
+    task.delete()
 
-    return podcast
+    return podcast.pk

mygpo/administration/tasks.py

@@ -24,7 +24,7 @@ <h1>{% trans "Merge Podcasts and Episodes" %}</h1>
   {% trans "Episodes that have the same number will be merged. Please verify all your changes by clicking on 'Renew Groups' before starting the Merge." %}
  </div>
 
- <form method="post" action="{% url "admin-merge-process" %}">
+ <form method="post" action="{% url "admin-merge-process" task.pk %}">
   {% csrf_token %}
 
   {% for podcast in podcasts %}
@@ -39,18 +39,21 @@ <h1>{% trans "Merge Podcasts and Episodes" %}</h1>
     {% endfor %}
    </tr>
 
-   {% for n, episodes in groups %}
+   {% for line in groups %}
     <tr>
-     <th>{{ n }}</th>
+     <th>{{ forloop.counter }}</th>
 
-     {% for podcast in podcasts %}
+     {% for episode in line %}
      <td>
-      {% for episode in episodes %}
-       {% if episode.podcast.get_id == podcast.get_id %}
-        <input type="text" name="episode_{{ episode.get_id }}" value="{{ n }}" size="2"/>
-        {% episode_link episode podcast %}<br />
-       {% endif %}
-      {% endfor %}
+      {% if episode %}
+        <input
+          type="text"
+          name="episode_{{ episode.get_id }}"
+          value="{{ forloop.parentloop.counter }}"
+          size="2"
+         />
+        {% episode_link episode episode.podcast %}<br />
+      {% endif %}
      </td>
     {% endfor %}
 
@@ -59,14 +62,12 @@ <h1>{% trans "Merge Podcasts and Episodes" %}</h1>
 
    <tr>
     <td></td>
-    <td><input type="submit" name="renew" value="Renew Groups" /></td>
-    <td><input type="submit" name="merge" value="Merge!" /></td>
+    <td><button formaction="{% url "admin-merge-update" task.pk %}">Renew Groups</button></td>
+    <td><button>Merge</button></td>
    </tr>
 
   </table>
 
-  <input type="hidden" name="queue_id" value="{{ queue_id }}" />
-
  </form>
 
 

mygpo/administration/templates/admin/merge-grouping.html

@@ -13,14 +13,14 @@ <h1>{% trans "Merge Podcasts and Episodes" %}</h1>
 {% endblock %}
 
 {% block content %}
- {% if queue_length > 0 %}
   <div>
-   Queue Length: {{ queue_length }} -
-   <a href="{% url "admin-merge" %}?queue=1">Take from Queue</a>
+   Queue Length: {{ queue_length }}
+   {% if task %}
+    - <a href="{% url "admin-merge-verify" task.pk %}">Take from Queue</a>
+   {% endif %}
   </div>
- {% endif %}
 
- <form method="post" action="{% url "admin-merge-verify" %}" role="form">
+ <form method="post" action="{% url "admin-merge-create" %}" role="form">
   {% csrf_token %}
    {% for url in urls %}
     <div class="form-group">

mygpo/administration/templates/admin/merge-select.html

@@ -34,16 +34,6 @@ <h1>
 
  {% if ready %}
 
-  <p>{% trans "The following actions were recorded:" %}
-   <ul>
-    {% for action, count in actions %}
-     <li>{{ action }}: {{ count }}</li>
-    {% empty %}
-     <li><em>{% trans "none" %}</em></li>
-    {% endfor %}
-   </ul>
-  </p>
-
   <p>{% trans "Go to podcast" %} {% podcast_group_link podcast %}</p>
  {% else %}
   <p>{% trans "The operation is still ongoing..." %}</p>

mygpo/administration/templates/admin/task-status.html

@@ -16,7 +16,7 @@
 from mygpo.podcasts.models import Podcast, Episode
 from mygpo.users.models import Client
 from mygpo.history.models import EpisodeHistoryEntry
-from mygpo.maintenance.merge import PodcastMerger
+from mygpo.maintenance.models import MergeTask
 from mygpo.subscriptions import subscribe, unsubscribe
 
 
@@ -67,11 +67,17 @@ def test_merge(self):
         e3_id = e3.pk
 
         # decide which episodes to merge
-        groups = [(0, [e1]), (1, [e2, e3]), (2, [e4])]
+        groups = [
+            [e1.id.hex],
+            [e2.id.hex, e3.id.hex],
+            [e4.id.hex],
+        ]
 
         # carry out the merge
-        pm = PodcastMerger([p1, p2], groups)
-        pm.merge()
+        task = MergeTask.objects.create_from_podcasts([p1, p2])
+        task.groups = groups
+        task.save()
+        task.merge()
 
         e1 = Episode.objects.get(pk=e1.pk)
         history1 = EpisodeHistoryEntry.objects.filter(episode=e1, user=user)

mygpo/administration/tests.py

@@ -16,11 +16,19 @@
         views.MergeSelect.as_view(),
         name='admin-merge'),
 
-    url(r'^merge/verify$',
+    url(r'^merge/create$',
+        views.CreateMergeTask.as_view(),
+        name='admin-merge-create'),
+
+    url(r'^merge/verify/(?P<task_id>[^/]+)$',
         views.MergeVerify.as_view(),
         name='admin-merge-verify'),
 
-    url(r'^merge/process$',
+    url(r'^merge/update/(?P<task_id>[^/]+)$',
+        views.UpdateMergeTask.as_view(),
+        name='admin-merge-update'),
+
+    url(r'^merge/process/(?P<task_id>[^/]+)$',
         views.MergeProcess.as_view(),
         name='admin-merge-process'),