Merge remote-tracking branch 'gitorious/master'

5 files changed, 137 insertions, 0 deletions

diff --git a/mediagoblin/edit/__init__.py b/mediagoblin/edit/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/mediagoblin/edit/__init__.py
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
new file mode 100644
index 00000000..ea25141d
--- /dev/null
+++ b/mediagoblin/edit/forms.py
@@ -0,0 +1,27 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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/>.
+
+
+import wtforms
+
+
+class EditForm(wtforms.Form):
+    title = wtforms.TextField(
+        'Title',
+        [wtforms.validators.Length(min=0, max=500)])
+    slug = wtforms.TextField(
+        'Slug')
+    description = wtforms.TextAreaField('Description of this work')
diff --git a/mediagoblin/edit/lib.py b/mediagoblin/edit/lib.py
new file mode 100644
index 00000000..2a810349
--- /dev/null
+++ b/mediagoblin/edit/lib.py
@@ -0,0 +1,24 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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/>.
+
+
+def may_edit_media(request, media):
+    """Check, if the request's user may edit the media details"""
+    if media['uploader'] == request.user['_id']:
+        return True
+    if request.user['is_admin']:
+        return True
+    return False
diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
new file mode 100644
index 00000000..54f2661a
--- /dev/null
+++ b/mediagoblin/edit/routing.py
@@ -0,0 +1,22 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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 routes.route import Route
+
+edit_routes = [
+    Route('mediagoblin.edit.edit_media', "/{user}/{media}/",
+        controller="mediagoblin.edit.views:edit_media"),
+]
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
new file mode 100644
index 00000000..5cfb2297
--- /dev/null
+++ b/mediagoblin/edit/views.py
@@ -0,0 +1,64 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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 Response, exc
+
+from mediagoblin.edit import forms
+from mediagoblin.edit.lib import may_edit_media
+from mediagoblin.decorators import require_active_login, get_user_media_entry
+
+
+@get_user_media_entry
+@require_active_login
+def edit_media(request, media):
+    if not may_edit_media(request, media):
+        return exc.HTTPForbidden()
+
+    form = forms.EditForm(request.POST,
+        title = media['title'],
+        slug = media['slug'],
+        description = media['description'])
+
+    if request.method == 'POST' and form.validate():
+        # Make sure there isn't already a MediaEntry with such a slug
+        # and userid.
+        existing_user_slug_entries = request.db.MediaEntry.find(
+            {'slug': request.POST['slug'],
+             'uploader': media['uploader'],
+             '_id': {'$ne': media['_id']}}).count()
+        
+        if existing_user_slug_entries:
+            form.slug.errors.append(
+                u'An entry with that slug already exists for this user.')
+        else:
+            media['title'] = request.POST['title']
+            media['description'] = request.POST['description']
+            media['slug'] = request.POST['slug']
+
+            # redirect
+            return exc.HTTPFound(
+                location=request.urlgen("mediagoblin.user_pages.media_home",
+                    user=media.uploader()['username'], media=media['_id']))
+
+    # render
+    template = request.template_env.get_template(
+        'mediagoblin/edit/edit.html')
+    return Response(
+        template.render(
+            {'request': request,
+             'media': media,
+             'form': form}))