Fixed post-collect redirect to always take user to image collected.
[mediagoblin.git] / mediagoblin / user_pages / views.py
index f721f012bce01e68c345a673f458618828341e21..416103361ec00b9ba3e01f6b0340013f596449a1 100644 (file)
@@ -1,5 +1,5 @@
-# MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # 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.tools.text import cleaned_markdown_conversion
 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
 from mediagoblin.tools.files import delete_media_files
 from mediagoblin.user_pages import forms as user_forms
+from mediagoblin.user_pages.lib import send_comment_email
 
 from mediagoblin.decorators import (uses_pagination, get_user_media_entry,
-    require_active_login, user_may_delete_media)
+    require_active_login, user_may_delete_media, user_may_alter_collection, 
+    get_user_collection, get_user_collection_item)
 
 from werkzeug.contrib.atom import AtomFeed
 
 from mediagoblin.media_types import get_media_manager
+from sqlalchemy.exc import IntegrityError
+
+_log = logging.getLogger(__name__)
+_log.setLevel(logging.DEBUG)
 
 
 @uses_pagination
@@ -48,7 +55,7 @@ def user_home(request, page):
 
     cursor = request.db.MediaEntry.find(
         {'uploader': user._id,
-         'state': 'processed'}).sort('created', DESCENDING)
+         'state': u'processed'}).sort('created', DESCENDING)
 
     pagination = Pagination(page, cursor)
     media_entries = pagination()
@@ -75,13 +82,13 @@ def user_gallery(request, page):
     """'Gallery' of a User()"""
     user = request.db.User.find_one({
             'username': request.matchdict['user'],
-            'status': 'active'})
+            'status': u'active'})
     if not user:
         return render_404(request)
 
     cursor = request.db.MediaEntry.find(
         {'uploader': user._id,
-         'state': 'processed'}).sort('created', DESCENDING)
+         'state': u'processed'}).sort('created', DESCENDING)
 
     pagination = Pagination(page, cursor)
     media_entries = pagination()
@@ -143,12 +150,11 @@ def media_post_comment(request, media):
     assert request.method == 'POST'
 
     comment = request.db.MediaComment()
-    comment['media_entry'] = media._id
-    comment['author'] = request.user._id
-    comment['content'] = unicode(request.POST['comment_content'])
-    comment['content_html'] = cleaned_markdown_conversion(comment['content'])
+    comment.media_entry = media.id
+    comment.author = request.user.id
+    comment.content = unicode(request.POST['comment_content'])
 
-    if not comment['content'].strip():
+    if not comment.content.strip():
         messages.add_message(
             request,
             messages.ERROR,
@@ -160,10 +166,101 @@ def media_post_comment(request, media):
             request, messages.SUCCESS,
             _('Your comment has been posted!'))
 
+        media_uploader = media.get_uploader
+        #don't send email if you comment on your own post
+        if (comment.author != media_uploader and
+            media_uploader.wants_comment_notification):
+            send_comment_email(media_uploader, comment, media, request)
+
     return exc.HTTPFound(
         location=media.url_for_self(request.urlgen))
 
 
+@get_user_media_entry
+@require_active_login
+def media_collect(request, media):
+
+    form = user_forms.MediaCollectForm(request.POST)
+    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.POST['collection_title']:
+                collection = request.db.Collection()
+                collection.id = ObjectId()
+
+                collection.title = (
+                    unicode(request.POST['collection_title'])
+                    or unicode(splitext(filename)[0]))
+
+                collection.description = unicode(request.POST.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.POST.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.POST['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)))
+
+            return redirect(request, "mediagoblin.user_pages.media_home",
+                            user=media.get_uploader.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})
+
+
 @get_user_media_entry
 @require_active_login
 @user_may_delete_media
@@ -175,8 +272,19 @@ def media_confirm_delete(request, media):
         if form.confirm.data is True:
             username = media.get_uploader.username
 
+            # Delete all the associated comments
+            for comment in media.get_comments():
+                comment.delete()
+
             # Delete all files on the public storage
-            delete_media_files(media)
+            try:
+                delete_media_files(media)
+            except OSError, error:
+                _log.error('No such files from the user "{1}"'
+                           ' to delete: {0}'.format(str(error), username))
+                messages.add_message(request, messages.ERROR,
+                                     _('Some of the files with this entry seem'
+                                       ' to be missing.  Deleting anyway.'))
 
             media.delete()
             messages.add_message(
@@ -205,6 +313,132 @@ def media_confirm_delete(request, media):
          'form': form})
 
 
+@uses_pagination
+def user_collection(request, page):
+    """A User-defined Collection"""
+    user = request.db.User.find_one({
+            'username': request.matchdict['user'],
+            'status': u'active'})
+    if not user:
+        return render_404(request)
+
+    collection = request.db.Collection.find_one(
+        {'slug': request.matchdict['collection'] })
+
+    cursor = request.db.CollectionItem.find(
+        {'collection': collection.id })
+
+    pagination = Pagination(page, cursor)
+    collection_items = pagination()
+
+    #if no data is available, return NotFound
+    if collection_items == None:
+        return render_404(request)
+
+    return render_to_response(
+        request,
+        'mediagoblin/user_pages/collection.html',
+        {'user': user,
+         'collection': collection,
+         'collection_items': collection_items,
+         'pagination': pagination})
+
+
+@get_user_collection_item
+@require_active_login
+@user_may_alter_collection
+def collection_item_confirm_remove(request, collection_item):
+
+    form = user_forms.ConfirmCollectionItemRemoveForm(request.POST)
+
+    if request.method == 'POST' and form.validate():
+        username = collection_item.in_collection.get_creator.username
+        collection = collection_item.in_collection
+
+        if form.confirm.data is True:
+            entry = collection_item.get_media_entry
+            entry.collected = entry.collected - 1
+            entry.save()
+
+            collection_item.delete()
+            collection.items = collection.items - 1;
+            collection.save()
+
+            messages.add_message(
+                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."))
+
+        return redirect(request, "mediagoblin.user_pages.user_collection",
+                        user=username,
+                        collection=collection.slug)
+
+    if ((request.user.is_admin and
+         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. "
+              "Proceed with caution."))
+
+    return render_to_response(
+        request,
+        'mediagoblin/user_pages/collection_item_confirm_remove.html',
+        {'collection_item': collection_item,
+         'form': form})
+
+
+@get_user_collection
+@require_active_login
+@user_may_alter_collection
+def collection_confirm_delete(request, collection):
+
+    form = user_forms.ConfirmDeleteForm(request.POST)
+
+    if request.method == 'POST' and form.validate():
+
+        username = collection.get_creator.username
+
+        if form.confirm.data is True:
+            collection_title = collection.title
+
+            # Delete all the associated collection items
+            for item in collection.get_collection_items():
+                entry = item.get_media_entry
+                entry.collected = entry.collected - 1
+                entry.save()
+                item.delete()
+
+            collection.delete()
+            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."))
+
+            return redirect(request, "mediagoblin.user_pages.user_collection",
+                            user=username,
+                            collection=collection.slug)
+
+    if ((request.user.is_admin and
+         request.user._id != collection.creator)):
+        messages.add_message(
+            request, messages.WARNING,
+            _("You are about to delete another user's collection. "
+              "Proceed with caution."))
+
+    return render_to_response(
+        request,
+        'mediagoblin/user_pages/collection_confirm_delete.html',
+        {'collection': collection,
+         'form': form})
+
+
 ATOM_DEFAULT_NR_OF_UPDATED_ITEMS = 15
 
 
@@ -215,27 +449,127 @@ def atom_feed(request):
 
     user = request.db.User.find_one({
                'username': request.matchdict['user'],
-               'status': 'active'})
+               'status': u'active'})
     if not user:
         return render_404(request)
 
     cursor = request.db.MediaEntry.find({
                  'uploader': user._id,
-                 'state': 'processed'}) \
+                 'state': u'processed'}) \
                  .sort('created', DESCENDING) \
                  .limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS)
 
