from mediagoblin.db.models import (MediaEntry, MediaTag, Collection, Comment,
CollectionItem, LocalUser, Activity, \
GenericModelReference)
+from mediagoblin.plugins.api.tools import get_media_file_paths
from mediagoblin.tools.response import render_to_response, render_404, \
redirect, redirect_obj
from mediagoblin.tools.text import cleaned_markdown_conversion
link.save()
messages.add_message(
- request, messages.SUCCESS,
+ request,
+ messages.SUCCESS,
_('Your comment has been posted!'))
- trigger_notification(comment, media, request)
+ trigger_notification(link, media, request)
return redirect_obj(request, media)
if request.method != 'POST' or not form.validate():
# No POST submission, or invalid form
if not form.validate():
- messages.add_message(request, messages.ERROR,
+ messages.add_message(
+ request,
+ messages.ERROR,
_('Please check your entries and try again.'))
return render_to_response(
type=Collection.USER_DEFINED_TYPE
).first()
if existing_collection:
- messages.add_message(request, messages.ERROR,
- _('You already have a collection called "%s"!')
- % existing_collection.title)
+ messages.add_message(
+ request,
+ messages.ERROR,
+ _('You already have a collection called "%s"!') %
+ existing_collection.title)
return redirect(request, "mediagoblin.user_pages.media_home",
user=media.get_actor.username,
media=media.slug_or_id)
if not collection:
messages.add_message(
- request, messages.ERROR,
+ request,
+ messages.ERROR,
_('You have to select or add a collection'))
return redirect(request, "mediagoblin.user_pages.media_collect",
user=media.get_actor.username,
# Check whether media already exists in collection
elif item is not None:
- messages.add_message(request, messages.ERROR,
- _('"%s" already in collection "%s"')
- % (media.title, collection.title))
+ messages.add_message(
+ request,
+ messages.ERROR,
+ _('"%s" already in collection "%s"') %
+ (media.title, collection.title))
else: # Add item to collection
add_media_to_collection(collection, media, form.note.data)
create_activity("add", media, request.user, target=collection)
- messages.add_message(request, messages.SUCCESS,
- _('"%s" added to collection "%s"')
- % (media.title, collection.title))
+ messages.add_message(
+ request,
+ messages.SUCCESS,
+ _('"%s" added to collection "%s"') %
+ (media.title, collection.title))
return redirect_obj(request, media)
# Delete MediaEntry and all related files, comments etc.
media.delete()
messages.add_message(
- request, messages.SUCCESS, _('You deleted the media.'))
+ request,
+ messages.SUCCESS,
+ _('You deleted the media.'))
location = media.url_to_next(request.urlgen)
if not location:
return redirect(request, location=location)
else:
messages.add_message(
- request, messages.ERROR,
- _("The media was not deleted because you didn't check that you were sure."))
+ request,
+ messages.ERROR,
+ _("The media was not deleted because you didn't check "
+ "that you were sure."))
return redirect_obj(request, media)
if ((request.user.has_privilege(u'admin') and
request.user.id != media.actor)):
messages.add_message(
- request, messages.WARNING,
+ request,
+ messages.WARNING,
_("You are about to delete another user's media. "
"Proceed with caution."))
collection.save()
messages.add_message(
- request, messages.SUCCESS, _('You deleted the item from the collection.'))
+ request,
+ messages.SUCCESS,
+ _('You deleted the item from the collection.'))
else:
messages.add_message(
- request, messages.ERROR,
- _("The item was not removed because you didn't check that you were sure."))
+ request,
+ messages.ERROR,
+ _("The item was not removed because you didn't check "
+ "that you were sure."))
return redirect_obj(request, collection)
if ((request.user.has_privilege(u'admin') and
request.user.id != collection_item.in_collection.actor)):
messages.add_message(
- request, messages.WARNING,
+ request,
+ messages.WARNING,
_("You are about to delete an item from another user's collection. "
"Proceed with caution."))
item.delete()
collection.delete()
- messages.add_message(request, messages.SUCCESS,
- _('You deleted the collection "%s"') % collection_title)
+ messages.add_message(
+ request,
+ messages.SUCCESS,
+ _('You deleted the collection "%s"') %
+ collection_title)
return redirect(request, "mediagoblin.user_pages.user_home",
user=username)
else:
messages.add_message(
- request, messages.ERROR,
- _("The collection was not deleted because you didn't check that you were sure."))
+ request,
+ messages.ERROR,
+ _("The collection was not deleted because you didn't "
+ "check that you were sure."))
return redirect_obj(request, collection)
username = request.matchdict['user']).first()
if not user or not user.has_privilege(u'active'):
return render_404(request)
+ feed_title = "MediaGoblin Feed for user '%s'" % request.matchdict['user']
+ link = request.urlgen('mediagoblin.user_pages.user_home',
+ qualified=True, user=request.matchdict['user'])
+ cursor = MediaEntry.query.filter_by(actor=user.id, state=u'processed')
+ cursor = cursor.order_by(MediaEntry.created.desc())
+ cursor = cursor.limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS)
- cursor = MediaEntry.query.filter_by(
- actor = user.id,
- state = u'processed').\
- order_by(MediaEntry.created.desc()).\
- limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS)
"""
ATOM feed id is a tag URI (see http://en.wikipedia.org/wiki/Tag_URI)
"""
atomlinks = [{
- 'href': request.urlgen(
- 'mediagoblin.user_pages.user_home',
- qualified=True, user=request.matchdict['user']),
- 'rel': 'alternate',
- 'type': 'text/html'
- }]
+ 'href': link,
+ 'rel': 'alternate',
+ 'type': 'text/html'}]
if mg_globals.app_config["push_urls"]:
for push_url in mg_globals.app_config["push_urls"]:
'href': push_url})
feed = AtomFeed(
- "MediaGoblin: Feed for user '%s'" % request.matchdict['user'],
- feed_url=request.url,
- id='tag:{host},{year}:gallery.user-{user}'.format(
- host=request.host,
- year=datetime.datetime.today().strftime('%Y'),
- user=request.matchdict['user']),
- links=atomlinks)
+ feed_title,
+ feed_url=request.url,
+ id='tag:{host},{year}:gallery.user-{user}'.format(
+ host=request.host,
+ year=datetime.datetime.today().strftime('%Y'),
+ user=request.matchdict['user']),
+ links=atomlinks)
for entry in cursor:
+ # Include a thumbnail image in content.
+ file_urls = get_media_file_paths(entry.media_files, request.urlgen)
+ if 'thumb' in file_urls:
+ content = '<img src="{thumb}" alt='' /> {desc}'.format(
+ thumb=file_urls['thumb'], desc=entry.description_html)
+ else:
+ content = entry.description_html
+
feed.add(
entry.get('title'),
- entry.description_html,
+ content,
id=entry.url_for_self(request.urlgen, qualified=True),
content_type='html',
author={
'name': entry.get_actor.username,
'uri': request.urlgen(
'mediagoblin.user_pages.user_home',
- qualified=True, user=entry.get_actor.username)},
+ qualified=True,
+ user=entry.get_actor.username)},
updated=entry.get('created'),
links=[{
'href': entry.url_for_self(
id=obj.url_for_self(request.urlgen, qualified=True),
content_type='html',
author={
- 'name': obj.get_actor().username,
+ 'name': obj.get_actor.username,
'uri': request.urlgen(
'mediagoblin.user_pages.user_home',
- qualified=True, user=obj.get_actor().username)},
+ qualified=True, user=obj.get_actor.username)},
updated=item.get('added'),
links=[{
'href': obj.url_for_self(
return feed.get_response()
+@active_user_from_url
+@uses_pagination
@require_active_login
-def processing_panel(request):
+def processing_panel(request, page, url_user):
"""
Show to the user what media is still in conversion/processing...
and what failed, and why!
return redirect(
request, 'mediagoblin.user_pages.user_home',
user=user.username)
-
# Get media entries which are in-processing
- processing_entries = MediaEntry.query.\
- filter_by(actor = user.id,
- state = u'processing').\
- order_by(MediaEntry.created.desc())
+ entries = (MediaEntry.query.filter_by(actor=user.id)
+ .order_by(MediaEntry.created.desc()))
- # Get media entries which have failed to process
- failed_entries = MediaEntry.query.\
- filter_by(actor = user.id,
- state = u'failed').\
- order_by(MediaEntry.created.desc())
+ try:
+ state = request.matchdict['state']
+ # no exception was thrown, filter entries by state
+ entries = entries.filter_by(state=state)
+ except KeyError:
+ # show all entries
+ pass
- processed_entries = MediaEntry.query.\
- filter_by(actor = user.id,
- state = u'processed').\
- order_by(MediaEntry.created.desc()).\
- limit(10)
+ pagination = Pagination(page, entries)
+ pagination.per_page = 30
+ entries_on_a_page = pagination()
# Render to response
return render_to_response(
request,
'mediagoblin/user_pages/processing_panel.html',
{'user': user,
- 'processing_entries': processing_entries,
- 'failed_entries': failed_entries,
- 'processed_entries': processed_entries})
+ 'entries': entries_on_a_page,
+ 'pagination': pagination})
@allow_reporting
@get_user_media_entry
form = user_forms.CommentReportForm(request.form)
context = {'media': comment.target(),
- 'comment':comment.comment(),
+ 'comment':comment,
'form':form}
else:
form = user_forms.MediaReportForm(request.form)
projects / mediagoblin.git / blobdiff