Changeset 3210

Timestamp:

2007-08-29 17:30:37 (1 year ago)

Author:

dcrowdy

Message:

Improved clip frame creation - now using Frame class from cmmlwiki; removed previous mplayer implementation of this.

Files:

• arkaiv/trunk/README.txt (modified) (2 diffs)
• arkaiv/trunk/TODO (modified) (2 diffs)
• arkaiv/trunk/arkaiv/controllers/page.py (modified) (2 diffs)
• arkaiv/trunk/arkaiv/controllers/page.pyc (modified) (previous)
• arkaiv/trunk/arkaiv/model/framer.py (added)
• arkaiv/trunk/arkaiv/templates/displayitem.mak (modified) (1 diff)
• arkaiv/trunk/data/templates/displayitem.mak.py (modified) (2 diffs)
• arkaiv/trunk/data/templates/displayitem.mak.pyc (modified) (previous)

arkaiv/trunk/README.txt

@@ -11 +11 @@
-python-lxml
-sqlite3
+Python gst (0.10)
-
-Recent annodex libraries - including python-annodex and mod_annodex for apache
-- see http://www.annodex.net
-
-
-Pylons 0.9.6
@@ -34 +34 @@
-
-INSTALLATION
+
+Only tested under linux so far.
-
-Unpack the tarball, enter the directory, and edit production.ini to suit your

arkaiv/trunk/TODO

@@ -1 +1 @@
-TODO
-
+When going to an item from a clip link on the search results page, any
+subsequent attempts to jump to clips fail.  Fix.
+
-Better screen layout in the main display page needed
-
-Clips should have an image generated for the link display
-
-Just been at a coding gathering at Silvia Pfeiffer's house, and Marcin Lubonski
@@ -20 +21 @@
-
-DONE 
+
+Thu Aug 30 09:43:10 EST 2007
+
+Clips should have an image generated for the link display
-
-Mon Aug 27 11:09:20 EST 2007

arkaiv/trunk/arkaiv/controllers/page.py

@@ -27 +27 @@
-#from arkaiv.model.anxparser import anxParser
-from arkaiv.model.cmmlparser import cmmlParser
+from arkaiv.model.framer import Frame
-
-log = logging.getLogger(__name__)
@@ -230 +231 @@
-            basename = os.path.splitext(cmmlfile)[0]
-            imagedirname = basename + "_clipimages"
-
+        clipimagename = str(clip['starttime']) + ".png"
-            oggsource = model.getsourcepath(clip['itemid'])
-    
-            # create an image using mplayer
-            cmd = "mplayer -vo png:z=6 -vf scale -zoom -xy 96 -ao null -ss '" + str(clip['starttime']) + "' -frames 2 " + oggsource 
-            cwd = os.getcwd()
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-            relpath = os.path.split(imagedirname)[1]
-            clip['img_src'] = relpath + "/" + clipimagename 

arkaiv/trunk/arkaiv/templates/displayitem.mak

@@ -145 +145 @@
-% for clipinfo in c.cliplist:
-<tr>
+%     if c.sourcedict['has_video'] == "Yes":
-   <td><a onclick="javascript:SetLocation('${c.sourcedict['urlpath']}?id=${clipinfo['id']}')"><img src="${c.sourcedict['clipimageurl']}${clipinfo['img_src']}"></a></td>
+% endif
+%     if c.sourcedict['has_video'] == "No":
+   <td><a onclick="javascript:SetLocation('${c.sourcedict['urlpath']}?id=${clipinfo['id']}')"><img src="/public/blank.png"></a></td>
+% endif
-    <td>${clipinfo['start_time']}</td>
-    <td>${clipinfo['id']}</td>

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

@@ -2 +2 @@
-UNDEFINED = runtime.UNDEFINED
-_magic_number = 2
-390221.02959
+430842.5310
-_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/displayitem.mak'
-_template_uri='/displayitem.mak'
@@ -141 +141 @@
-        for clipinfo in c.cliplist:
-            # SOURCE LINE 146
-   <td><a onclick="javascript:SetLocation(\'
+
-            # SOURCE LINE 147
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            context.write(unicode(clipinfo['start_time']))
-            context.write(u'</td>\n    <td>')
-49
+54
-            context.write(unicode(clipinfo['id']))
-            context.write(u'</td>\n    <td>')
-0
+5
-            context.write(unicode(clipinfo['desc']))
-            context.write(u'</td>\n    <td>')
-1
+6
-            context.write(unicode(clipinfo['a_href']))
-            context.write(u'</td>\n\n\n')
-4
+9
-            context.write(unicode( h.form(h.url(action='deleteclip'), multipart=True) ))
-            context.write(u'\n<td>')
-55
+60
-            context.write(unicode( h.submit('Delete') ))
-            context.write(u' </td>\n')
-56
+61
-            context.write(unicode( h.hidden_field('clipid', value=clipinfo['ixc']) ))
-            context.write(u'\n')
-57
+62
-            context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
-            context.write(u'\n')
-58
+63
-            context.write(unicode( h.end_form() ))
-            context.write(u' \n\n\n</tr> \n')
-3
+8
-        context.write(u'</table>\n\nAdd new clip:\n')
-66
+71
-        context.write(unicode( h.form(h.url(action='addclip'), multipart=True) ))
-        context.write(u'\n<table style="font-size:small">\n<tr>\n    <td>Start time</td>\n  <td>')
-0
+5
-        context.write(unicode( h.text_field('starttime', size=5) ))
-        context.write(u'</td>\n    <td>a_text</td>\n  <td>')
-2
+7
-        context.write(unicode( h.text_field('a_text') ))
-        context.write(u'</td>\n</tr>\n<tr>\n    <td>Id</td>\n  <td>')
-76
+81
-        context.write(unicode( h.text_field('id', size=5) ))
-        context.write(u'</td>\n    <td>a_href</td>\n  <td>')
-78
+83
-        context.write(unicode( h.text_field('a_href') ))
-        context.write(u'</td>\n</tr>\n<tr>\n    <td>img_src</td>\n  <td>')
-2
+7
-        context.write(unicode( h.text_field('img_src', size=5) ))
-        context.write(u'</td>\n    <td>desc</td>\n  <td>')
-4
+9
-        context.write(unicode( h.text_field('desc') ))
-        context.write(u'</td>\n</tr>\n</table>\n')
-87
+92
-        context.write(unicode( h.hidden_field('headindex', value = c.headdict['ixh']) ))
-        context.write(u'\n')
-88
-
-
-89
+93
+
+
+94
-        context.write(unicode( h.hidden_field('hasvideo', value=c.sourcedict['has_video']) ))
-        context.write(u'\n\n')
-1
+6
-        context.write(unicode( h.submit('Add') ))
-        context.write(u' \n')
-2
+7
-        context.write(unicode( h.end_form() ))
-        context.write(u' \n</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>\n\n')