Changeset 3213

Timestamp:

2007-08-30 04:53:07 (1 year ago)

Author:

dcrowdy

Message:

Fixed problems creating clip images when importing cmml files; cleaned up the appearance.

Files:

• arkaiv/trunk/TODO (modified) (1 diff)
• arkaiv/trunk/arkaiv/controllers/page.py (modified) (9 diffs)
• arkaiv/trunk/arkaiv/controllers/page.pyc (modified) (previous)
• arkaiv/trunk/arkaiv/model/cmmlparser.py (modified) (3 diffs)
• arkaiv/trunk/arkaiv/model/cmmlparser.pyc (modified) (previous)
• arkaiv/trunk/arkaiv/public/quick.css (modified) (2 diffs)
• arkaiv/trunk/arkaiv/templates/autohandler (modified) (1 diff)
• arkaiv/trunk/arkaiv/templates/displayitem.mak (modified) (2 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) (3 diffs)
• arkaiv/trunk/data/templates/displayitem.mak.pyc (modified) (previous)

arkaiv/trunk/TODO

@@ -1 +1 @@
-TODO
+
+Handle whitespace in a source file name - doesn't do this at all at the moment
-
-When going to an item from a clip link on the search results page, any

arkaiv/trunk/arkaiv/controllers/page.py

@@ -229 +229 @@
-        # create an image to display for the clip
-        if has_video == "Yes":
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else:
-            clip['img_src'] = ""
@@ -285 +287 @@
-        if cmmlsource=="":
-            print "creating source file"
-
+.replace(' ',"")
-            newcmmlname = os.path.join(archive_loc, basecmmlname)
-            parser = cmmlParser()
@@ -293 +295 @@
-
-        else:
-
+.replace(' ',"")
-            permanent_file = open(newcmmlname, 'w')
-            shutil.copyfileobj(cmmlsource.file, permanent_file)
@@ -300 +302 @@
-           
-            # Now the ogg file...
-
+
+
-        permanent_file = open(newoggname, 'w')
-        shutil.copyfileobj(oggsource.file, permanent_file)
@@ -313 +316 @@
-            os.makedirs(imagedirname, mode=0755)
-
-#        cmd = "mplayer -vo png:z=6 -vf scale -zoom -xy 96 -ao null -ss '1000' -frames 2 " + newoggname 
-#        cwd = os.getcwd()
-#        os.chdir(imagedirname)
-#
-#        runit = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE
-#, stderr=subprocess.PIPE)
-#        out, err = runit.communicate()
-#        os.chdir(cwd)   # very ugly... better image creation needed allround really.
-                
-        # Get the title for the item (head title)
@@ -346 +341 @@
-        # Now extract any clip information and add it to the database
-            # get a list of dictionary objects
-
+
+
+
-        for clipdict in cliplist:
-            clipdict['itemid'] = newitemid
+            if o.has_video():
+                # get a still image for the correct frame
+                print "getting a clip image"
+                #clipdict['img_src'] = ""
+                clipdict['img_src'] = self.__createimageforclip(newcmmlname, clipdict)
+            else:
+                clipdict['img_src'] = ""
-            model.addclip(clipdict)
-
@@ -422 +426 @@
-        files = os.listdir(directory)
-        for file in files:
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        return
- 
@@ -469 +475 @@
-        # Now extract any clip information and add it to the database
-        # get a list of dictionary objects
-newcmmlname
+
-        for clipdict in cliplist:
-            clipdict['itemid'] = newitemid
@@ -498 +504 @@
-        return          
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

arkaiv/trunk/arkaiv/model/cmmlparser.py

@@ -88 +88 @@
-        return title
-
-, cmmlfilename
-Etree = ElementTre
-
-root = doc.getroot()
-
+
+""" returns a dictionary of clips from the object's cmmlfil
+
+"""
+self.
-        cliplist = []
-        for clip in clips:
@@ -100 +100 @@
-            desc = clip.find('desc')
-            clipdict['desc'] = desc.text
-
-
-
+  # FIXME
+  # FIXME
+ # FIXME
-
-            cliplist.append(clipdict)
@@ -143 +143 @@
-            newclip.set('id', clip['id'])
-            img = Etree.SubElement(newclip, 'img')
-clip['img_src']
+str(clip['img_src'])
-            desc = Etree.SubElement(newclip, 'desc')
-            desc.text = clip['desc']

arkaiv/trunk/arkaiv/public/quick.css

@@ -1 +1 @@
-body {
-
-
+
+
+
-    margin: 25px;
-}
+a:link{
+    color: #369;
+}
+a:visited{
+    color: #00f;
+}
+a:hover{
+    color: #000;
+}
+a:active{
+    color: #666;
+}
+
+
-div.content{
-    font-family: sans-serif;
-    margin: 0;
-    margin-bottom: 10px;
-d3e0ea;
+ccc; /*#d3e0ea */
-    border: 5px solid #333;
-
+
-}
-#video{
-    float: left;
-
-
+
+
+
-    font-family: sans-serif;
-
+
+
+
-}
-#clips{
-    float: left;
-0
+5
-    height: 500px;
-    overflow: scroll;
-    font-family: sans-serif;
-    font-size: small
+    padding-left: 10px;
-}
-
@@ -31 +50 @@
-    font-size: small
-}
+
-h1.main{
-    width: 100%;
-    border-bottom: 1px solid #000;
-}
+
-p.footer{
-    width: 100%;
-    padding-top: 3px;
-border-top: 1px solid #000;
+/*border-top: 1px solid #000;*/
-}
-
+#navcontainer ul {
+        padding-left: 0;
+        margin-left: 0;
+        background-color: #036;
+        color: #fff;
+        float: left;
+        /*height: 40px;*/
+        font-size: 18px;
+        width: 100%;
+        font-family: Helvetica, Verdana, Arial, sans-serif;
+}
+
+#navcontainer ul li { display: inline; }
+
+#navcontainer ul li a {
+        padding: 0.7em 1em;
+        /* padding: 11px 15px; */
+        background-color: #036;
+        color: #fff;
+        text-decoration: none;
+        float: left;
+        border-right: 1px solid #fff;
+}
+
+#navcontainer ul li .searchpadding {
+        /* padding: 0.6em 1em;*/
+        padding: 10px 15px 11px 15px;
+        background-color: #036;
+        color: #fff;
+        text-decoration: none;
+        float: left;
+        border-right: 1px solid #fff;
+}
+
+#navcontainer ul li a:hover {
+        background-color: #369;
+        color: #fff;
+}
+
+#navcontainer ul li a:active {
+        background-color: #fb0;
+        color: #fff;
+}
+

arkaiv/trunk/arkaiv/templates/autohandler

@@ -7 +7 @@
-    </head>
-    <body>
-        
+
-<h1>Arkaiv</h1>
-table cellpadding="10
-tr
-<td>${ h.link_to("All Items", h.url(action="mainpage")) } </td
-<td>${ h.link_to("Collections", h.url(action="collections")) } </td
-<td>${ h.link_to("Add annodex media", h.url(action="addannodexform")) }</td
-<td
- 
+div id="navcontainer
+ul id="navlist"
+  <li>${ h.link_to("All Items", h.url(action="mainpage")) }</li
+  <li>${ h.link_to("Collections", h.url(action="collections")) }</li
+  <li>${ h.link_to("Add annodex media", h.url(action="addannodexform")) }</li
+  <li><span class="searchpadding"
+
-${ h.text_field('searchterms', value="Search") } 
-<!--${ h.submit('Submit') }-->
-${ h.end_form() } 
-
-
-
-
+
+
+
+
+
+
-        <!--div class="content"-->
-${next.body()}

arkaiv/trunk/arkaiv/templates/displayitem.mak

@@ -138 +138 @@
-<tr>
-  <td></td>
-
-
-
-
+
+
+
-</tr>
-% for clipinfo in c.cliplist:
@@ -149 +148 @@
-% endif
-%     if c.sourcedict['has_video'] == "No":
-public
+images
-% endif
-    <td>${clipinfo['start_time']}</td>
-    <td>${clipinfo['id']}</td>
-    <td>${clipinfo['desc']}</td>
-    <td>${clipinfo['a_href']}</td>

arkaiv/trunk/data/templates/autohandler.py

@@ -2 +2 @@
-UNDEFINED = runtime.UNDEFINED
-_magic_number = 2
-364190.6814849
+463289.27105
-_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) ))
-        <p class="header">\n<h1>Arkaiv</h1>\n<table cellpadding="10">\n<tr>\n<td
+<p class="header">\n<h1>Arkaiv</h1>\n<div id="navcontainer">\n<ul id="navlist">\n  <li
-        # SOURCE LINE 13
-        context.write(unicode( h.link_to("All Items", h.url(action="mainpage")) ))
- </td>\n<td
+</li>\n  <li
-        # SOURCE LINE 14
-        context.write(unicode( h.link_to("Collections", h.url(action="collections")) ))
- </td>\n<td
+</li>\n  <li
-        # SOURCE LINE 15
-        context.write(unicode( h.link_to("Add annodex media", h.url(action="addannodexform")) ))
-td>\n<td
+li>\n  <li><span class="searchpadding"
-        # SOURCE LINE 17
-        context.write(unicode( h.form(h.url(action='search'), multipart=True) ))
- 
+
-        # SOURCE LINE 18
-        context.write(unicode( h.text_field('searchterms', value="Search") ))
@@ -41 +41 @@
-        # SOURCE LINE 20
-        context.write(unicode( h.end_form() ))
-</td>\n</tr>\n</table>\n        </p>
-6
+  </span>\n  </li>\n</ul>\n</div>\n</p>\n
+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
-0842.531039
+9839.8722601
-_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/displayitem.mak'
-_template_uri='/displayitem.mak'
@@ -137 +137 @@
-        # SOURCE LINE 127
-        context.write(unicode(c.sourcedict['has_audio']))
-Start time</td>\n  <td>Id</td>\n  <td>Description</td>\n  <td>a_href
-5
+Time</td>\n  <td></td>\n  <td>
+4
-        for clipinfo in c.cliplist:
+            # SOURCE LINE 145
+            context.write(u'<tr>\n')
-            # SOURCE LINE 146
-            context.write(u'<tr>\n')
-            # SOURCE LINE 147
-            if c.sourcedict['has_video'] == "Yes":
-8
+7
-                context.write(u'   <td><a onclick="javascript:SetLocation(\'')
-                context.write(unicode(c.sourcedict['urlpath']))
@@ -153 +153 @@
-                context.write(unicode(clipinfo['img_src']))
-                context.write(u'"></a></td>\n')
-50
+49
-            if c.sourcedict['has_video'] == "No":
-1
+0
-                context.write(u'   <td><a onclick="javascript:SetLocation(\'')
-                context.write(unicode(c.sourcedict['urlpath']))
-                context.write(u'?id=')
-                context.write(unicode(clipinfo['id']))
-public
-3
+images
+2
-            context.write(u'    <td>')
-            context.write(unicode(clipinfo['start_time']))
-            context.write(u'</td>\n    <td>')
-
-
-
-
+
-            context.write(unicode(clipinfo['desc']))
-            context.write(u'</td>\n    <td>')
-6
+4
-            context.write(unicode(clipinfo['a_href']))
-            context.write(u'</td>\n\n\n')
-9
+7
-            context.write(unicode( h.form(h.url(action='deleteclip'), multipart=True) ))
-            context.write(u'\n<td>')
-60
+58
-            context.write(unicode( h.submit('Delete') ))
-            context.write(u' </td>\n')
-61
+59
-            context.write(unicode( h.hidden_field('clipid', value=clipinfo['ixc']) ))
-            context.write(u'\n')
-2
+0
-            context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
-            context.write(u'\n')
-3
+1
-            context.write(unicode( h.end_form() ))
-            context.write(u' \n\n\n</tr> \n')
-8
+6
-        context.write(u'</table>\n\nAdd new clip:\n')
-71
+69
-        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>')
-5
+3
-        context.write(unicode( h.text_field('starttime', size=5) ))
-        context.write(u'</td>\n    <td>a_text</td>\n  <td>')
-7
+5
-        context.write(unicode( h.text_field('a_text') ))
-        context.write(u'</td>\n</tr>\n<tr>\n    <td>Id</td>\n  <td>')
-81
+79
-        context.write(unicode( h.text_field('id', size=5) ))
-        context.write(u'</td>\n    <td>a_href</td>\n  <td>')
-3
+1
-        context.write(unicode( h.text_field('a_href') ))
-        context.write(u'</td>\n</tr>\n<tr>\n    <td>img_src</td>\n  <td>')
-7
+5
-        context.write(unicode( h.text_field('img_src', size=5) ))
-        context.write(u'</td>\n    <td>desc</td>\n  <td>')
-9
+7
-        context.write(unicode( h.text_field('desc') ))
-        context.write(u'</td>\n</tr>\n</table>\n')
+        # SOURCE LINE 190
+        context.write(unicode( h.hidden_field('headindex', value = c.headdict['ixh']) ))
+        context.write(u'\n')
+        # SOURCE LINE 191
+        context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
+        context.write(u'\n')
-        # SOURCE LINE 192
-        context.write(unicode( h.hidden_field('headindex', value = c.headdict['ixh']) ))
-        context.write(u'\n')
-        # SOURCE LINE 193
-        context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
-        context.write(u'\n')
-        # SOURCE LINE 194
-        context.write(unicode( h.hidden_field('hasvideo', value=c.sourcedict['has_video']) ))
-        context.write(u'\n\n')
-6
+4
-        context.write(unicode( h.submit('Add') ))
-        context.write(u' \n')
-7
+5
-        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')