Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in handling of author names with commas when sending books to device

Browse Source
This commit is contained in:
Kovid Goyal 2009-02-10 14:23:29 -08:00
parent 5c4294652e
commit 005ca51c84
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/calibre/gui2/library.py
View File

@ -1,3 +1,4 @@
from calibre.ebooks.metadata import authors_to_string
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
import os, textwrap, traceback, time, re import os, textwrap, traceback, time, re
@ -371,35 +372,24 @@ class BooksModel(QAbstractTableModel):
if not rows_are_ids: if not rows_are_ids:
rows = [self.db.id(row.row()) for row in rows] rows = [self.db.id(row.row()) for row in rows]
for id in rows: for id in rows:
au = self.db.authors(id, index_is_id=True) mi = self.db.get_metadata(id, index_is_id=True)
tags = self.db.tags(id, index_is_id=True) au = authors_to_string(mi.authors if mi.authors else [_('Unknown')])
if not au: tags = mi.tags if mi.tags else []
au = _('Unknown') if mi.series is not None:
au = au.split(',') tags.append(mi.series)
if len(au) > 1: info = {
t = ', '.join(au[:-1]) 'title' : mi.title,
t += ' & ' + au[-1]
au = t
else:
au = ' & '.join(au)
if not tags:
tags = []
else:
tags = tags.split(',')
series = self.db.series(id, index_is_id=True)
if series is not None:
tags.append(series)
mi = {
'title' : self.db.title(id, index_is_id=True),
'authors' : au, 'authors' : au,
'cover' : self.db.cover(id, index_is_id=True), 'cover' : self.db.cover(id, index_is_id=True),
'tags' : tags, 'tags' : tags,
'comments': self.db.comments(id, index_is_id=True), 'comments': mi.comments,
}
if mi.series is not None:
info['tag order'] = {
mi.series:self.db.books_in_series_of(id, index_is_id=True)
} }
if series is not None:
mi['tag order'] = {series:self.db.books_in_series_of(id, index_is_id=True)}
metadata.append(mi) metadata.append(info)
return metadata return metadata
def get_preferred_formats_from_ids(self, ids, all_formats, mode='r+b'): def get_preferred_formats_from_ids(self, ids, all_formats, mode='r+b'):

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

@ -48,7 +48,6 @@ from calibre.ebooks import BOOK_EXTENSIONS
from calibre.library.database2 import LibraryDatabase2, CoverCache from calibre.library.database2 import LibraryDatabase2, CoverCache
from calibre.parallel import JobKilled from calibre.parallel import JobKilled
from calibre.utils.filenames import ascii_filename from calibre.utils.filenames import ascii_filename
from calibre.gui2.widgets import WarningDialog
from calibre.gui2.dialogs.confirm_delete import confirm from calibre.gui2.dialogs.confirm_delete import confirm
class Main(MainWindow, Ui_MainWindow): class Main(MainWindow, Ui_MainWindow):