From 24cf886a6a249548e97f877812a2fd54834eb764 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Wed, 15 May 2013 09:58:56 -0600
Subject: [PATCH 1/2] Tweaked diagnostic in read() when error occurs

---
 src/calibre/devices/idevice/libimobiledevice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/idevice/libimobiledevice.py b/src/calibre/devices/idevice/libimobiledevice.py
index 9c76edcdf1..5de81b4d9b 100644
--- a/src/calibre/devices/idevice/libimobiledevice.py
+++ b/src/calibre/devices/idevice/libimobiledevice.py
@@ -531,7 +531,7 @@ class libiMobileDevice():
         else:
             if self.verbose:
                 self.log(" could not open file")
-            raise libiMobileDeviceIOException("could not open file '%s' for reading" % path)
+            raise libiMobileDeviceIOException("could not open file %s for reading" % repr(path))
 
         return data
 

From a60f2c03251b6e6479d7a29b84845c6528b5ff40 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Tue, 21 May 2013 07:59:54 -0600
Subject: [PATCH 2/2] Fix regression when sending epubs to iTunes. Fixes
 lp:1181439, 1181539, 1181799

---
 src/calibre/devices/apple/driver.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index 2f12eeb558..66d27bad2b 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -320,7 +320,7 @@ class ITUNES(DriverBase):
         self.verbose = self.settings().extra_customization[self.DEBUG_LOGGING]
         if self.verbose:
             logger().info("%s.__init__():" % self.__class__.__name__)
-            logger().info(" Debug logging enabled in iTunes plugin settings")
+            logger().info(" Debug logging enabled")
 
     @property
     def cache_dir(self):
@@ -1288,7 +1288,7 @@ class ITUNES(DriverBase):
                         logger().error(" failed to add '%s' to Device|Books" % metadata.title)
                     raise UserFeedback("Unable to add '%s' in direct connect mode" % metadata.title,
                                         details=None, level=UserFeedback.ERROR)
-                self._wait_for_writable_metadata(added)
+                #self._wait_for_writable_metadata(added)
                 return added
 
         elif iswindows:
@@ -1471,6 +1471,7 @@ class ITUNES(DriverBase):
 
         if self.verbose:
             logger().info(" %s._cover_to_thumb()" % self.__class__.__name__)
+            #logger().info("db_added: %s  lb_added: %s" % (db_added, lb_added))
 
         thumb = None
         if metadata.cover:
@@ -1514,13 +1515,13 @@ class ITUNES(DriverBase):
                     '''
                     if lb_added:
                         delay = 2.0
-                        self._wait_for_writable_metadata(db_added, delay=delay)
 
                         # Wait for updatable artwork
                         attempts = 9
                         while attempts:
                             try:
                                 lb_added.artworks[1].data_.set(cover_data)
+                                break
                             except:
                                 attempts -= 1
                                 time.sleep(delay)
@@ -3229,6 +3230,11 @@ class ITUNES(DriverBase):
         if self.verbose:
             logger().info(" %s._wait_for_writable_metadata()" % self.__class__.__name__)
 
+        if not db_added:
+            if self.verbose:
+                logger().info("called from %s() with null db_added" % sys._getframe(1).f_code.co_name)
+            return
+
         attempts = 9
         while attempts:
             try: