From 05291739db74da09577f63abc69665386b0254f0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 17 Aug 2007 15:58:32 +0000
Subject: [PATCH] Cleanup calls to sub tools

---
 src/libprs500/ebooks/lrf/lit/convert_from.py | 12 ++++++++----
 src/libprs500/ebooks/lrf/rtf/convert_from.py |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/libprs500/ebooks/lrf/lit/convert_from.py b/src/libprs500/ebooks/lrf/lit/convert_from.py
index 303c7ca6f3..7867f4bfad 100644
--- a/src/libprs500/ebooks/lrf/lit/convert_from.py
+++ b/src/libprs500/ebooks/lrf/lit/convert_from.py
@@ -12,13 +12,14 @@
 ##    You should have received a copy of the GNU General Public License along
 ##    with this program; if not, write to the Free Software Foundation, Inc.,
 ##    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 import os, sys, shutil, glob, logging
 from tempfile import mkdtemp
 from subprocess import Popen, PIPE
 from libprs500.ebooks.lrf import option_parser as lrf_option_parser
 from libprs500.ebooks import ConversionError
 from libprs500.ebooks.lrf.html.convert_from import process_file as html_process_file
-from libprs500 import isosx, __appname__, setup_cli_handlers
+from libprs500 import isosx, __appname__, setup_cli_handlers, iswindows
 CLIT = 'clit'
 if isosx and hasattr(sys, 'frameworks_dir'):
     CLIT = os.path.join(sys.frameworks_dir, CLIT)
@@ -33,10 +34,13 @@ def generate_html(pathtolit, logger):
     if not os.access(pathtolit, os.R_OK):
         raise ConversionError, 'Cannot read from ' + pathtolit
     tdir = mkdtemp(prefix=__appname__+'_')
-    cmd = ' '.join([CLIT, '"'+pathtolit+'"', tdir])
-    p = Popen(cmd, shell=True, stderr=PIPE, stdout=PIPE)
-    ret = p.wait()
+    os.rmdir(tdir)
+    sep = r'\\' if iswindows else os.path.sep
+    cmd = ' '.join([CLIT, '"'+pathtolit+'"', '"%s"'%(tdir+sep,)])
+    logger.debug(cmd)
+    p = Popen(cmd, shell=True, stderr=PIPE, stdout=PIPE)    
     logger.info(p.stdout.read())
+    ret = p.wait()
     if ret != 0:
         shutil.rmtree(tdir)
         err = p.stderr.read()
diff --git a/src/libprs500/ebooks/lrf/rtf/convert_from.py b/src/libprs500/ebooks/lrf/rtf/convert_from.py
index fe797def63..130f34a280 100644
--- a/src/libprs500/ebooks/lrf/rtf/convert_from.py
+++ b/src/libprs500/ebooks/lrf/rtf/convert_from.py
@@ -18,7 +18,7 @@ from libprs500.ebooks.lrf import option_parser as lrf_option_parser
 from libprs500.ebooks.metadata.meta import get_metadata
 from libprs500.ebooks.lrf.html.convert_from import process_file as html_process_file
 from libprs500.ebooks import ConversionError
-from libprs500 import isosx, setup_cli_handlers
+from libprs500 import isosx, setup_cli_handlers, __appname__
 
 UNRTF = 'unrtf'
 if isosx and hasattr(sys, 'frameworks_dir'):
@@ -31,7 +31,7 @@ def option_parser():
         )
 
 def generate_html(rtfpath, logger):
-    tdir = tempfile.mkdtemp(prefix='rtf2lrf_')
+    tdir = tempfile.mkdtemp(prefix=__appname__+'_')
     cwd = os.path.abspath(os.getcwd())
     os.chdir(tdir)
     try: