From ab4b9dbc116b5f7fdc10a7613a6718aacabe3e98 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 23 Sep 2007 16:46:29 +0000 Subject: [PATCH] Fix #214 --- src/libprs500/devices/prs500/driver.py | 2 -- src/libprs500/gui2/library.py | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/libprs500/devices/prs500/driver.py b/src/libprs500/devices/prs500/driver.py index e819f1dcf9..4cf74da0c1 100755 --- a/src/libprs500/devices/prs500/driver.py +++ b/src/libprs500/devices/prs500/driver.py @@ -933,8 +933,6 @@ class PRS500(Device): @safe def upload_book_list(self, booklist, end_session=True): - if not len(booklist): - raise ArgumentError("booklist is empty") path = self.MEDIA_XML if not booklist.prefix: card = self.card(end_session=True) diff --git a/src/libprs500/gui2/library.py b/src/libprs500/gui2/library.py index a82698909e..87558e957d 100644 --- a/src/libprs500/gui2/library.py +++ b/src/libprs500/gui2/library.py @@ -99,7 +99,7 @@ class BooksModel(QAbstractTableModel): def set_database(self, db): if isinstance(db, (QString, basestring)): - db = LibraryDatabase(os.path.expanduser(str(db))) + db = LibraryDatabase(os.path.expanduser(qstring_to_unicode(db))) self.db = db def add_books(self, paths, formats, metadata, uris=[]): @@ -477,8 +477,6 @@ class DeviceBooksModel(BooksModel): self.last_search = text def sort(self, col, order, reset=True): - if not self.db: - return descending = order != Qt.AscendingOrder def strcmp(attr): ag = attrgetter(attr)