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

revised logic in _update_iTunes_metadata() to properly utilized title_sort plugboard transform values. If present, overrides setting title_sort to index/series when USE_SERIES_AS_CATEGORY is true. Fixes bug #783229

Browse Source
This commit is contained in:
GRiker 2011-05-18 08:30:46 -06:00
parent 02968b5487
commit 654d55c349
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2754,8 +2754,7 @@ class ITUNES(DriverBase):
lb_added.description.set("%s %s" % (self.description_prefix,strftime('%Y-%m-%d %H:%M:%S'))) lb_added.description.set("%s %s" % (self.description_prefix,strftime('%Y-%m-%d %H:%M:%S')))
lb_added.enabled.set(True) lb_added.enabled.set(True)
lb_added.sort_artist.set(icu_title(metadata_x.author_sort)) lb_added.sort_artist.set(icu_title(metadata_x.author_sort))
lb_added.sort_name.set(metadata.title_sort) lb_added.sort_name.set(metadata_x.title_sort)
if db_added: if db_added:
db_added.name.set(metadata_x.title) db_added.name.set(metadata_x.title)
@ -2765,7 +2764,7 @@ class ITUNES(DriverBase):
db_added.description.set("%s %s" % (self.description_prefix,strftime('%Y-%m-%d %H:%M:%S'))) db_added.description.set("%s %s" % (self.description_prefix,strftime('%Y-%m-%d %H:%M:%S')))
db_added.enabled.set(True) db_added.enabled.set(True)
db_added.sort_artist.set(icu_title(metadata_x.author_sort)) db_added.sort_artist.set(icu_title(metadata_x.author_sort))
db_added.sort_name.set(metadata.title_sort) db_added.sort_name.set(metadata_x.title_sort)
if metadata_x.comments: if metadata_x.comments:
if lb_added: if lb_added:
@ -2785,6 +2784,7 @@ class ITUNES(DriverBase):
# Set genre from series if available, else first alpha tag # Set genre from series if available, else first alpha tag
# Otherwise iTunes grabs the first dc:subject from the opf metadata # Otherwise iTunes grabs the first dc:subject from the opf metadata
# If title_sort applied in plugboard, that overrides using series/index as title_sort
if metadata_x.series and self.settings().extra_customization[self.USE_SERIES_AS_CATEGORY]: if metadata_x.series and self.settings().extra_customization[self.USE_SERIES_AS_CATEGORY]:
if DEBUG: if DEBUG:
self.log.info(" ITUNES._update_iTunes_metadata()") self.log.info(" ITUNES._update_iTunes_metadata()")
@ -2796,6 +2796,8 @@ class ITUNES(DriverBase):
fraction = index-integer fraction = index-integer
series_index = '%04d%s' % (integer, str('%0.4f' % fraction).lstrip('0')) series_index = '%04d%s' % (integer, str('%0.4f' % fraction).lstrip('0'))
if lb_added: if lb_added:
# If no title_sort plugboard tweak, create sort_name from series/index
if metadata.title_sort == metadata_x.title_sort:
lb_added.sort_name.set("%s %s" % (self.title_sorter(metadata_x.series), series_index)) lb_added.sort_name.set("%s %s" % (self.title_sorter(metadata_x.series), series_index))
lb_added.episode_ID.set(metadata_x.series) lb_added.episode_ID.set(metadata_x.series)
lb_added.episode_number.set(metadata_x.series_index) lb_added.episode_number.set(metadata_x.series_index)
@ -2810,6 +2812,8 @@ class ITUNES(DriverBase):
break break
if db_added: if db_added:
# If no title_sort plugboard tweak, create sort_name from series/index
if metadata.title_sort == metadata_x.title_sort:
db_added.sort_name.set("%s %s" % (self.title_sorter(metadata_x.series), series_index)) db_added.sort_name.set("%s %s" % (self.title_sorter(metadata_x.series), series_index))
db_added.episode_ID.set(metadata_x.series) db_added.episode_ID.set(metadata_x.series)
db_added.episode_number.set(metadata_x.series_index) db_added.episode_number.set(metadata_x.series_index)
@ -2845,7 +2849,7 @@ class ITUNES(DriverBase):
lb_added.Description = ("%s %s" % (self.description_prefix,strftime('%Y-%m-%d %H:%M:%S'))) lb_added.Description = ("%s %s" % (self.description_prefix,strftime('%Y-%m-%d %H:%M:%S')))
lb_added.Enabled = True lb_added.Enabled = True
lb_added.SortArtist = icu_title(metadata_x.author_sort) lb_added.SortArtist = icu_title(metadata_x.author_sort)
lb_added.SortName = metadata.title_sort lb_added.SortName = metadata_x.title_sort
if db_added: if db_added:
db_added.Name = metadata_x.title db_added.Name = metadata_x.title
@ -2855,7 +2859,7 @@ class ITUNES(DriverBase):
db_added.Description = ("%s %s" % (self.description_prefix,strftime('%Y-%m-%d %H:%M:%S'))) db_added.Description = ("%s %s" % (self.description_prefix,strftime('%Y-%m-%d %H:%M:%S')))
db_added.Enabled = True db_added.Enabled = True
db_added.SortArtist = icu_title(metadata_x.author_sort) db_added.SortArtist = icu_title(metadata_x.author_sort)
db_added.SortName = metadata.title_sort db_added.SortName = metadata_x.title_sort
if metadata_x.comments: if metadata_x.comments:
if lb_added: if lb_added:
@ -2888,6 +2892,8 @@ class ITUNES(DriverBase):
fraction = index-integer fraction = index-integer
series_index = '%04d%s' % (integer, str('%0.4f' % fraction).lstrip('0')) series_index = '%04d%s' % (integer, str('%0.4f' % fraction).lstrip('0'))
if lb_added: if lb_added:
# If no title_sort plugboard tweak, create sort_name from series/index
if metadata.title_sort == metadata_x.title_sort:
lb_added.SortName = "%s %s" % (self.title_sorter(metadata_x.series), series_index) lb_added.SortName = "%s %s" % (self.title_sorter(metadata_x.series), series_index)
lb_added.EpisodeID = metadata_x.series lb_added.EpisodeID = metadata_x.series
@ -2914,6 +2920,8 @@ class ITUNES(DriverBase):
break break
if db_added: if db_added:
# If no title_sort plugboard tweak, create sort_name from series/index
if metadata.title_sort == metadata_x.title_sort:
db_added.SortName = "%s %s" % (self.title_sorter(metadata_x.series), series_index) db_added.SortName = "%s %s" % (self.title_sorter(metadata_x.series), series_index)
db_added.EpisodeID = metadata_x.series db_added.EpisodeID = metadata_x.series