Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Apple driver: Add ids for iPhone 4S. More robust against iTunes automation errors when adding artwork. Fixes #892468 (send to itunes)

Browse Source
This commit is contained in:
Kovid Goyal 2011-11-20 08:20:51 +05:30
commit 803e1c297b
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/calibre/devices/apple/driver.py
View File

@ -217,6 +217,7 @@ class ITUNES(DriverBase):
# 0x1297 iPhone 4 # 0x1297 iPhone 4
# 0x129a iPad # 0x129a iPad
# 0x129f iPad2 (WiFi) # 0x129f iPad2 (WiFi)
# 0x12a0 iPhone 4S
# 0x12a2 iPad2 (GSM) # 0x12a2 iPad2 (GSM)
# 0x12a3 iPad2 (CDMA) # 0x12a3 iPad2 (CDMA)
VENDOR_ID = [0x05ac] VENDOR_ID = [0x05ac]
@ -1305,6 +1306,8 @@ class ITUNES(DriverBase):
if DEBUG: if DEBUG:
self.log.info(" ITUNES._add_new_copy()") self.log.info(" ITUNES._add_new_copy()")
self._update_epub_metadata(fpath, metadata)
db_added = None db_added = None
lb_added = None lb_added = None
@ -1409,10 +1412,16 @@ class ITUNES(DriverBase):
tmp_cover.write(cover_data) tmp_cover.write(cover_data)
if lb_added: if lb_added:
if lb_added.Artwork.Count: try:
lb_added.Artwork.Item(1).SetArtworkFromFile(tc) if lb_added.Artwork.Count:
else: lb_added.Artwork.Item(1).SetArtworkFromFile(tc)
lb_added.AddArtworkFromFile(tc) else:
lb_added.AddArtworkFromFile(tc)
except:
if DEBUG:
self.log.warning(" iTunes automation interface reported an error"
" when adding artwork to '%s' in the iTunes Library" % metadata.title)
pass
if db_added: if db_added:
if db_added.Artwork.Count: if db_added.Artwork.Count:
@ -2663,6 +2672,7 @@ class ITUNES(DriverBase):
metadata.timestamp = now() metadata.timestamp = now()
if DEBUG: if DEBUG:
self.log.info(" add timestamp: %s" % metadata.timestamp) self.log.info(" add timestamp: %s" % metadata.timestamp)
else: else:
metadata.timestamp = now() metadata.timestamp = now()
if DEBUG: if DEBUG:
@ -2699,7 +2709,7 @@ class ITUNES(DriverBase):
if iswindows and metadata.series: if iswindows and metadata.series:
metadata.tags = None metadata.tags = None
set_metadata(zfo, metadata, update_timestamp=True) set_metadata(zfo, metadata, apply_null=True, update_timestamp=True)
def _update_device(self, msg='', wait=True): def _update_device(self, msg='', wait=True):
''' '''
@ -2771,6 +2781,8 @@ class ITUNES(DriverBase):
lb_added.sort_name.set(metadata_x.title_sort) lb_added.sort_name.set(metadata_x.title_sort)
if db_added: if db_added:
self.log.warning(" waiting for db_added to become writeable ")
time.sleep(1.0)
db_added.name.set(metadata_x.title) db_added.name.set(metadata_x.title)
db_added.album.set(metadata_x.title) db_added.album.set(metadata_x.title)
db_added.artist.set(authors_to_string(metadata_x.authors)) db_added.artist.set(authors_to_string(metadata_x.authors))