From 7432c5de6e6ad7f29b68ce658912ee6a41c0d253 Mon Sep 17 00:00:00 2001 From: GRiker Date: Thu, 16 Dec 2010 12:00:35 -0700 Subject: [PATCH 1/2] GwR map Series -> Track number (windows only) --- src/calibre/devices/apple/driver.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index 6e236d9226..eea6d34edb 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -2775,10 +2775,13 @@ class ITUNES(DriverBase): if lb_added: lb_added.SortName = "%s %s" % (self.title_sorter(metadata_x.series), series_index) lb_added.EpisodeID = metadata_x.series + lb_added.TrackNumber = metadata_x.series_index try: lb_added.EpisodeNumber = metadata_x.series_index except: - pass + if DEBUG: + self.log.warning(" iTunes automation interface reported an error" + " setting EpisodeNumber in iTunes") # If no plugboard transform applied to tags, change the Genre/Category to Series if metadata.tags == metadata_x.tags: @@ -2792,6 +2795,7 @@ class ITUNES(DriverBase): if db_added: db_added.SortName = "%s %s" % (self.title_sorter(metadata_x.series), series_index) db_added.EpisodeID = metadata_x.series + db_added.TrackNumber = metadata_x.series_index try: db_added.EpisodeNumber = metadata_x.series_index except: From 7874838ea9b31443c5de66b48be1488e11ed6e60 Mon Sep 17 00:00:00 2001 From: GRiker Date: Thu, 16 Dec 2010 12:03:46 -0700 Subject: [PATCH 2/2] GwR map Series -> Track number (windows only) --- src/calibre/devices/apple/driver.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index eea6d34edb..369c470e2b 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -2775,7 +2775,13 @@ class ITUNES(DriverBase): if lb_added: lb_added.SortName = "%s %s" % (self.title_sorter(metadata_x.series), series_index) lb_added.EpisodeID = metadata_x.series - lb_added.TrackNumber = metadata_x.series_index + + try: + lb_added.TrackNumber = metadata_x.series_index + except: + if DEBUG: + self.log.warning(" iTunes automation interface reported an error" + " setting TrackNumber in iTunes") try: lb_added.EpisodeNumber = metadata_x.series_index except: @@ -2795,7 +2801,13 @@ class ITUNES(DriverBase): if db_added: db_added.SortName = "%s %s" % (self.title_sorter(metadata_x.series), series_index) db_added.EpisodeID = metadata_x.series - db_added.TrackNumber = metadata_x.series_index + + try: + db_added.TrackNumber = metadata_x.series_index + except: + if DEBUG: + self.log.warning(" iTunes automation interface reported an error" + " setting TrackNumber on iDevice") try: db_added.EpisodeNumber = metadata_x.series_index except: