Changeset 3219

Timestamp:

2007-09-03 05:55:46 (1 year ago)

Author:

dcrowdy

Message:

Implemented meta tag removal

Files:

• arkaiv/trunk/TODO (modified) (1 diff)
• arkaiv/trunk/arkaiv/controllers/page.py (modified) (3 diffs)
• arkaiv/trunk/arkaiv/controllers/page.pyc (modified) (previous)
• arkaiv/trunk/arkaiv/model/__init__.py (modified) (1 diff)
• arkaiv/trunk/arkaiv/model/__init__.pyc (modified) (previous)
• arkaiv/trunk/arkaiv/model/cmmlparser.py (modified) (2 diffs)
• arkaiv/trunk/arkaiv/model/cmmlparser.pyc (modified) (previous)
• arkaiv/trunk/arkaiv/templates/displayitem.mak (modified) (4 diffs)
• arkaiv/trunk/data/templates/autohandler.py (modified) (3 diffs)
• arkaiv/trunk/data/templates/autohandler.pyc (modified) (previous)
• arkaiv/trunk/data/templates/displayitem.mak.py (modified) (4 diffs)
• arkaiv/trunk/data/templates/displayitem.mak.pyc (modified) (previous)

arkaiv/trunk/TODO

@@ -1 +1 @@
-TODO
+
+Implement addition of ogg file tag information.
-
-Implement removal of meta tags from the head.

arkaiv/trunk/arkaiv/controllers/page.py

@@ -357 +357 @@
-        print cliplist
-        # Extract meta info from the head and add to database
-
+
+
+
-        for metadict in metalist:
-            metadict['headindex'] = headid
@@ -485 +487 @@
- 
-        # Extract meta info from the head and add to database
-
+
+
+
-        for metadict in metalist:
-            metadict['headindex'] = headid
@@ -535 +539 @@
-        return render('/help.mak')
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

arkaiv/trunk/arkaiv/model/__init__.py

@@ -611 +611 @@
-    return resultsdict
-
+def deletemeta(metaid):
+    meta_q = sac.query(Meta)
+    m = meta_q.get_by(ixm=metaid)
+    sac.session.delete(m)
+    sac.session.flush()
+    return
+

arkaiv/trunk/arkaiv/model/cmmlparser.py

@@ -109 +109 @@
-
-    def getheadinfofromcmml(self, cmmlfilename):
-
-
-
-
+
+
+
+
+
+
+
-        metalist = []
-        for h in head:
@@ -212 +215 @@
-        return
-
+#    def addheadmetas(metalist):
+#        root = self.doc.getroot()
+#        head = root.getiterator('head')
+#        for h in head:
+#            mlist = h.findall('meta')
+#            for m in mlist:
+#                h.remove(m)
+
+
+

arkaiv/trunk/arkaiv/templates/displayitem.mak

@@ -78 +78 @@
-</script>
-</td>
+<td>
+${ h.form(h.url(action='deletemeta'), multipart=True) }
+${ h.submit('Delete') }
+${ h.hidden_field('metaid', value=metainfo['ixm']) }
+${ h.hidden_field('itemid', value=c.itemid) }
+${ h.hidden_field('headid', value=c.headdict['ixh']) }
+${ h.end_form() } 
+
+</td>
-</tr> 
-% endfor
@@ -92 +101 @@
-
-<tr>
- 
+
-  <td>${ h.text_field('metaname') }</td>
-  <td>${ h.text_field('metacontent') }</td>
@@ -176 +185 @@
-    <td>Start</td>
-  <td>${ h.text_field('starttime', size=5) }</td>
-
+
+
+
-  <td>
-  <input type="text" name="desc" size="20" onfocus="disableShortcuts()" onblur="enableShortcuts()" id="desc" />
@@ -184 +195 @@
-    <td>a_text</td>
-  <td>${ h.text_field('a_text') }</td>
+</tr>
+<tr>
-    <td>a_href</td>
-  <td>${ h.text_field('a_href') }</td>

arkaiv/trunk/data/templates/autohandler.py

