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

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2011-11-08 17:28:29 +01:00
commit d0bf5261fe
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/android/driver.py
View File

@ -171,7 +171,7 @@ class ANDROID(USBMS):
'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD', 'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD',
'A70S', 'A101IT', '7', 'INCREDIBLE', 'A7EB', 'SGH-T849_CARD', 'A70S', 'A101IT', '7', 'INCREDIBLE', 'A7EB', 'SGH-T849_CARD',
'__UMS_COMPOSITE', 'SGH-I997_CARD', 'MB870', 'ALPANDIGITAL', '__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' OSX_MAIN_MEM = 'Android Device Main Memory'

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

@ -40,7 +40,7 @@ class KOBO(USBMS):
CAN_SET_METADATA = ['collections'] CAN_SET_METADATA = ['collections']
VENDOR_ID = [0x2237] VENDOR_ID = [0x2237]
PRODUCT_ID = [0x4161, 0x4163] PRODUCT_ID = [0x4161, 0x4163, 0x4165]
BCD = [0x0110, 0x0323, 0x0326] BCD = [0x0110, 0x0323, 0x0326]
VENDOR_NAME = ['KOBO_INC', 'KOBO'] VENDOR_NAME = ['KOBO_INC', 'KOBO']

1
src/calibre/ebooks/metadata/book/base.py
View File

@ -32,6 +32,7 @@ NULL_VALUES = {
'device_collections': [], 'device_collections': [],
'author_sort_map': {}, 'author_sort_map': {},
'authors' : [_('Unknown')], 'authors' : [_('Unknown')],
'author_sort' : _('Unknown'),
'title' : _('Unknown'), 'title' : _('Unknown'),
'user_categories' : {}, 'user_categories' : {},
'author_link_map' : {}, 'author_link_map' : {},

1
src/calibre/gui2/custom_column_widgets.py
View File

@ -697,7 +697,6 @@ class BulkDateTime(BulkBase):
val = None val = None
else: else:
val = qt_to_dt(val) val = qt_to_dt(val)
print val
return val return val
class BulkSeries(BulkBase): class BulkSeries(BulkBase):

5
src/calibre/gui2/wizard/__init__.py
View File

@ -122,6 +122,11 @@ class Kobo(Device):
output_format = 'EPUB' output_format = 'EPUB'
id = 'kobo' id = 'kobo'
class KoboVox(Kobo):
name = 'Kobo Vox'
output_profile = 'tablet'
id = 'kobo_vox'
class Booq(Device): class Booq(Device):
name = 'bq Classic' name = 'bq Classic'
manufacturer = 'Booq' manufacturer = 'Booq'

2
src/calibre/library/save_to_disk.py
View File

@ -173,8 +173,6 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250,
tsorder = tweaks['save_template_title_series_sorting'] tsorder = tweaks['save_template_title_series_sorting']
format_args = FORMAT_ARGS.copy() format_args = FORMAT_ARGS.copy()
format_args.update(mi.all_non_none_fields()) format_args.update(mi.all_non_none_fields())
if mi.is_null('author_sort'):
format_args['author_sort'] = _('Unknown')
if mi.title: if mi.title:
if tsorder == 'strictly_alphabetic': if tsorder == 'strictly_alphabetic':
v = mi.title v = mi.title