Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2748 ("calibredb add -1" fails)

Browse Source
This commit is contained in:
Kovid Goyal 2009-07-07 13:06:17 -06:00
parent 21194d5d75
commit 173aa421e3
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/ebooks/metadata/meta.py
View File

@ -31,7 +31,7 @@ def metadata_from_formats(formats):
try: try:
return _metadata_from_formats(formats) return _metadata_from_formats(formats)
except: except:
mi = metadata_from_filename(formats[0]) mi = metadata_from_filename(list(formats)[0])
if not mi.authors: if not mi.authors:
mi.authors = [_('Unknown')] mi.authors = [_('Unknown')]
@ -126,14 +126,10 @@ def metadata_from_filename(name, pat=None):
mi.title = match.group('title') mi.title = match.group('title')
except IndexError: except IndexError:
pass pass
try:
mi.authors = [match.group('author')]
except IndexError:
pass
try: try:
au = match.group('authors') au = match.group('authors')
aus = string_to_authors(au) aus = string_to_authors(au)
mi.authors = authors mi.authors = aus
except IndexError: except IndexError:
pass pass
try: try:

2
src/calibre/ebooks/mobi/writer.py
View File

@ -2031,7 +2031,7 @@ class MobiWriter(object):
indices.write(pack('>H', pos)) # Save the offset for IDXTIndices indices.write(pack('>H', pos)) # Save the offset for IDXTIndices
name = "%04X"%count name = "%04X"%count
indxt.write(chr(len(name)) + name) # Write the name indxt.write(chr(len(name)) + name) # Write the name
indxt.write(INDXT['section']) # entryType [0x0F | 0xDF | 0xFF | 0x3F] indxt.write(INDXT['section']) # entryType [0x0F | 0xDF | 0xFF | 0x3F]
indxt.write(chr(0)) # subType 0 indxt.write(chr(0)) # subType 0
indxt.write(decint(offset, DECINT_FORWARD)) # offset indxt.write(decint(offset, DECINT_FORWARD)) # offset
indxt.write(decint(length, DECINT_FORWARD)) # length indxt.write(decint(length, DECINT_FORWARD)) # length

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

@ -1708,7 +1708,7 @@ books_series_link feeds
formats = self.find_books_in_directory(dirpath, True) formats = self.find_books_in_directory(dirpath, True)
if not formats: if not formats:
return return
formats = list(formats)
mi = metadata_from_formats(formats) mi = metadata_from_formats(formats)
if mi.title is None: if mi.title is None:
return return