-    feed = AtomFeed(request.matchdict['user'],
+    """
+    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'
+           }]
+
+    if mg_globals.app_config["push_urls"]:
+        for push_url in mg_globals.app_config["push_urls"]:
+            atomlinks.append({
+                'rel': 'hub',
+                'href': push_url})
+
+    feed = AtomFeed(
+               "MediaGoblin: Feed for user '%s'" % request.matchdict['user'],
                feed_url=request.url,
-               url=request.host_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:
         feed.add(entry.get('title'),
-            entry.get('description_html'),
+            entry.description_html,
+            id=entry.url_for_self(request.urlgen, qualified=True),
             content_type='html',
-            author=request.matchdict['user'],
+            author={
+                'name': entry.get_uploader.username,
+                'uri': request.urlgen(
+                    'mediagoblin.user_pages.user_home',
+                    qualified=True, user=entry.get_uploader.username)},
             updated=entry.get('created'),
-            url=entry.url_for_self(request.urlgen))
+            links=[{
+                'href': entry.url_for_self(
+                    request.urlgen,
+                    qualified=True),
+                'rel': 'alternate',
+                'type': 'text/html'}])
+
+    return feed.get_response()
+
+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'})
+    if not user:
+        return render_404(request)
+
+    collection = request.db.Collection.find_one({
+               'creator': user.id,
+               'slug': request.matchdict['collection']})
+
+    cursor = request.db.CollectionItem.find({
+                 'collection': collection._id}) \
+                 .sort('added', DESCENDING) \
+                 .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_collection',
+               qualified=True, user=request.matchdict['user'], collection=collection.slug),
+           'rel': 'alternate',
+           'type': 'text/html'
+           }]
+
+    if mg_globals.app_config["push_urls"]:
+        for push_url in mg_globals.app_config["push_urls"]:
+            atomlinks.append({
+                'rel': 'hub',
+                'href': push_url})
+
+    feed = AtomFeed(
+               "MediaGoblin: Feed for %s's collection %s" % (request.matchdict['user'], collection.title),
+               feed_url=request.url,
+               id='tag:{host},{year}:collection.user-{user}.title-{title}'.format(
+                   host=request.host,
+                   year=datetime.datetime.today().strftime('%Y'),
+                   user=request.matchdict['user'],
+                   title=collection.title),
+               links=atomlinks)
+
+    for item in cursor:
+        entry = item.get_media_entry
+        feed.add(entry.get('title'),
+            item.note_html,
+            id=entry.url_for_self(request.urlgen, qualified=True),
+            content_type='html',
+            author={
+                'name': entry.get_uploader.username,
+                'uri': request.urlgen(
+                    'mediagoblin.user_pages.user_home',
+                    qualified=True, user=entry.get_uploader.username)},
+            updated=item.get('added'),
+            links=[{
+                'href': entry.url_for_self(
+                    request.urlgen,
+                    qualified=True),
+                'rel': 'alternate',
+                'type': 'text/html'}])
 
     return feed.get_response()
 
@@ -249,7 +583,7 @@ def processing_panel(request):
     # Get the user
     user = request.db.User.find_one(
         {'username': request.matchdict['user'],
-         'status': 'active'})
+         'status': u'active'})
 
     # Make sure the user exists and is active
     if not user:
@@ -274,12 +608,16 @@ def processing_panel(request):
     # Get media entries which are in-processing
     processing_entries = request.db.MediaEntry.find(
         {'uploader': user._id,
-         'state': 'processing'}).sort('created', DESCENDING)
+         'state': u'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)
+         'state': u'failed'}).sort('created', DESCENDING)
+
+    processed_entries = request.db.MediaEntry.find(
+            {'uploader': user._id,
+                'state': u'processed'}).sort('created', DESCENDING).limit(10)
 
     # Render to response
     return render_to_response(
@@ -287,4 +625,5 @@ def processing_panel(request):
         'mediagoblin/user_pages/processing_panel.html',
         {'user': user,
          'processing_entries': processing_entries,
-         'failed_entries': failed_entries})
+         'failed_entries': failed_entries,
+         'processed_entries': processed_entries})