From 8f30c17486701bf2cc29a84c98af5336de75fc56 Mon Sep 17 00:00:00 2001 From: GRiker Date: Mon, 24 Jun 2013 14:14:08 -0700 Subject: [PATCH 1/3] Fixed typo(?) in set_metadata() for touched files. --- src/calibre/utils/podofo/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/utils/podofo/__init__.py b/src/calibre/utils/podofo/__init__.py index 13c12a9bb3..a0b5d85331 100644 --- a/src/calibre/utils/podofo/__init__.py +++ b/src/calibre/utils/podofo/__init__.py @@ -36,7 +36,7 @@ def set_metadata(stream, mi): except WorkerError as e: raise Exception('Failed to set PDF metadata: %s'%e.orig_tb) if touched: - with open(os.path.join(tdir, u'output.pdf'), 'rb') as f: + with open(os.path.join(tdir, u'input.pdf'), 'rb') as f: f.seek(0, 2) if f.tell() > 100: f.seek(0) From 144f66c13b6e020dee1a6b225a728967d7dc21a1 Mon Sep 17 00:00:00 2001 From: GRiker Date: Mon, 1 Jul 2013 03:04:32 -0600 Subject: [PATCH 2/3] Added mkdir() to libiMobileDevice --- .../devices/idevice/libimobiledevice.py | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/calibre/devices/idevice/libimobiledevice.py b/src/calibre/devices/idevice/libimobiledevice.py index ca6ed57a77..ba0f4d0f38 100644 --- a/src/calibre/devices/idevice/libimobiledevice.py +++ b/src/calibre/devices/idevice/libimobiledevice.py @@ -418,6 +418,14 @@ class libiMobileDevice(): if False: self._idevice_set_debug_level(DEBUG) + def mkdir(self, path): + ''' + Mimic mkdir(), creating a directory at path. Does not create + intermediate folders + ''' + self._log_location("'%s'" % path) + return self._afc_make_directory(path) + def mount_ios_app(self, app_name=None, app_id=None): ''' Convenience method to get iDevice ready to talk to app_name or app_id @@ -1007,6 +1015,27 @@ class libiMobileDevice(): self.log(" %s: %s" % (key, file_stats[key])) return file_stats + def _afc_make_directory(self, path): + ''' + Creates a directory on the device. Does not create intermediate dirs. + + Args: + client: (AFC_CLIENT_T) The client to use to make a directory + dir: (const char *) The directory's fully-qualified path + + Result: + error: AFC_E_SUCCESS on success or an AFC_E_* error value + ''' + self._log_location("%s" % repr(path)) + + error = self.lib.afc_make_directory(byref(self.afc), + str(path)) & 0xFFFF + if error: + if self.verbose: + self.log(" ERROR: %s" % self._afc_error(error)) + + return error + def _afc_read_directory(self, directory=''): ''' Gets a directory listing of the directory requested From c3cc6a2278facf35cfbc260e8b1e9fd978008913 Mon Sep 17 00:00:00 2001 From: GRiker Date: Mon, 1 Jul 2013 03:46:32 -0600 Subject: [PATCH 3/3] Revert "Fixed typo(?) in set_metadata() for touched files." This reverts commit 8f30c17486701bf2cc29a84c98af5336de75fc56. --- src/calibre/utils/podofo/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/utils/podofo/__init__.py b/src/calibre/utils/podofo/__init__.py index a0b5d85331..13c12a9bb3 100644 --- a/src/calibre/utils/podofo/__init__.py +++ b/src/calibre/utils/podofo/__init__.py @@ -36,7 +36,7 @@ def set_metadata(stream, mi): except WorkerError as e: raise Exception('Failed to set PDF metadata: %s'%e.orig_tb) if touched: - with open(os.path.join(tdir, u'input.pdf'), 'rb') as f: + with open(os.path.join(tdir, u'output.pdf'), 'rb') as f: f.seek(0, 2) if f.tell() > 100: f.seek(0)