diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py index 5b0664515d..e083b38490 100644 --- a/src/calibre/devices/android/driver.py +++ b/src/calibre/devices/android/driver.py @@ -171,7 +171,7 @@ class ANDROID(USBMS): 'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD', 'A70S', 'A101IT', '7', 'INCREDIBLE', 'A7EB', 'SGH-T849_CARD', '__UMS_COMPOSITE', 'SGH-I997_CARD', 'MB870', 'ALPANDIGITAL', - 'ANDROID_MID', 'P990_SD_CARD'] + 'ANDROID_MID', 'P990_SD_CARD', '.K080'] OSX_MAIN_MEM = 'Android Device Main Memory' diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py index 1e4cb6c63c..6e58e27cc7 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -40,7 +40,7 @@ class KOBO(USBMS): CAN_SET_METADATA = ['collections'] VENDOR_ID = [0x2237] - PRODUCT_ID = [0x4161, 0x4163] + PRODUCT_ID = [0x4161, 0x4163, 0x4165] BCD = [0x0110, 0x0323, 0x0326] VENDOR_NAME = ['KOBO_INC', 'KOBO'] diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 58f28af01f..53d336a23d 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -32,6 +32,7 @@ NULL_VALUES = { 'device_collections': [], 'author_sort_map': {}, 'authors' : [_('Unknown')], + 'author_sort' : _('Unknown'), 'title' : _('Unknown'), 'user_categories' : {}, 'author_link_map' : {}, diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py index e154539141..d3a8c34a1e 100644 --- a/src/calibre/gui2/custom_column_widgets.py +++ b/src/calibre/gui2/custom_column_widgets.py @@ -697,7 +697,6 @@ class BulkDateTime(BulkBase): val = None else: val = qt_to_dt(val) - print val return val class BulkSeries(BulkBase): diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py index 9fe258e836..c0965412db 100644 --- a/src/calibre/gui2/wizard/__init__.py +++ b/src/calibre/gui2/wizard/__init__.py @@ -122,6 +122,11 @@ class Kobo(Device): output_format = 'EPUB' id = 'kobo' +class KoboVox(Kobo): + name = 'Kobo Vox' + output_profile = 'tablet' + id = 'kobo_vox' + class Booq(Device): name = 'bq Classic' manufacturer = 'Booq' diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 45d80839b2..69565e07d7 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -173,8 +173,6 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, tsorder = tweaks['save_template_title_series_sorting'] format_args = FORMAT_ARGS.copy() format_args.update(mi.all_non_none_fields()) - if mi.is_null('author_sort'): - format_args['author_sort'] = _('Unknown') if mi.title: if tsorder == 'strictly_alphabetic': v = mi.title