@@ -2 +2 @@
-UNDEFINED = runtime.UNDEFINED
-_magic_number = 2
-622693.334286
+780210.535383
-_template_filename=u'/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/autohandler'
-_template_uri=u'/autohandler'
@@ -20 +20 @@
-        # SOURCE LINE 5
-        context.write(unicode( h.javascript_include_tag('/javascripts/effects.js', builtins=True) ))
-
+ onkeypress=\'keyPressed(event)\'
-        # SOURCE LINE 13
-        context.write(unicode( h.link_to("All Items", h.url(action="mainpage")) ))
@@ -28 +28 @@
-        context.write(u'</li>\n  <li>')
-        # SOURCE LINE 15
-
+
+
+
+
-        context.write(u'</li>\n  <li><span class="searchpadding">\n')
-7
+8
-        context.write(unicode( h.form(h.url(action='search'), multipart=True) ))
-        context.write(u'\n')
-8
+9
-        context.write(unicode( h.text_field('searchterms', value="Search") ))
-        context.write(u' \n')
-19
+20
-        context.write(unicode( h.end_form() ))
-        context.write(u' \n  </span>\n  </li>\n</ul>\n</div>\n</p>\n\n        <!--div class="content"-->\n')
-7
+8
-        context.write(unicode(next.body()))
-        context.write(u'\n        <p class="footer">\n        </p>\n        <!--/div-->\n    </body>\n</html>\n\n')

arkaiv/trunk/data/templates/displayitem.mak.py

@@ -2 +2 @@
-UNDEFINED = runtime.UNDEFINED
-_magic_number = 2
-629045.883585
+822727.931701
-_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/displayitem.mak'
-_template_uri='/displayitem.mak'
@@ -28 +28 @@
-        c = context.get('c', UNDEFINED)
-        # SOURCE LINE 1
-
-3
+\n
+4
-        context.write(unicode(c.itemname))
-        context.write(u'</p>\n<script type="text/javascript">\n new Ajax.InPlaceEditor(\'edititemname\', \'/page/edititemname\', { callback: function(form, value) { return \'itemid=')
-5
+6
-        context.write(unicode(c.itemid))
-        context.write(u"&myparam=' + escape(value) }});\n</script>\n\n\n")
-9
+10
-        context.write(unicode( h.form(h.url(action='deleteitem'), multipart=True) ))
-        context.write(u'\n')
-0
+1
-        context.write(unicode( h.submit('Delete') ))
-        context.write(u' \n')
-        # SOURCE LINE 11
-        context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
-        context.write(u'\n')
-        # SOURCE LINE 12
+        context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
+        context.write(u'\n')
+        # SOURCE LINE 13
-        context.write(unicode( h.end_form() ))
-        context.write(u' \n       \n      <embed type="application/liboggplay"\n        src="')
-5
+6
-        context.write(unicode(c.sourcedict['urlpath']))
-        context.write(unicode(c.sourcedict['clipdetail']))
-
-6
+td>Disable key shortcuts:</td>\n<td><input type="checkbox" name="shortcuts" value="toggle" onchange="toggleShortcuts()"></td>\n<
+9
-        context.write(unicode( h.form(h.url(action='editheadinfo'), multipart=True) ))
-        context.write(u'\nid:\n')
-48
+51
-        context.write(unicode( h.text_field('headid', value=c.headdict['id']) ))
-        context.write(u'\nTitle:\n')
-0
+3
-        context.write(unicode( h.text_field('headtitle', value=c.headdict['title']) ))
-        context.write(u'\n')
-1
+4
-        context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
-        context.write(u'\n\n')
-3
+6
-        context.write(unicode( h.submit('Edit') ))
-        context.write(u' \n')
-4
+7
-        context.write(unicode( h.end_form() ))
-        context.write(u' \n<br />\n<hr>\nMeta information:<br />\n<table style="font-size:small">\n<tr>\n  <td>Name</td>\n  <td>Content</td>\n</tr>\n')
-3
+6
-        for metainfo in c.metalist:
-4
+7
-            context.write(u'<tr>\n<td>\n<p id="editmetaname">')
-6
+9
-            context.write(unicode(metainfo['name']))
-            context.write(u'</p>\n<script type="text/javascript">\n new Ajax.InPlaceEditor(\'editmetaname\', \'/page/editheadmetaname\', { callback: function(form, value) { return \'id=')
-68
+71
-            context.write(unicode(metainfo['id']))
-            context.write(u'&field=name&itemid=')
-            context.write(unicode(c.itemid))
-            context.write(u'&myparam=\' + escape(value) }});\n</script>\n</td>\n<td>\n<p id="editmetacontent">')
-2
+5
-            context.write(unicode(metainfo['content']))
-            context.write(u'</p>\n<script type="text/javascript">\n new Ajax.InPlaceEditor(\'editmetacontent\', \'/page/editheadmetaname\', { callback: function(form, value) { return \'id=')
-4
+7
-            context.write(unicode(metainfo['id']))
-            context.write(u'&field=content&itemid=')
-            context.write(unicode(c.itemid))
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        context.write(u'</table>\n<hr>\nAdd new meta tag:\n')
-82
+94
-        context.write(unicode( h.form(h.url(action='addmetainfo'), multipart=True) ))
- 
-91
+
+103
-        context.write(unicode( h.text_field('metaid', size=5) ))
-        context.write(u'</td>\n  <td>')
-92
+104
-        context.write(unicode( h.text_field('metaname') ))
-        context.write(u'</td>\n  <td>')
-93
+105
-        context.write(unicode( h.text_field('metacontent') ))
-        context.write(u'</td>\n</tr>\n</table>\n')
-96
+108
-        context.write(unicode( h.hidden_field('metascheme') ))
-        context.write(u'\n')
-97
+109
-        context.write(unicode( h.hidden_field('headindex', value = c.headdict['ixh']) ))
-        context.write(u'\n')
-98
+110
-        context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
-        context.write(u'\n\n')
-00
+12
-        context.write(unicode( h.submit('Add') ))
-        context.write(u' \n')
-01
+13
-        context.write(unicode( h.end_form() ))
-        context.write(u' \n\n<hr>\n\n\n<!--div class="sourceinfo"-->\n<table style="font-size:small">\n<tr>\n<td>Duration:</td><td> ')
-09
+21
-        context.write(unicode(c.sourcedict['duration']))
-        context.write(u'</td>\n</tr>\n<tr>\n<td>Bitrate: </td><td>')
-12
+24
-        context.write(unicode(c.sourcedict['bitrate']))
-        context.write(u'</td>\n</tr>\n<tr>\n<td>Resolution: </td><td>')
-15
+27
-        context.write(unicode(c.sourcedict['resolution']))
-        context.write(u'</td>\n</tr>\n<tr>\n<td>Framerate: </td><td>')
-18
+30
-        context.write(unicode(c.sourcedict['framerate']))
-        context.write(u'</td>\n</tr>\n<tr>\n<td>Audio: </td><td>')
-21
+33
-        context.write(unicode(c.sourcedict['audio']))
-        context.write(u'</td>\n</tr>\n<tr>\n<td>Has video: </td><td>')
-24
+36
-        context.write(unicode(c.sourcedict['has_video']))
-        context.write(u'</td>\n</tr>\n<tr>\n<td>Has audio: </td><td>')
-27
+39
-        context.write(unicode(c.sourcedict['has_audio']))
-        context.write(u'</td>\n</tr>\n</table>\n\n<!--/div!-->\n</div>\n\n<div id="clips">\nClips:\n<br />\n<table style="font-size:small">\n<tr>\n  <td></td>\n  <td>Time</td>\n  <td></td>\n  <td></td> \n</tr>\n')
-44
+56
-        for clipinfo in c.cliplist:
-45
+57
-            context.write(u'<tr>\n')
-46
+58
-            if c.sourcedict['has_video'] == "Yes":
-47
+59
-                context.write(u'   <td><a onclick="javascript:SetLocation(\'')
-                context.write(unicode(c.sourcedict['urlpath']))
@@ -154 +172 @@
-                context.write(unicode(clipinfo['img_src']))
-                context.write(u'"></a></td>\n')
-49
+61
-            if c.sourcedict['has_video'] == "No":
-50
+62
-                context.write(u'   <td><a onclick="javascript:SetLocation(\'')
-                context.write(unicode(c.sourcedict['urlpath']))
@@ -162 +180 @@
-                context.write(unicode(clipinfo['id']))
-                context.write(u'\')"><img src="/images/blank.png"></a></td>\n')
-52
+64
-            context.write(u'    <td>')
-            context.write(unicode(clipinfo['start_time']))
-            context.write(u'</td>\n    <td>')
-53
+65
-            context.write(unicode(clipinfo['desc']))
-            context.write(u'</td>\n    <td>')
-54
+66
-            context.write(unicode(clipinfo['a_href']))
-            context.write(u'</td>\n\n\n')
-57
+69
-            context.write(unicode( h.form(h.url(action='deleteclip'), multipart=True) ))
-            context.write(u'\n<td>')
-58
+70
-            context.write(unicode( h.submit('Delete') ))
-            context.write(u' </td>\n')
-59
+71
-            context.write(unicode( h.hidden_field('clipid', value=clipinfo['ixc']) ))
-            context.write(u'\n')
-60
+72
-            context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
-            context.write(u'\n')
-61
+73
-            context.write(unicode( h.end_form() ))
-            context.write(u' \n\n\n</tr> \n')
-66
-
-69
+78
+<!--
+81
-        context.write(unicode( h.form(h.url(action='addclip'), multipart=True) ))
-\n<table style="font-size:small">\n<tr>\n    <td>Start time
-73
+-->\n<form name="addaclip" action="addclip" >\n<table style="font-size:small">\n<tr>\n    <td>Start
+86
-        context.write(unicode( h.text_field('starttime', size=5) ))
-
-
+
+
+
+
+
-        context.write(unicode( h.text_field('a_text') ))
-
-
-
-
-
+
+
-        context.write(unicode( h.text_field('a_href') ))
-        context.write(u'</td>\n</tr>\n<tr>\n    <td>img_src</td>\n  <td>')
-        # SOURCE LINE 185
-        context.write(unicode( h.text_field('img_src', size=5) ))
-        context.write(u'</td>\n    <td>desc</td>\n  <td>')
-        # SOURCE LINE 187
-        context.write(unicode( h.text_field('desc') ))
-        context.write(u'</td>\n</tr>\n</table>\n')
-190
+203
-        context.write(unicode( h.hidden_field('headindex', value = c.headdict['ixh']) ))
-        context.write(u'\n')
-191
-
-
-192
+204
+
+
+205
-        context.write(unicode( h.hidden_field('hasvideo', value=c.sourcedict['has_video']) ))
-\n
-194
+
+206
-        context.write(unicode( h.submit('Add') ))
-        context.write(u' \n')
-195
-
-</div>\n<script>\nvar plugin = document.embeds[0];\nvar input  = document.api.ifield;\nvar goto  = document.api.gotofield;\nvar output = document.api.ofield;\n\nfunction Play() {\n  plugin.play();\n  addOutput("Play!");\n}\n\nfunction Pause() {\n  plugin.pause();\n  addOutput("Pause!");\n}\n\nfunction SetLocation(location) {\n//  plugin.setPlayPosition(location);\n  plugin.setCurrentMovie(location);\n  addOutput("Current movie: " + plugin.getCurrentMovie());\n  addOutput("setting a location: " + location + " ms");\n}\n\nfunction GetPlayPosition() {\n  addOutput("Play position: " + plugin.getPlayPosition() + " ms");\n}\n\nfunction skip(dir) {\n//    addOutput("we get here")\n    i = getInput();\n    addOutput("i is " + i);\n    if (i <= 0) i = 1000;\n    addOutput("dir is " + dir);\n    t = plugin.getPlayPosition() + (i * dir);\n    addOutput("t is " + t);\n    addOutput("Skipping by " + i + " to " + t + " ms - " +\n            (plugin.setPlayPosition(t) ? "succeeded" : "failed"));\n}\n\nfunction getInput() {\n  i = parseInt(input.value);\n  return isNaN(i) ? 0 : i;\n}\n\nfunction getGoto() {\n  i = parseInt(goto.value);\n  return isNaN(i) ? 0 : i;\n}\n\n\nfunction GotoPosition() {\n  i = getGoto();\n  i = i * 1000;\n  plugin.setPlayPosition(i);\n}\n\nvar outLines = 0;\n\nfunction addOutput(str) {\n  if (outLines == 0) {\n    output.value = str;\n  } else {\n    output.value = str + "\\n" + output.value;\n  }\n  outLines++;\n  if (outLines == 11) {\n    i = output.value.lastIndexOf("\\n");\n    output.value = output.value.substr(0, i);\n    outLines--;\n  }\n}\n</script>
+207
+
+\n<script>\nvar plugin = document.embeds[0];\nvar input  = document.api.ifield;\nvar clipstart = document.addaclip.starttime;\nvar goto  = document.api.gotofield;\nvar output = document.api.ofield;\nvar focusid = "enable";\nvar shortcuts = document.api.shortcuts;\n\nfunction Play() {\n  plugin.play();\n  addOutput("Play");\n}\n\nfunction Pause() {\n  plugin.pause();\n  addOutput("Pause");\n}\n\nfunction SetLocation(location) {\n//  plugin.setPlayPosition(location);\n  plugin.setCurrentMovie(location);\n  addOutput("Current movie: " + plugin.getCurrentMovie());\n  addOutput("setting a location: " + location + " ms");\n}\n\nfunction GetPlayPosition() {\n  addOutput("Play position: " + plugin.getPlayPosition() + " ms");\n}\n\nfunction PauseOrPlay(){\n\taddOutput("current state: " + plugin.getCurrentState());\n\tif (plugin.getCurrentState()==0) {Play();}\n\telse {\n\tif (plugin.getCurrentState()==1) Pause();}\n}\n\nfunction skip(dir) {\n//    addOutput("we get here")\n    i = getInput();\n    addOutput("i is " + i);\n    if (i <= 0) i = 1000;\n    addOutput("dir is " + dir);\n    t = plugin.getPlayPosition() + (i * dir);\n    addOutput("t is " + t);\n    addOutput("Skipping by " + i + " to " + t + " ms - " +\n            (plugin.setPlayPosition(t) ? "succeeded" : "failed"));\n}\n\nfunction getInput() {\n  i = parseInt(input.value);\n  return isNaN(i) ? 0 : i;\n}\n\nfunction getGoto() {\n  i = parseInt(goto.value);\n  return isNaN(i) ? 0 : i;\n}\n\n\nfunction GotoPosition() {\n  i = getGoto();\n  i = i * 1000;\n  plugin.setPlayPosition(i);\n}\n\nvar outLines = 0;\n\nfunction addOutput(str) {\n  if (outLines == 0) {\n    output.value = str;\n  } else {\n    output.value = str + "\\n" + output.value;\n  }\n  outLines++;\n  if (outLines == 11) {\n    i = output.value.lastIndexOf("\\n");\n    output.value = output.value.substr(0, i);\n    outLines--;\n  }\n\n}\n\nfunction addClipStarttime() {\n  clipstart.value = plugin.getPlayPosition()/1000;\n}\n\nfunction keyPressed(e) {\n  if (focusid=="disable") {return;}\n  else {\n  switch (String.fromCharCode(e.which)) {\n  \tcase "t": GetPlayPosition(); break;\n  \tcase "s": addClipStarttime(); break;\n  \tcase "p": PauseOrPlay(); break;\n  }\n  focusid="enable";\n  }\n}\nfunction disableShortcuts() {\n  focusid="disable";\n  addOutput("Shortcuts: " + focusid);\n  }\n\nfunction enableShortcuts() {\n  focusid="enable";\n  addOutput("Shortcuts: " + focusid);\n  }\n\nfunction toggleShortcuts() {\n  if (focusid=="enable") {focusid="disable";}\n  else {\n  if (focusid=="disable") {focusid="enable";}\n  }\n\n}\n\n</script>\n
-        return ''
-    finally: