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

Catch exception if the series index is somehow None

Browse Source 
I can't see how you can get to this line with the series index not set,
but someone has, and it should have been done this way for safety.
This commit is contained in:
David 2019-01-07 23:32:02 +11:00
parent 7ad1640b23
commit 9774ed7413
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/devices/kobo/driver.py
View File

@ -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
try:
new_series_number = "%g" % newmi.series_index 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