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

version 0.4.7. Fix nasty bug in metadata handling.

Browse Source
This commit is contained in:
Kovid Goyal 2007-09-30 19:38:05 +00:00
parent 43300a23f2
commit 96415015a6
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libprs500/__init__.py
View File

@ -13,7 +13,7 @@
## with this program; if not, write to the Free Software Foundation, Inc., ## with this program; if not, write to the Free Software Foundation, Inc.,
## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
''' E-book management software''' ''' E-book management software'''
__version__ = "0.4.6" __version__ = "0.4.7"
__docformat__ = "epytext" __docformat__ = "epytext"
__author__ = "Kovid Goyal <kovid@kovidgoyal.net>" __author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
__appname__ = 'libprs500' __appname__ = 'libprs500'

2
src/libprs500/ebooks/metadata/__init__.py
View File

@ -62,7 +62,7 @@ class MetaInformation(object):
def __str__(self): def __str__(self):
ans = '' ans = ''
ans += 'Title : ' + str(self.title) + '\n' ans += 'Title : ' + str(self.title) + '\n'
ans += 'Author : ' + ', '.join(self.authors) + '\n' ans += 'Author : ' + (', '.join(self.authors) if self.authors is not None else 'None') + '\n'
ans += 'Category: ' + str(self.category) + '\n' ans += 'Category: ' + str(self.category) + '\n'
ans += 'Comments: ' + str(self.comments) + '\n' ans += 'Comments: ' + str(self.comments) + '\n'
return ans.strip() return ans.strip()

4
src/libprs500/gui2/main.py
View File

@ -269,7 +269,7 @@ class Main(MainWindow, Ui_MainWindow):
def _add_books(self, paths, to_device): def _add_books(self, paths, to_device):
on_card = False if self.stack.currentIndex() != 2 else True on_card = False if self.stack.currentIndex() != 2 else True
# Get format and metadata information # Get format and metadata information
formats, metadata, names, infos = [], [], [], [] formats, metadata, names, infos = [], [], [], []
for book in paths: for book in paths:
format = os.path.splitext(book)[1] format = os.path.splitext(book)[1]
format = format[1:] if format else None format = format[1:] if format else None
@ -281,7 +281,7 @@ class Main(MainWindow, Ui_MainWindow):
metadata.append(mi) metadata.append(mi)
names.append(os.path.basename(book)) names.append(os.path.basename(book))
if not mi.authors: if not mi.authors:
mi.authors = 'Unknown' mi.authors = ['Unknown']
infos.append({'title':mi.title, 'authors':', '.join(mi.authors), infos.append({'title':mi.title, 'authors':', '.join(mi.authors),
'cover':self.default_thumbnail, 'tags':[]}) 'cover':self.default_thumbnail, 'tags':[]})

13
src/libprs500/library/database.py
View File

@ -891,15 +891,18 @@ class LibraryDatabase(object):
''' '''
if not append: if not append:
self.conn.execute('DELETE FROM books_tags_link WHERE book=?', (id,)) self.conn.execute('DELETE FROM books_tags_link WHERE book=?', (id,))
tag = set(tags) for tag in set(tags):
for tag in tags: tag = tag.strip()
t = self.conn.execute('SELECT id from tags WHERE name=?', (tag,)).fetchone() if not tag:
continue
t = self.conn.execute('SELECT id FROM tags WHERE name=?', (tag,)).fetchone()
if t: if t:
tid = t[0] tid = t[0]
else: else:
tid = self.conn.execute('INSERT INTO tags(name) VALUES(?)', (tag,)).lastrowid tid = self.conn.execute('INSERT INTO tags(name) VALUES(?)', (tag,)).lastrowid
if (append and not self.conn.execute('SELECT book FROM books_tags_link WHERE book=? AND tag=?',
(id, tid)).fetchone()) or not append: if not self.conn.execute('SELECT book FROM books_tags_link WHERE book=? AND tag=?',
(id, tid)).fetchone():
self.conn.execute('INSERT INTO books_tags_link(book, tag) VALUES (?,?)', self.conn.execute('INSERT INTO books_tags_link(book, tag) VALUES (?,?)',
(id, tid)) (id, tid))
self.conn.commit() self.conn.commit()