From 3b60b217a6def8c83bc55acbe004220858f56b1f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 30 Sep 2007 18:01:48 +0000 Subject: [PATCH] version 0.4.6 --- src/libprs500/__init__.py | 2 +- src/libprs500/ebooks/metadata/pdf.py | 1 - src/libprs500/gui2/library.py | 2 ++ src/libprs500/library/database.py | 7 +++---- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libprs500/__init__.py b/src/libprs500/__init__.py index 9f5efa56e4..baf0dd8dbf 100644 --- a/src/libprs500/__init__.py +++ b/src/libprs500/__init__.py @@ -13,7 +13,7 @@ ## with this program; if not, write to the Free Software Foundation, Inc., ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ''' E-book management software''' -__version__ = "0.4.5" +__version__ = "0.4.6" __docformat__ = "epytext" __author__ = "Kovid Goyal " __appname__ = 'libprs500' diff --git a/src/libprs500/ebooks/metadata/pdf.py b/src/libprs500/ebooks/metadata/pdf.py index 87b940c80e..91a6293166 100644 --- a/src/libprs500/ebooks/metadata/pdf.py +++ b/src/libprs500/ebooks/metadata/pdf.py @@ -41,7 +41,6 @@ def get_metadata(stream): if info.subject: mi.category = info.subject except Exception, err: - raise print >>sys.stderr, 'Couldn\'t read metadata from pdf: %s with error %s'%(mi.title, str(err)) return mi diff --git a/src/libprs500/gui2/library.py b/src/libprs500/gui2/library.py index 640e57a41f..e3f58f54a9 100644 --- a/src/libprs500/gui2/library.py +++ b/src/libprs500/gui2/library.py @@ -113,6 +113,8 @@ class BooksModel(QAbstractTableModel): def set_database(self, db): if isinstance(db, (QString, basestring)): + if isinstance(db, QString): + db = qstring_to_unicode(db) db = LibraryDatabase(os.path.expanduser(qstring_to_unicode(db))) self.db = db diff --git a/src/libprs500/library/database.py b/src/libprs500/library/database.py index 7d95ebea4f..044988dfef 100644 --- a/src/libprs500/library/database.py +++ b/src/libprs500/library/database.py @@ -954,11 +954,10 @@ class LibraryDatabase(object): (mi.title, uri, mi.series_index)) id = obj.lastrowid self.conn.commit() - if not mi.author: - mi.author = 'Unknown' - temp = mi.author.split(',') + if not mi.authors: + mi.authors = ['Unknown'] authors = [] - for a in temp: + for a in mi.authors: authors += a.split('&') self.set_authors(id, authors) if mi.author_sort: