[xiph-commits] r3227 - in arkaiv/trunk: arkaiv arkaiv/config arkaiv/controllers arkaiv/lib arkaiv/model arkaiv/templates data/templates

dcrowdy at svn.annodex.net dcrowdy at svn.annodex.net
Fri Sep 7 06:29:06 PDT 2007


Author: dcrowdy
Date: 2007-09-07 06:29:06 -0700 (Fri, 07 Sep 2007)
New Revision: 3227

Modified:
   arkaiv/trunk/arkaiv/__init__.pyc
   arkaiv/trunk/arkaiv/config/__init__.pyc
   arkaiv/trunk/arkaiv/config/environment.pyc
   arkaiv/trunk/arkaiv/config/middleware.pyc
   arkaiv/trunk/arkaiv/config/routing.pyc
   arkaiv/trunk/arkaiv/controllers/__init__.pyc
   arkaiv/trunk/arkaiv/controllers/error.pyc
   arkaiv/trunk/arkaiv/controllers/page.py
   arkaiv/trunk/arkaiv/controllers/page.pyc
   arkaiv/trunk/arkaiv/lib/__init__.pyc
   arkaiv/trunk/arkaiv/lib/app_globals.pyc
   arkaiv/trunk/arkaiv/lib/base.pyc
   arkaiv/trunk/arkaiv/lib/helpers.pyc
   arkaiv/trunk/arkaiv/model/__init__.py
   arkaiv/trunk/arkaiv/model/__init__.pyc
   arkaiv/trunk/arkaiv/model/cmmlparser.py
   arkaiv/trunk/arkaiv/model/cmmlparser.pyc
   arkaiv/trunk/arkaiv/model/oggzinfo.pyc
   arkaiv/trunk/arkaiv/templates/displayitem.mak
   arkaiv/trunk/arkaiv/websetup.pyc
   arkaiv/trunk/data/templates/addannodexform.mak.py
   arkaiv/trunk/data/templates/addannodexform.mak.pyc
   arkaiv/trunk/data/templates/autohandler.py
   arkaiv/trunk/data/templates/autohandler.pyc
   arkaiv/trunk/data/templates/collections.mak.py
   arkaiv/trunk/data/templates/collections.mak.pyc
   arkaiv/trunk/data/templates/displayitem.mak.py
   arkaiv/trunk/data/templates/displayitem.mak.pyc
   arkaiv/trunk/data/templates/mainpage.mak.py
   arkaiv/trunk/data/templates/mainpage.mak.pyc
Log:
implemented basic infrastructure for end attributes of clips


Modified: arkaiv/trunk/arkaiv/__init__.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/config/__init__.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/config/environment.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/config/middleware.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/config/routing.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/controllers/__init__.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/controllers/error.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/controllers/page.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/page.py	2007-09-07 11:34:36 UTC (rev 3226)
+++ arkaiv/trunk/arkaiv/controllers/page.py	2007-09-07 13:29:06 UTC (rev 3227)
@@ -318,6 +318,7 @@
     def addclip(self):
         clip = {}
         clip['starttime'] = float(request.params['starttime'])
+        clip['endtime'] = float(request.params['endtime'])
         clip['itemid'] = request.params['itemid']
         clip['a_text'] = request.params['a_text']
         clip['id'] = clip['starttime'] # A kludge so users don't have to worry about providing ids

Modified: arkaiv/trunk/arkaiv/controllers/page.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/lib/__init__.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/lib/app_globals.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/lib/base.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/lib/helpers.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/model/__init__.py
===================================================================
--- arkaiv/trunk/arkaiv/model/__init__.py	2007-09-07 11:34:36 UTC (rev 3226)
+++ arkaiv/trunk/arkaiv/model/__init__.py	2007-09-07 13:29:06 UTC (rev 3227)
@@ -106,7 +106,7 @@
 clips_table = sqla.Table('clips', sac.metadata,
 	sqla.Column('ixc', sqla.Integer, primary_key=True ),
 	sqla.Column('start_time', sqla.Float ),
-#	sqla.Column('end_time', sqla.Float ),
+	sqla.Column('end_time', sqla.Float ),
 	sqla.Column('id', sqla.String()),
 	sqla.Column('a_href', sqla.String()),
 	sqla.Column('a_text', sqla.String()),
@@ -518,8 +518,8 @@
         c = clip_q.get_by(ixc=ic.ixc)
         clipinfo['ixc'] = c.ixc
         clipinfo['start_time'] = c.start_time
+        clipinfo['end_time'] = c.end_time
         clipinfo['id'] = c.id
-        print c.id
         clipinfo['a_href'] = c.a_href
         clipinfo['a_text'] = c.a_text
         clipinfo['img_src'] = c.img_src
@@ -628,6 +628,10 @@
     i = item_q.get_by(ixi=info['itemid'])
     new_clip = Clip()
     new_clip.start_time = info['starttime']
+    try:
+        new_clip.end_time = info['endtime']
+    except:
+        pass
     new_clip.id = info['id']
     new_clip.a_href = info['a_href']
     new_clip.a_text = info['a_text']

Modified: arkaiv/trunk/arkaiv/model/__init__.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/model/cmmlparser.py
===================================================================
--- arkaiv/trunk/arkaiv/model/cmmlparser.py	2007-09-07 11:34:36 UTC (rev 3226)
+++ arkaiv/trunk/arkaiv/model/cmmlparser.py	2007-09-07 13:29:06 UTC (rev 3227)
@@ -147,6 +147,8 @@
         for clip in cliplist:
             newclip = self.Etree.SubElement(root, 'clip')
             newclip.set('start', str(clip['start_time']))
+            if (clip['end_time']):
+                newclip.set('end', str(clip['end_time']))
             newclip.set('id', str(clip['id']))
             img = self.Etree.SubElement(newclip, 'img')
             img.set('src', str(clip['img_src']))

Modified: arkaiv/trunk/arkaiv/model/cmmlparser.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/model/oggzinfo.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/templates/displayitem.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/displayitem.mak	2007-09-07 11:34:36 UTC (rev 3226)
+++ arkaiv/trunk/arkaiv/templates/displayitem.mak	2007-09-07 13:29:06 UTC (rev 3227)
@@ -186,6 +186,10 @@
   <td>${ h.text_field('starttime', size=5) }</td>
 </tr>
 <tr>
+<tr>
+    <td>End</td>
+  <td>${ h.text_field('endtime', size=5) }</td>
+</tr>
 <td>Desc</td>
   <td>
   <input type="text" name="desc" size="20" onfocus="disableShortcuts()" onblur="enableShortcuts()" id="desc" />

Modified: arkaiv/trunk/arkaiv/websetup.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/data/templates/addannodexform.mak.py
===================================================================
--- arkaiv/trunk/data/templates/addannodexform.mak.py	2007-09-07 11:34:36 UTC (rev 3226)
+++ arkaiv/trunk/data/templates/addannodexform.mak.py	2007-09-07 13:29:06 UTC (rev 3227)
@@ -1,8 +1,8 @@
 from mako import runtime, filters, cache
 UNDEFINED = runtime.UNDEFINED
 _magic_number = 2
-_modified_time = 1188350179.570833
-_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/addannodexform.mak'
+_modified_time = 1189166145.629523
+_template_filename='/home/dcrowdy/src/working/arkaiv/trunk/arkaiv/templates/addannodexform.mak'
 _template_uri='/addannodexform.mak'
 _template_cache=cache.Cache(__name__, _modified_time)
 _source_encoding=None

Modified: arkaiv/trunk/data/templates/addannodexform.mak.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/data/templates/autohandler.py
===================================================================
--- arkaiv/trunk/data/templates/autohandler.py	2007-09-07 11:34:36 UTC (rev 3226)
+++ arkaiv/trunk/data/templates/autohandler.py	2007-09-07 13:29:06 UTC (rev 3227)
@@ -1,8 +1,8 @@
 from mako import runtime, filters, cache
 UNDEFINED = runtime.UNDEFINED
 _magic_number = 2
-_modified_time = 1188983566.0871749
-_template_filename=u'/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/autohandler'
+_modified_time = 1189166140.564939
+_template_filename=u'/home/dcrowdy/src/working/arkaiv/trunk/arkaiv/templates/autohandler'
 _template_uri=u'/autohandler'
 _template_cache=cache.Cache(__name__, _modified_time)
 _source_encoding=None

Modified: arkaiv/trunk/data/templates/autohandler.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/data/templates/collections.mak.py
===================================================================
--- arkaiv/trunk/data/templates/collections.mak.py	2007-09-07 11:34:36 UTC (rev 3226)
+++ arkaiv/trunk/data/templates/collections.mak.py	2007-09-07 13:29:06 UTC (rev 3227)
@@ -1,8 +1,8 @@
 from mako import runtime, filters, cache
 UNDEFINED = runtime.UNDEFINED
 _magic_number = 2
-_modified_time = 1188350170.5511739
-_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/collections.mak'
+_modified_time = 1189166207.9120071
+_template_filename='/home/dcrowdy/src/working/arkaiv/trunk/arkaiv/templates/collections.mak'
 _template_uri='/collections.mak'
 _template_cache=cache.Cache(__name__, _modified_time)
 _source_encoding=None

Modified: arkaiv/trunk/data/templates/collections.mak.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/data/templates/displayitem.mak.py
===================================================================
--- arkaiv/trunk/data/templates/displayitem.mak.py	2007-09-07 11:34:36 UTC (rev 3226)
+++ arkaiv/trunk/data/templates/displayitem.mak.py	2007-09-07 13:29:06 UTC (rev 3227)
@@ -1,8 +1,8 @@
 from mako import runtime, filters, cache
 UNDEFINED = runtime.UNDEFINED
 _magic_number = 2
-_modified_time = 1188822727.9317019
-_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/displayitem.mak'
+_modified_time = 1189169167.6441259
+_template_filename='/home/dcrowdy/src/working/arkaiv/trunk/arkaiv/templates/displayitem.mak'
 _template_uri='/displayitem.mak'
 _template_cache=cache.Cache(__name__, _modified_time)
 _source_encoding=None
@@ -211,29 +211,32 @@
         context.write(u'-->\n<form name="addaclip" action="addclip" >\n<table style="font-size:small">\n<tr>\n    <td>Start</td>\n  <td>')
         # SOURCE LINE 186
         context.write(unicode( h.text_field('starttime', size=5) ))
-        context.write(u'</td>\n</tr>\n<tr>\n<td>Desc</td>\n  <td>\n  <input type="text" name="desc" size="20" onfocus="disableShortcuts()" onblur="enableShortcuts()" id="desc" />\n  <!--')
-        # SOURCE LINE 192
+        context.write(u'</td>\n</tr>\n<tr>\n<tr>\n    <td>End</td>\n  <td>')
+        # SOURCE LINE 191
+        context.write(unicode( h.text_field('endtime', size=5) ))
+        context.write(u'</td>\n</tr>\n<td>Desc</td>\n  <td>\n  <input type="text" name="desc" size="20" onfocus="disableShortcuts()" onblur="enableShortcuts()" id="desc" />\n  <!--')
+        # SOURCE LINE 196
         context.write(unicode( h.text_field('desc') ))
         context.write(u'--></td>\n</tr>\n<tr>\n    <td>a_text</td>\n  <td>')
-        # SOURCE LINE 196
+        # SOURCE LINE 200
         context.write(unicode( h.text_field('a_text') ))
         context.write(u'</td>\n</tr>\n<tr>\n    <td>a_href</td>\n  <td>')
-        # SOURCE LINE 200
+        # SOURCE LINE 204
         context.write(unicode( h.text_field('a_href') ))
         context.write(u'</td>\n</tr>\n</table>\n')
-        # SOURCE LINE 203
+        # SOURCE LINE 207
         context.write(unicode( h.hidden_field('headindex', value = c.headdict['ixh']) ))
         context.write(u'\n')
-        # SOURCE LINE 204
+        # SOURCE LINE 208
         context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
         context.write(u'\n')
-        # SOURCE LINE 205
+        # SOURCE LINE 209
         context.write(unicode( h.hidden_field('hasvideo', value=c.sourcedict['has_video']) ))
         context.write(u'\n')
-        # SOURCE LINE 206
+        # SOURCE LINE 210
         context.write(unicode( h.submit('Add') ))
         context.write(u' \n')
-        # SOURCE LINE 207
+        # SOURCE LINE 211
         context.write(unicode( h.end_form() ))
         context.write(u' \n\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.getPla
 yPosition()/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\n\n')
         return ''

Modified: arkaiv/trunk/data/templates/displayitem.mak.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/data/templates/mainpage.mak.py
===================================================================
--- arkaiv/trunk/data/templates/mainpage.mak.py	2007-09-07 11:34:36 UTC (rev 3226)
+++ arkaiv/trunk/data/templates/mainpage.mak.py	2007-09-07 13:29:06 UTC (rev 3227)
@@ -1,8 +1,8 @@
 from mako import runtime, filters, cache
 UNDEFINED = runtime.UNDEFINED
 _magic_number = 2
-_modified_time = 1188363937.3493609
-_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/mainpage.mak'
+_modified_time = 1189166140.539227
+_template_filename='/home/dcrowdy/src/working/arkaiv/trunk/arkaiv/templates/mainpage.mak'
 _template_uri='/mainpage.mak'
 _template_cache=cache.Cache(__name__, _modified_time)
 _source_encoding=None

Modified: arkaiv/trunk/data/templates/mainpage.mak.pyc
===================================================================
(Binary files differ)



More information about the commits mailing list