git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8f05e89
)
pdf2swf_gui: fixed calling of swfcombine in case of installation dirs with spaces
author
Matthias Kramm
<kramm@quiss.org>
Wed, 1 Apr 2009 10:22:46 +0000
(12:22 +0200)
committer
Matthias Kramm
<kramm@quiss.org>
Wed, 1 Apr 2009 10:22:46 +0000
(12:22 +0200)
wx/pdf2swf.py
patch
|
blob
|
history
diff --git
a/wx/pdf2swf.py
b/wx/pdf2swf.py
index
1c6c44b
..
b875b36
100755
(executable)
--- a/
wx/pdf2swf.py
+++ b/
wx/pdf2swf.py
@@
-7,6
+7,7
@@
import os
sys.path+=["../lib/python"]
import gfx
import images
sys.path+=["../lib/python"]
import gfx
import images
+import stat
basedir = os.getcwd()
basedir = os.getcwd()
@@
-67,6
+68,8
@@
def swfcombine(params):
else:
locations = [os.path.join(basedir, "swfcombine.exe"),
"c:\\swftools\\swfcombine.exe"]
else:
locations = [os.path.join(basedir, "swfcombine.exe"),
"c:\\swftools\\swfcombine.exe"]
+ params = ['"'+p+'"' for p in params]
+
for e in locations:
if os.path.isfile(e):
exe = e
for e in locations:
if os.path.isfile(e):
exe = e
@@
-74,11
+77,15
@@
def swfcombine(params):
if hasattr(os,"spawnv"):
print "spawnv",exe,params
if hasattr(os,"spawnv"):
print "spawnv",exe,params
- ret = os.spawnv(os.P_WAIT, exe, [exe]+params)
+ ret = -1
+ try:
+ ret = os.spawnv(os.P_WAIT, exe, ["swfcombine"]+params)
+ except:
+ ret = -1
if not ret:
return
if not ret:
return
- cmd = exe + " " + (" ".join(params))
+ cmd = '"' + exe + '"' + " " + (" ".join(params))
print "system",cmd
ret = os.system(cmd)
if ret&0xff00:
print "system",cmd
ret = os.system(cmd)
if ret&0xff00:
@@
-674,13
+681,19
@@
class State:
page.render(swf)
swf.endpage()
swf.save(filename)
page.render(swf)
swf.endpage()
swf.save(filename)
+ if not os.path.isfile(filename):
+ error("Couldn't create file "+filename)
if gfx_options.get("rfxview",None):
rfxview = os.path.join(basedir, "rfxview.swf")
if not os.path.isfile(rfxview):
error("File rfxview.swf not found in working directory")
else:
if gfx_options.get("rfxview",None):
rfxview = os.path.join(basedir, "rfxview.swf")
if not os.path.isfile(rfxview):
error("File rfxview.swf not found in working directory")
else:
+ size1 = os.stat(filename)[stat.ST_SIZE]
swfcombine([rfxview,"viewport="+filename,"-o",filename])
swfcombine([rfxview,"viewport="+filename,"-o",filename])
+ size2 = os.stat(filename)[stat.ST_SIZE]
+ if size1 == size2:
+ error("Couldn't add viewer to file "+filename)
if html:
version = int(gfx_options.get("flashversion", "8"))
if html:
version = int(gfx_options.get("flashversion", "8"))