aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/user_pages/views.py
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/user_pages/views.py')
-rw-r--r--mediagoblin/user_pages/views.py276
1 files changed, 128 insertions, 148 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index cbf3f15f..28ef90d6 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -14,13 +14,13 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from webob import exc
import logging
import datetime
from mediagoblin import messages, mg_globals
from mediagoblin.db.util import DESCENDING, ObjectId
-from mediagoblin.db.sql.models import MediaEntry, Collection, CollectionItem
+from mediagoblin.db.sql.models import (MediaEntry, Collection, CollectionItem,
+ User)
from mediagoblin.tools.response import render_to_response, render_404, redirect
from mediagoblin.tools.translate import pass_to_ugettext as _
from mediagoblin.tools.pagination import Pagination
@@ -42,8 +42,10 @@ _log.setLevel(logging.DEBUG)
@uses_pagination
def user_home(request, page):
"""'Homepage' of a User()"""
- user = request.db.User.find_one({
- 'username': request.matchdict['user']})
+ # TODO: decide if we only want homepages for active users, we can
+ # then use the @get_active_user decorator and also simplify the
+ # template html.
+ user = User.query.filter_by(username=request.matchdict['user']).first()
if not user:
return render_404(request)
elif user.status != u'active':
@@ -52,9 +54,9 @@ def user_home(request, page):
'mediagoblin/user_pages/user.html',
{'user': user})
- cursor = request.db.MediaEntry.find(
- {'uploader': user._id,
- 'state': u'processed'}).sort('created', DESCENDING)
+ cursor = MediaEntry.query.\
+ filter_by(uploader = user.id,
+ state = u'processed').sort('created', DESCENDING)
pagination = Pagination(page, cursor)
media_entries = pagination()
@@ -83,6 +85,7 @@ def user_gallery(request, page, url_user=None):
cursor = MediaEntry.query.filter_by(
uploader=url_user.id,
state=u'processed').order_by(MediaEntry.created.desc())
+
# Paginate gallery
pagination = Pagination(page, cursor)
media_entries = pagination()
@@ -108,7 +111,7 @@ def media_home(request, media, page, **kwargs):
"""
'Homepage' of a MediaEntry()
"""
- if ObjectId(request.matchdict.get('comment')):
+ if request.matchdict.get('comment', None):
pagination = Pagination(
page, media.get_comments(
mg_globals.app_config['comments_ascending']),
@@ -167,106 +170,95 @@ def media_post_comment(request, media):
media_uploader.wants_comment_notification):
send_comment_email(media_uploader, comment, media, request)
- return exc.HTTPFound(
- location=media.url_for_self(request.urlgen))
+ return redirect(request, location=media.url_for_self(request.urlgen))
@get_user_media_entry
@require_active_login
def media_collect(request, media):
+ """Add media to collection submission"""
form = user_forms.MediaCollectForm(request.form)
- filt = (request.db.Collection.creator == request.user.id)
- form.collection.query = request.db.Collection.query.filter(
- filt).order_by(request.db.Collection.title)
-
- if request.method == 'POST':
- if form.validate():
-
- collection = None
- collection_item = request.db.CollectionItem()
-
- # If the user is adding a new collection, use that
- if request.form['collection_title']:
- collection = request.db.Collection()
- collection.id = ObjectId()
-
- collection.title = (
- unicode(request.form['collection_title']))
-
- collection.description = unicode(
- request.form.get('collection_description'))
- collection.creator = request.user._id
- collection.generate_slug()
-
- # Make sure this user isn't duplicating an existing collection
- existing_collection = request.db.Collection.find_one({
- 'creator': request.user._id,
- 'title': collection.title})
-
- if existing_collection:
- messages.add_message(
- request, messages.ERROR,
- _('You already have a collection called "%s"!'
- % collection.title))
-
- return redirect(request, "mediagoblin.user_pages.media_home",
- user=request.user.username,
- media=media.id)
-
- collection.save(validate=True)
-
- collection_item.collection = collection.id
- # Otherwise, use the collection selected from the drop-down
- else:
- collection = request.db.Collection.find_one({
- '_id': request.form.get('collection')})
- collection_item.collection = collection.id
-
- # Make sure the user actually selected a collection
- if not collection:
- messages.add_message(
- request, messages.ERROR,
- _('You have to select or add a collection'))
- # Check whether media already exists in collection
- elif request.db.CollectionItem.find_one({
- 'media_entry': media.id,
- 'collection': collection_item.collection}):
- messages.add_message(
- request, messages.ERROR,
- _('"%s" already in collection "%s"'
- % (media.title, collection.title)))
- else:
- collection_item.media_entry = media.id
- collection_item.author = request.user.id
- collection_item.note = unicode(request.form['note'])
- collection_item.save(validate=True)
-
- collection.items = collection.items + 1
- collection.save(validate=True)
-
- media.collected = media.collected + 1
- media.save()
-
- messages.add_message(
- request, messages.SUCCESS, _('"%s" added to collection "%s"'
- % (media.title, collection.title)))
+ # A user's own collections:
+ form.collection.query = Collection.query.filter_by(
+ creator = request.user.id).order_by(Collection.title)
+
+ if request.method != 'POST' or not form.validate():
+ # No POST submission, or invalid form
+ if not form.validate():
+ messages.add_message(request, messages.ERROR,
+ _('Please check your entries and try again.'))
+ return render_to_response(
+ request,
+ 'mediagoblin/user_pages/media_collect.html',
+ {'media': media,
+ 'form': form})
+
+ # If we are here, method=POST and the form is valid, submit things.
+ # If the user is adding a new collection, use that:
+ if request.form['collection_title']:
+ # Make sure this user isn't duplicating an existing collection
+ existing_collection = Collection.query.filter_by(
+ creator=request.user.id,
+ title=request.form['collection_title']).first()
+ if existing_collection:
+ messages.add_message(request, messages.ERROR,
+ _('You already have a collection called "%s"!'
+ % collection.title))
return redirect(request, "mediagoblin.user_pages.media_home",
- user=media.get_uploader.username,
+ user=request.user.username,
media=media.id)
- else:
- messages.add_message(
- request, messages.ERROR,
- _('Please check your entries and try again.'))
- return render_to_response(
- request,
- 'mediagoblin/user_pages/media_collect.html',
- {'media': media,
- 'form': form})
+ collection = Collection()
+ collection.title = request.form['collection_title']
+ collection.description = request.form.get('collection_description')
+ collection.creator = request.user.id
+ collection.generate_slug()
+ collection.save()
+ # Otherwise, use the collection selected from the drop-down
+ else:
+ collection = Collection.query.filter_by(
+ id=request.form.get('collection')).first()
+ # Make sure the user actually selected a collection
+ if not collection:
+ messages.add_message(
+ request, messages.ERROR,
+ _('You have to select or add a collection'))
+
+ # Check whether media already exists in collection
+ elif CollectionItem.query.filter_by(
+ media_entry=media.id,
+ collection=collection.id).first():
+ messages.add_message(request, messages.ERROR,
+ _('"%s" already in collection "%s"'
+ % (media.title, collection.title)))
+ else: # Add item to collection
+ collection_item = request.db.CollectionItem()
+ collection_item.collection = collection.id
+ collection_item.media_entry = media.id
+ collection_item.author = request.user.id
+ collection_item.note = request.form['note']
+ collection_item.save()
+
+ collection.items = collection.items + 1
+ collection.save()
+
+ media.collected = media.collected + 1
+ media.save()
+
+ messages.add_message(request, messages.SUCCESS,
+ _('"%s" added to collection "%s"'
+ % (media.title, collection.title)))
+
+ return redirect(request, "mediagoblin.user_pages.media_home",
+ user=media.get_uploader.username,
+ media=media.id)
+
+
+#TODO: Why does @user_may_delete_media not implicate @require_active_login?
@get_user_media_entry
@require_active_login
@user_may_delete_media
@@ -302,11 +294,11 @@ def media_confirm_delete(request, media):
messages.add_message(
request, messages.ERROR,
_("The media was not deleted because you didn't check that you were sure."))
- return exc.HTTPFound(
- location=media.url_for_self(request.urlgen))
+ return redirect(request,
+ location=media.url_for_self(request.urlgen))
if ((request.user.is_admin and
- request.user._id != media.uploader)):
+ request.user.id != media.uploader)):
messages.add_message(
request, messages.WARNING,
_("You are about to delete another user's media. "
@@ -378,7 +370,7 @@ def collection_item_confirm_remove(request, collection_item):
collection=collection.slug)
if ((request.user.is_admin and
- request.user._id != collection_item.in_collection.creator)):
+ request.user.id != collection_item.in_collection.creator)):
messages.add_message(
request, messages.WARNING,
_("You are about to delete an item from another user's collection. "
@@ -428,7 +420,7 @@ def collection_confirm_delete(request, collection):
collection=collection.slug)
if ((request.user.is_admin and
- request.user._id != collection.creator)):
+ request.user.id != collection.creator)):
messages.add_message(
request, messages.WARNING,
_("You are about to delete another user's collection. "
@@ -448,18 +440,17 @@ def atom_feed(request):
"""
generates the atom feed with the newest images
"""
-
- user = request.db.User.find_one({
- 'username': request.matchdict['user'],
- 'status': u'active'})
+ user = User.query.filter_by(
+ username = request.matchdict['user'],
+ status = u'active').first()
if not user:
return render_404(request)
- cursor = request.db.MediaEntry.find({
- 'uploader': user._id,
- 'state': u'processed'}) \
- .sort('created', DESCENDING) \
- .limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS)
+ cursor = MediaEntry.query.filter_by(
+ uploader = user.id,
+ state = u'processed').\
+ sort('created', DESCENDING).\
+ limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS)
"""
ATOM feed id is a tag URI (see http://en.wikipedia.org/wiki/Tag_URI)
@@ -512,20 +503,19 @@ def collection_atom_feed(request):
"""
generates the atom feed with the newest images from a collection
"""
-
- user = request.db.User.find_one({
- 'username': request.matchdict['user'],
- 'status': u'active'})
+ user = User.query.filter_by(
+ username = request.matchdict['user'],
+ status = u'active').first()
if not user:
return render_404(request)
- collection = request.db.Collection.find_one({
- 'creator': user.id,
- 'slug': request.matchdict['collection']})
+ collection = Collection.query.filter_by(
+ creator=user.id,
+ slug=request.matchdict['collection']).first()
- cursor = request.db.CollectionItem.find({
- 'collection': collection._id}) \
- .sort('added', DESCENDING) \
+ cursor = CollectionItem.query.filter_by(
+ collection=collection.id) \
+ .sort(CollectionItem.added.desc()) \
.limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS)
"""
@@ -583,44 +573,34 @@ 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': u'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?
+ user = User.query.filter_by(username=request.matchdict['user']).first()
+ # TODO: 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._id == request.user._id
- or request.user.is_admin):
- # No? Let's simply redirect to this user's homepage then.
+ if not (user.id == request.user.id or request.user.is_admin):
+ # No? Simply redirect to this user's homepage.
return redirect(
request, 'mediagoblin.user_pages.user_home',
- user=request.matchdict['user'])
+ user=user.username)
# Get media entries which are in-processing
- processing_entries = request.db.MediaEntry.find(
- {'uploader': user._id,
- 'state': u'processing'}).sort('created', DESCENDING)
+ processing_entries = MediaEntry.query.\
+ filter_by(uploader = user.id,
+ state = u'processing').\
+ order_by(MediaEntry.created.desc())
# Get media entries which have failed to process
- failed_entries = request.db.MediaEntry.find(
- {'uploader': user._id,
- 'state': u'failed'}).sort('created', DESCENDING)
-
- processed_entries = request.db.MediaEntry.find(
- {'uploader': user._id,
- 'state': u'processed'}).sort('created', DESCENDING).limit(10)
+ failed_entries = MediaEntry.query.\
+ filter_by(uploader = user.id,
+ state = u'failed').\
+ order_by(MediaEntry.created.desc())
+
+ processed_entries = MediaEntry.query.\
+ filter_by(uploader = user.id,
+ state = u'processed').\
+ order_by(MediaEntry.created.desc()).\
+ limit(10)
# Render to response
return render_to_response(