From 5a1731a38f92f775546da458aa90a8c6cce2cfcc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Jun 2010 22:43:40 -0600
Subject: [PATCH] PoDoFo cleanups

---
 setup/installer/linux/freeze.py      | 1 +
 src/calibre/utils/podofo/__init__.py | 9 ++++++++-
 src/calibre/utils/podofo/podofo.cpp  | 6 ++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/setup/installer/linux/freeze.py b/setup/installer/linux/freeze.py
index 08237b83fa..8c56ed4fb7 100644
--- a/setup/installer/linux/freeze.py
+++ b/setup/installer/linux/freeze.py
@@ -40,6 +40,7 @@ class LinuxFreeze(Command):
                         '/usr/bin/pdftohtml',
                         '/usr/lib/libwmflite-0.2.so.7',
                         '/usr/lib/liblcms.so.1',
+                        '/usr/lib/libstlport.so.5.1',
                         '/tmp/calibre-mount-helper',
                         '/usr/lib/libunrar.so',
                         '/usr/lib/libchm.so.0',
diff --git a/src/calibre/utils/podofo/__init__.py b/src/calibre/utils/podofo/__init__.py
index 9fc0c981e6..284deb7c43 100644
--- a/src/calibre/utils/podofo/__init__.py
+++ b/src/calibre/utils/podofo/__init__.py
@@ -14,6 +14,7 @@ from calibre.ebooks.metadata import MetaInformation, string_to_authors, \
 from calibre.utils.ipc.job import ParallelJob
 from calibre.utils.ipc.server import Server
 from calibre.ptempfile import PersistentTemporaryFile
+from calibre import prints
 
 podofo, podofo_err = plugins['podofo']
 
@@ -117,12 +118,18 @@ def set_metadata(stream, mi):
 
     job.update()
     server.close()
-    if job.result is not None:
+    if job.failed:
+        prints(job.details)
+    elif job.result is not None:
         stream.seek(0)
         stream.truncate()
         stream.write(job.result)
         stream.flush()
         stream.seek(0)
+    try:
+        os.remove(pt.name)
+    except:
+        pass
 
 
 
diff --git a/src/calibre/utils/podofo/podofo.cpp b/src/calibre/utils/podofo/podofo.cpp
index ace8c58c70..ea982167d3 100644
--- a/src/calibre/utils/podofo/podofo.cpp
+++ b/src/calibre/utils/podofo/podofo.cpp
@@ -55,8 +55,7 @@ podofo_PDFDoc_load(podofo_PDFDoc *self, PyObject *args, PyObject *kwargs) {
 } else return NULL;
 
 
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -73,8 +72,7 @@ podofo_PDFDoc_open(podofo_PDFDoc *self, PyObject *args, PyObject *kwargs) {
 } else return NULL;
 
 
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyObject *