[open-allure-ds] push by jg07...@gmail.com - Quotes in calls to ffmpeg and MP4Box. Turned off debug2.txt. on 2011-11-21 03:03 GMT

[open-al...@googlecode.com]

Revision: 92e870b28557
Author: John Graves
Date: Sun Nov 20 19:03:21 2011
Log: Quotes in calls to ffmpeg and MP4Box. Turned off debug2.txt.
http://code.google.com/p/open-allure-ds/source/detail?r=92e870b28557

Modified:
/odp2wts/Wiki-to-Speech-from-ODP.nsi
/odp2wts/odp2wts.py
/odp2wts/scriptParser.py

=======================================
--- /odp2wts/Wiki-to-Speech-from-ODP.nsi Fri Sep 9 18:30:38 2011
+++ /odp2wts/Wiki-to-Speech-from-ODP.nsi Sun Nov 20 19:03:21 2011
@@ -4,7 +4,7 @@

Var ALREADY_INSTALLED ; variable - no {} needed, just $

-!define WIKI_TO_SPEECH_VERSION "0.1.18" ; define - ${} needed
+!define WIKI_TO_SPEECH_VERSION "0.1.27" ; define - ${} needed

!define MUI_ICON "D:\open-allure-ds\odp2wts\openallure_32x32.ico"
!define UMUI_LEFTIMAGE_BMP "D:\open-allure-ds\odp2wts\openallure_left.bmp"
=======================================
--- /odp2wts/odp2wts.py Thu Nov 17 17:19:47 2011
+++ /odp2wts/odp2wts.py Sun Nov 20 19:03:21 2011
@@ -41,8 +41,10 @@
Fourth; No, just the third. > q/img1q2a2.mp3, > q/img1q2r2.mp3

[questions=off]
+
+20111121 Turn off debug2.txt and put quotes around calls in makeVid.bat
"""
-__version__ = "0.1.26"
+__version__ = "0.1.27"

import BeautifulSoup
from BeautifulSoup import BeautifulStoneSoup
@@ -813,7 +815,7 @@
f.write("echo off\ncls\n")
f.write("if exist output.mp4 (del output.mp4)\n")
if os.path.isfile(savePath+os.sep+"MP4Box.exe"):
- catCommand = savePath+os.sep+"MP4Box"
+ catCommand = '"'+savePath+os.sep+'MP4Box"'
else:
catCommand = "MP4Box"
for i, file in enumerate(sortedOgg):
@@ -843,7 +845,7 @@
# Convert the images to a video of that slide with voice over
# NOTE: Little trick here -- Windows wants to substitute the batch
file name
# into %0 so we use %1 and pass %0 as the first parameter
- f.write(savePath+os.sep+"ffmpeg -i "+stem+'.mp3 -r 10
-i "'+stem+'_%15d.jpg" -ab 64k '+stem+".mp4\n")
+ f.write('"'+savePath+os.sep+'ffmpeg" -i '+stem+'.mp3 -r 10
-i "'+stem+'_%15d.jpg" -ab 64k '+stem+".mp4\n")
# Delete the symlinks
for j in range(tenthsOfSeconds):
f.write("del "+stem+'_'+str(j).zfill(5)+'.jpg\n')
=======================================
--- /odp2wts/scriptParser.py Sun Oct 2 02:15:19 2011
+++ /odp2wts/scriptParser.py Sun Nov 20 19:03:21 2011
@@ -282,7 +282,7 @@
answer.action =
tags.index(answer.responseSideLink.lower()) - qnum
answer.responseSideLink = ""

- dumpSequence(seq, questionMode)
+ #dumpSequence(seq, questionMode)

return seq.sequence