From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 21 Aug 2013 17:39:31 +0000 (-0500)
Subject: Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f6497ce572c5dedb553a474023478625c5062a93;p=mediagoblin.git

Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'

Conflicts:
	mediagoblin/processing/task.py
	mediagoblin/submit/lib.py
---

f6497ce572c5dedb553a474023478625c5062a93
diff --cc mediagoblin/processing/task.py
index 05cac844,df44dd7a..7f683485
--- a/mediagoblin/processing/task.py
+++ b/mediagoblin/processing/task.py
@@@ -18,14 -18,12 +18,13 @@@ import loggin
  import urllib
  import urllib2
  
 -from celery import registry, task
 +import celery
 +from celery.registry import tasks
  
  from mediagoblin import mg_globals as mgg
- from mediagoblin.db.models import MediaEntry
- from mediagoblin.processing import (mark_entry_failed, BaseProcessingFail,
-                                     ProcessingState)
+ from . import mark_entry_failed, BaseProcessingFail
  from mediagoblin.tools.processing import json_processing_callback
+ from mediagoblin.processing import get_entry_and_processing_manager
  
  _log = logging.getLogger(__name__)
  logging.basicConfig()
diff --cc mediagoblin/submit/lib.py
index 33687a72,1a45e447..1bbf2cb8
--- a/mediagoblin/submit/lib.py
+++ b/mediagoblin/submit/lib.py
@@@ -83,10 -84,13 +84,13 @@@ def run_process_media(entry, feed_url=N
      :param feed_url: A string indicating the feed_url that the PuSH servers
          should be notified of. This will be sth like: `request.urlgen(
              'mediagoblin.user_pages.atom_feed',qualified=True,
-             user=request.user.username)`"""
+             user=request.user.username)`
+     :param reprocess_action: What particular action should be run.
+     :param reprocess_info: A dict containing all of the necessary reprocessing
+         info for the given media_type"""
      try:
 -        process_media.apply_async(
 +        ProcessMedia().apply_async(
-             [entry.id, feed_url], {},
+             [entry.id, feed_url, reprocess_action, reprocess_info], {},
              task_id=entry.queued_task_id)
      except BaseException as exc:
          # The purpose of this section is because when running in "lazy"