Merge branch 'master' into jwandborg-f482_media_attachments

Conflicts:
	mediagoblin/config_spec.ini
	mediagoblin/edit/forms.py
	mediagoblin/edit/views.py
	mediagoblin/submit/views.py
	mediagoblin/templates/mediagoblin/user_pages/media.html

mediagoblin/user_pages/forms.py

@@ -16,7 +16,10 @@
 
 import wtforms
 
+from mediagoblin.util import fake_ugettext_passthrough as _
+
+
 class MediaCommentForm(wtforms.Form):
-	comment_content = wtforms.TextAreaField(
-		'Comment',
-		[wtforms.validators.Required()])
+    comment_content = wtforms.TextAreaField(
+        _('Comment'),
+        [wtforms.validators.Required()])

mediagoblin/user_pages/routing.py

@@ -36,4 +36,8 @@ user_routes = [
         controller="mediagoblin.user_pages.views:atom_feed"),
     Route('mediagoblin.user_pages.media_post_comment',
           '/{user}/m/{media}/comment/add/',
-          controller="mediagoblin.user_pages.views:media_post_comment")]
+          controller="mediagoblin.user_pages.views:media_post_comment"),
+    Route('mediagoblin.user_pages.processing_panel',
+          '/{user}/panel/',
+          controller="mediagoblin.user_pages.views:processing_panel"),
+    ]

mediagoblin/user_pages/views.py

@@ -1,4 +1,4 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
+# MediaGoblin -- federated, autonomous media hosting
 # Copyright (C) 2011 Free Software Foundation, Inc
 #
 # This program is free software: you can redistribute it and/or modify
@@ -19,7 +19,8 @@ from webob import exc
 from mediagoblin import messages, mg_globals
 from mediagoblin.db.util import DESCENDING, ObjectId
 from mediagoblin.util import (
-    Pagination, render_to_response, redirect, cleaned_markdown_conversion)
+    Pagination, render_to_response, redirect, cleaned_markdown_conversion,
+    render_404)
 from mediagoblin.user_pages import forms as user_forms
 
 from mediagoblin.decorators import (uses_pagination, get_user_media_entry,
@@ -34,7 +35,7 @@ def user_home(request, page):
     user = request.db.User.find_one({
             'username': request.matchdict['user']})
     if not user:
-        return exc.HTTPNotFound()
+        return render_404(request)
     elif user['status'] != u'active':
         return render_to_response(
             request,
@@ -50,7 +51,7 @@ def user_home(request, page):
 
     #if no data is available, return NotFound
     if media_entries == None:
-        return exc.HTTPNotFound()
+        return render_404(request)
     
     user_gallery_url = request.urlgen(
         'mediagoblin.user_pages.user_gallery',
@@ -71,7 +72,7 @@ def user_gallery(request, page):
             'username': request.matchdict['user'],
             'status': 'active'})
     if not user:
-        return exc.HTTPNotFound()
+        return render_404(request)
 
     cursor = request.db.MediaEntry.find(
         {'uploader': user['_id'],
@@ -82,7 +83,7 @@ def user_gallery(request, page):
 
     #if no data is available, return NotFound
     if media_entries == None:
-        return exc.HTTPNotFound()
+        return render_404(request)
     
     return render_to_response(
         request,
@@ -155,7 +156,7 @@ def atom_feed(request):
                'username': request.matchdict['user'],
                'status': 'active'})
     if not user:
-	return exc.HTTPNotFound()
+        return render_404(request)
 
     cursor = request.db.MediaEntry.find({
                  'uploader': user['_id'],
@@ -176,3 +177,53 @@ def atom_feed(request):
             url=entry.url_for_self(request.urlgen))
 
     return feed.get_response()
+
+
+@require_active_login
+def processing_panel(request):
+    """
+    Show to the user what media is still in conversion/processing...
+    and what failed, and why!
+    """
+    # Get the user
+    user = request.db.User.find_one(
+        {'username': request.matchdict['user'],
+         'status': 'active'})
+
+    # Make sure the user exists and is active
+    if not user:
+        return render_404(request)
+    elif user['status'] != u'active':
+        return render_to_response(
+            request,
+            'mediagoblin/user_pages/user.html',
+            {'user': user})
+
+    # XXX: Should this be a decorator?
+    #
+    # Make sure we have permission to access this user's panel.  Only
+    # admins and this user herself should be able to do so.
+    if not (user[u'_id'] == request.user[u'_id']
+            or request.user.is_admin):
+        # No?  Let's simply redirect to this user's homepage then.
+        return redirect(
+            request, 'mediagoblin.user_pages.user_home',
+            user=request.matchdict['user'])
+
+    # Get media entries which are in-processing
+    processing_entries = request.db.MediaEntry.find(
+        {'uploader': user['_id'],
+         'state': 'processing'}).sort('created', DESCENDING)
+
+    # Get media entries which have failed to process
+    failed_entries = request.db.MediaEntry.find(
+        {'uploader': user['_id'],
+         'state': 'failed'}).sort('created', DESCENDING)
+
+    # Render to response
+    return render_to_response(
+        request,
+        'mediagoblin/user_pages/processing_panel.html',
+        {'user': user,
+         'processing_entries': processing_entries,
+         'failed_entries': failed_entries})