mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'master' of https://github.com/davidfor/calibre
This commit is contained in:
commit
962358d740
@ -3033,7 +3033,7 @@ class KOBOTOUCH(KOBO):
|
|||||||
|
|
||||||
series_changed = not (newmi.series == kobo_metadata.series)
|
series_changed = not (newmi.series == kobo_metadata.series)
|
||||||
series_number_changed = False
|
series_number_changed = False
|
||||||
if kobo_metadata.series_index:
|
if kobo_metadata.series_index is not None:
|
||||||
try:
|
try:
|
||||||
kobo_series_number = float(book.kobo_series_number)
|
kobo_series_number = float(book.kobo_series_number)
|
||||||
except:
|
except:
|
||||||
@ -3041,9 +3041,12 @@ class KOBOTOUCH(KOBO):
|
|||||||
series_number_changed = not (kobo_series_number == newmi.series_index)
|
series_number_changed = not (kobo_series_number == newmi.series_index)
|
||||||
|
|
||||||
if series_changed or series_number_changed:
|
if series_changed or series_number_changed:
|
||||||
if newmi.series:
|
if newmi.series is not None:
|
||||||
new_series = newmi.series
|
new_series = newmi.series
|
||||||
new_series_number = "%g" % newmi.series_index
|
try:
|
||||||
|
new_series_number = "%g" % newmi.series_index
|
||||||
|
except:
|
||||||
|
new_series_number = None
|
||||||
else:
|
else:
|
||||||
new_series = None
|
new_series = None
|
||||||
new_series_number = None
|
new_series_number = None
|
||||||
|
Loading…
x
Reference in New Issue
Block a user