From 20da70853928af80ce36b186e8221469ad18c7ca Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Tue, 15 Jun 2010 07:36:18 -0600
Subject: [PATCH] GwR wip

---
 resources/tracer.epub               | Bin 1806 -> 2303 bytes
 src/calibre/devices/apple/driver.py |  21 ++++++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/resources/tracer.epub b/resources/tracer.epub
index 225da3d46e70b28942cc725246c7a4a10d84ff83..0c31dbcbbbe8ed5dc2371a3e0852e93a9de7f71a 100644
GIT binary patch
delta 532
zcmeC<`!Bd*A8S1`iwFY)0|&!xi}N=8QZWv-j0_Ctm>3v9qM0G3d8x&|sU?Xii6x18
z1v#0;C8a^9^9~sZ*i2tvP`oZ#y(J-lgDFT$%Oy~nFZ61&Cr`wa(A$}(?q8qMuF*ex
zueI@R<89afdJ2Cy+w!FHnxT%cbVF*O+~=H|hG`E4gciT9zrN@9gH(Zi{_>6!3sxQ|
zxhCJwcA$adYnM_Y2Wuk3vd0&rIkvDl^$RmgXfN$Da|#WeS<-E^*yb*i>a4Ck2~N4k
zqIj~JBv;?KkX-ia|Fw%(XSknQf44Gw+sBmwQbr3kKVSH^?sO36-nH@<Th6!Yy?<YQ
z$maa@3F+N`I_{r-dyBQc_gcxx2Tkfc>sG|bCb-8Qm;DyI`l|AcvRQqx>UqMio%hR6
zSa3ZfN}c)pq^B{rBMcc&_ta12`Sio-%gQQNtCk%-Gg#ykPaY_q$+((v!|l8YX4@Kj
zb^lZ@taY83-laS9gXi7C*qlg~>v!4mZkj2|S($9jEs;_V*V!wUq>*vth(TqWtCRW3
z-W%(UQ}jgc?7eE4=(Dtn!C7zH+Sxi9qM=J|Ch@zyQlG~+&F0JZ{6Dw!H}7G!V+>=2
k#t`;+14bPKFdBhi4=eUq4De=U1Ie=iVI5FuHamz102G<n5C8xG

delta 33
jcmew_*vGeFAM55^b{j?!RyGD8U<E=OMh1pGtRNl$j0gp*

diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index 98adf944af..f5605e2e31 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -884,7 +884,7 @@ class ITUNES(DevicePlugin):
                 connected_device = self.sources['iPod']
                 device = self.iTunes.sources.ItemByName(connected_device)
 
-                added = None
+                db_added = None
                 for pl in device.Playlists:
                     if pl.Kind == self.PlaylistKind.index('User') and \
                        pl.SpecialKind == self.PlaylistSpecialKind.index('Books'):
@@ -1161,12 +1161,12 @@ class ITUNES(DevicePlugin):
             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_
+                try:
+                    added = pl.add(appscript.mactypes.File(P('tracer.epub')),to=pl)
+                    time.sleep(0.5)
+                    added.delete()
                     self.manual_sync_mode = True
-                else:
+                except:
                     self.manual_sync_mode = False
 
         elif iswindows:
@@ -1195,15 +1195,18 @@ class ITUNES(DevicePlugin):
                     self.log.info("  iTunes.manual_sync_mode: %s" % self.manual_sync_mode)
             else:
                 if DEBUG:
-                    self.log.info("   adding tracer to empty Books|Playlist")
+                    self.log.info("   sending tracer to empty Books|Playlist")
+                fpath = P('tracer.epub')
+                mi = MetaInformation('Tracer',['calibre'])
                 try:
-                    added = pl.add(appscript.mactypes.File(P('tracer.epub')),to=pl)
+                    added = self._add_device_book(fpath,mi)
                     time.sleep(0.5)
-                    added.delete()
+                    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):