From 214a35e174fce7b07de1086e04dbd89d4cc1792e Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Tue, 15 Jun 2010 06:59:24 -0600
Subject: [PATCH] GwR wip

---
 resources/tracer.epub               | Bin 0 -> 1806 bytes
 src/calibre/devices/apple/driver.py |  62 +++++++++++++++-------------
 2 files changed, 33 insertions(+), 29 deletions(-)
 create mode 100644 resources/tracer.epub

diff --git a/resources/tracer.epub b/resources/tracer.epub
new file mode 100644
index 0000000000000000000000000000000000000000..225da3d46e70b28942cc725246c7a4a10d84ff83
GIT binary patch
literal 1806
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

literal 0
HcmV?d00001

diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index 293872487e..98adf944af 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -1147,7 +1147,7 @@ class ITUNES(DevicePlugin):
                     dev_books = pl.file_tracks()
                     break
             else:
-                self.log.error("  book_playlist not found")
+                self.log.error("   book_playlist not found")
 
             if len(dev_books):
                 first_book = dev_books[0]
@@ -1158,7 +1158,16 @@ class ITUNES(DevicePlugin):
                     self.manual_sync_mode = True
                 except:
                     self.manual_sync_mode = False
-                self.log.info("  iTunes.manual_sync_mode: %s" % self.manual_sync_mode)
+            else:
+                if DEBUG:
+                    self.log.info("   adding tracer to empty Books|Playlist")
+                fpath = P('tracer.epub')
+                metadata = {'title':'Tracer','author':'calibre'}
+                added = self._add_device_book(fpath,metadata)
+                if added_
+                    self.manual_sync_mode = True
+                else:
+                    self.manual_sync_mode = False
 
         elif iswindows:
             if wait:
@@ -1186,7 +1195,16 @@ class ITUNES(DevicePlugin):
                     self.log.info("  iTunes.manual_sync_mode: %s" % self.manual_sync_mode)
             else:
                 if DEBUG:
-                    self.log.error("   no books on iDevice, can't determine manual sync mode")
+                    self.log.info("   adding tracer to empty Books|Playlist")
+                try:
+                    added = pl.add(appscript.mactypes.File(P('tracer.epub')),to=pl)
+                    time.sleep(0.5)
+                    added.delete()
+                    self.manual_sync_mode = True
+                except:
+                    self.manual_sync_mode = False
+
+        self.log.info("   iTunes.manual_sync_mode: %s" % self.manual_sync_mode)
 
     def _dump_booklist(self, booklist, header=None):
         '''
@@ -1798,14 +1816,14 @@ class ITUNES(DevicePlugin):
             cmd = "defaults read com.apple.itunes NSNavLastRootDirectory"
             proc = subprocess.Popen( cmd, shell=True, cwd=os.curdir, stdout=subprocess.PIPE)
             proc.wait()
-            media_dir = os.path.abspath(proc.communicate()[0].strip())
+            media_dir = os.path.expanduser(proc.communicate()[0].strip())
             if os.path.exists(media_dir):
                 self.iTunes_media = media_dir
             else:
                 self.log.error("  could not confirm valid iTunes.media_dir from %s" % 'com.apple.itunes')
-
+                self.log.error("  media_dir: %s" % media_dir)
             if DEBUG:
-                self.log.info("  [%s - %s (%s), driver version %d.%d.%d]" %
+                self.log.info("  [OSX %s - %s (%s), driver version %d.%d.%d]" %
                  (self.iTunes.name(), self.iTunes.version(), initial_status,
                   self.version[0],self.version[1],self.version[2]))
                 self.log.info("  iTunes_media: %s" % self.iTunes_media)
@@ -1834,7 +1852,7 @@ class ITUNES(DevicePlugin):
                     self.log.error("  '%s' not found" % media_dir)
 
             if DEBUG:
-                self.log.info("  [%s - %s (%s), driver version %d.%d.%d]" %
+                self.log.info("  [Windows %s - %s (%s), driver version %d.%d.%d]" %
                  (self.iTunes.Windows[0].name, self.iTunes.Version, initial_status,
                   self.version[0],self.version[1],self.version[2]))
                 self.log.info("  iTunes_media: %s" % self.iTunes_media)
@@ -1869,6 +1887,8 @@ class ITUNES(DevicePlugin):
                              'author':library_books[book].Artist,
                            'lib_book':library_books[book]}
                     self._remove_from_iTunes(btr)
+        if DEBUG:
+            self.log.info()
 
     def _remove_existing_copies(self,path,file,metadata):
         '''
@@ -2018,43 +2038,27 @@ class ITUNES(DevicePlugin):
             opf_raw = cStringIO.StringIO(zf.read(opf)).getvalue()
             soup = BeautifulSoup(opf_raw)
             md = soup.find('metadata')
-            ots = ts = md.find('meta',attrs={'name':'calibre:timestamp'})
+            ts = md.find('meta',attrs={'name':'calibre:timestamp'})
             if ts:
                 # Touch existing calibre timestamp
                 timestamp = ts['content']
-#                 old_ts = datetime.datetime.strptime(timestamp, "%Y-%m-%dT%H:%M:%S.%f+00:00")
-#                 new_ts = datetime.datetime(old_ts.year, old_ts.month, old_ts.day, old_ts.hour, old_ts.minute,
-#                               old_ts.second, old_ts.microsecond+1)
-#                 ts['content'] = new_ts.strftime("%Y-%m-%dT%H:%M:%S.%f+00:00")
                 old_ts = strptime(timestamp,"%Y-%m-%dT%H:%M:%S.%f+00:00")
                 new_ts = datetime.datetime(old_ts.year, old_ts.month, old_ts.day, old_ts.hour,
                                            old_ts.minute, old_ts.second, old_ts.microsecond+1)
                 ts['content'] = new_ts.strftime("%Y-%m-%dT%H:%M:%S.%f+00:00")
-                if DEBUG:
-                    self.log.info("   touching existing calibre:timestamp in %s" % opf)
-                    self.log.info("   %s" % ots)
-                    self.log.info("   %s" % ts)
             else:
                 # Create new calibre timestamp
-                if True:
-                    print "existing metadata:\n%s" % md.prettify()
-                else:
-                    ts = Tag(soup,'meta')
-                    ts['name'] = 'calibre:timestamp'
-                    ts['content'] = isoformat(now())
-                    md.insert(len(md),ts)
-                    if DEBUG:
-                        self.log.info("   adding calibre:timestamp to %s" % opf)
-                        self.log.info("   %s" % ts)
+                ts = Tag(soup,'meta')
+                ts['name'] = 'calibre:timestamp'
+                ts['content'] = isoformat(now())
+                md.insert(len(md),ts)
             zfo = open(fpath,'r+b')
-            safe_replace(zfo, opf, cStringIO.StringIO(soup))
+            safe_replace(zfo, opf, cStringIO.StringIO(soup.renderContents()))
 
         else:
             if DEBUG:
                 self.log.error("   can't find .opf in %s" % fpath)
 
-
-
     def _update_device(self, msg='', wait=True):
         '''
         Trigger a sync, wait for completion