From fffc5dcfe031d30551a91e668b377d443d9267db Mon Sep 17 00:00:00 2001
From: tilly-Q <nattilypigeonfowl@gmail.com>
Date: Tue, 6 May 2014 12:39:23 -0400
Subject: Created the media metadata editor page

---
 mediagoblin/edit/views.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'mediagoblin/edit/views.py')

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 80590875..e20d0ecc 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -29,7 +29,8 @@ from mediagoblin.edit import forms
 from mediagoblin.edit.lib import may_edit_media
 from mediagoblin.decorators import (require_active_login, active_user_from_url,
                             get_media_entry_by_id, user_may_alter_collection,
-                            get_user_collection)
+                            get_user_collection, user_has_privilege,
+                            user_not_banned)
 from mediagoblin.tools.crypto import get_timed_signer_url
 from mediagoblin.tools.mail import email_debug_message
 from mediagoblin.tools.response import (render_to_response,
@@ -432,3 +433,13 @@ def change_email(request):
         'mediagoblin/edit/change_email.html',
         {'form': form,
          'user': user})
+
+@user_has_privilege(u'admin')
+@require_active_login
+@get_media_entry_by_id
+def edit_metadata(request, media):
+    form = forms.EditMetaDataForm()
+    return render_to_response(
+        request,
+        'mediagoblin/edit/metadata.html',
+        {'form':form})
-- 
cgit v1.2.3


From e80596c80eb06e6d199795e59dcc37b27d77fe55 Mon Sep 17 00:00:00 2001
From: tilly-Q <nattilypigeonfowl@gmail.com>
Date: Tue, 6 May 2014 17:00:25 -0400
Subject: Created a UI for editting a media's metadata. Had to add a new macro
 to wtforms.html in the process.

---
 mediagoblin/edit/views.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'mediagoblin/edit/views.py')

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index e20d0ecc..e3dd82ab 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -439,7 +439,22 @@ def change_email(request):
 @get_media_entry_by_id
 def edit_metadata(request, media):
     form = forms.EditMetaDataForm()
+    if media.media_metadata:
+        for row in media.media_metadata.iteritems():
+            if row[0] == "@context": continue
+            identifier = row[0]
+            # TODO Will change when we revert the metadata branch
+            value = row[1]['@value']
+            form.media_metadata.append_entry({
+                'identifier':identifier,
+                'value':value})
+        for row in media.media_metadata['@context'].iteritems():
+            identifier, value = row[0:2]
+            form.context.append_entry({
+                'identifier':identifier,
+                'value':value})
     return render_to_response(
         request,
         'mediagoblin/edit/metadata.html',
-        {'form':form})
+        {'form':form,
+         'media':media})
-- 
cgit v1.2.3


From 9919fb08a4d56f5976a6fef0fc70b2ee6c751759 Mon Sep 17 00:00:00 2001
From: tilly-Q <nattilypigeonfowl@gmail.com>
Date: Tue, 6 May 2014 17:19:30 -0400
Subject: Made it so the metadata editting page is only one step away from
 functioning correctly.

---
 mediagoblin/edit/views.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'mediagoblin/edit/views.py')

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index e3dd82ab..496df6b9 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -17,6 +17,7 @@
 from datetime import datetime
 
 from itsdangerous import BadSignature
+from pyld import jsonld
 from werkzeug.exceptions import Forbidden
 from werkzeug.utils import secure_filename
 
@@ -438,7 +439,20 @@ def change_email(request):
 @require_active_login
 @get_media_entry_by_id
 def edit_metadata(request, media):
-    form = forms.EditMetaDataForm()
+    form = forms.EditMetaDataForm(request.form)
+    if request.method == "POST" and form.validate():
+        context = dict([(row['identifier'],row['value'])
+                            for row in form.context.data])
+        metadata_dict = dict([(row['identifier'],row['value'])
+                            for row in form.media_metadata.data])
+        # TODO VALIDATE THIS BEFORE WE ENTER IT
+        # validate(metadata_dict)
+        # validate(context)
+        json_ld_metadata = jsonld.compact(metadata_dict, context)
+        # media.media_metadata = json_ld_metadata
+        # media.save()
+        return redirect_obj(request, media)
+
     if media.media_metadata:
         for row in media.media_metadata.iteritems():
             if row[0] == "@context": continue
-- 
cgit v1.2.3


From d015e4a84dfcde0bef510228f5b8f23a7c895a34 Mon Sep 17 00:00:00 2001
From: tilly-Q <nattilypigeonfowl@gmail.com>
Date: Tue, 6 May 2014 17:45:43 -0400
Subject: Added in a few blank lines when a user edits the metadata of a file
 that has none.

---
 mediagoblin/edit/views.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'mediagoblin/edit/views.py')

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 496df6b9..4ab3fe01 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -467,6 +467,16 @@ def edit_metadata(request, media):
             form.context.append_entry({
                 'identifier':identifier,
                 'value':value})
+    else:
+        form.media_metadata.append_entry({
+            'identifier':"",
+            'value':""})
+        form.media_metadata.append_entry({
+            'identifier':"",
+            'value':""})
+        form.context.append_entry({
+            'identifier':"",
+            'value':""})
     return render_to_response(
         request,
         'mediagoblin/edit/metadata.html',
-- 
cgit v1.2.3