Load books on demand.

diff --git a/model/book.cpp b/model/book.cpp
index c28af23..cd1ba6a 100644 (file)
--- a/model/book.cpp
+++ b/model/book.cpp
@@ -20,7 +20,7 @@ static QImage makeCover(const QString &path)
         scaled(COVER_WIDTH, COVER_HEIGHT, Qt::KeepAspectRatio);
 }
 
-Book::Book(const QString &p, QObject *parent): QObject(parent)
+Book::Book(const QString &p, QObject *parent): QObject(parent), loaded(false)
 {
     mPath = "";
     if (p.size()) {
@@ -32,7 +32,7 @@ Book::Book(const QString &p, QObject *parent): QObject(parent)
     }
 }
 
-QString Book::path() const
+QString Book::path()
 {
     return mPath;
 }
@@ -43,6 +43,7 @@ bool Book::open()
     qDebug() << path();
     close();
     clear();
+    load();
     if (path().isEmpty()) {
         title = "No book";
         return false;
@@ -64,6 +65,7 @@ void Book::peek()
     qDebug() << path();
     close();
     clear();
+    load();
     if (path().isEmpty()) {
         title = "No book";
         return;
@@ -101,6 +103,7 @@ bool Book::extract(const QStringList &excludedExtensions)
     QString tmp = tmpDir();
     qDebug() << "Extracting" << mPath << "to" << tmp;
 
+    load();
     QDir::setCurrent(QDir::rootPath());
     if (!clearDir(tmp)) {
         qCritical() << "Book::extract: Failed to remove" << tmp;
@@ -144,6 +147,8 @@ bool Book::parse()
 {
     TRACE;
 
+    load();
+
     // Parse OPS file
     bool ret = false;
     QString opsFileName = opsPath();
@@ -268,7 +273,12 @@ void Book::clear()
 
 void Book::load()
 {
+    if (loaded) {
+        return;
+    }
+
     TRACE;
+    loaded = true;
     qDebug() << "path" << path();
 
     QVariantHash data = BookDb::instance()->load(path());
@@ -301,6 +311,7 @@ void Book::save()
 {
     TRACE;
 
+    load();
     QVariantHash data;
     data["title"] = title;
     data["creators"] = creators;
@@ -325,19 +336,21 @@ void Book::save()
 void Book::setLastBookmark(int part, qreal position)
 {
     TRACE;
-    qDebug() << "part" << part << "position" << position;
+    load();
     mLastBookmark.part = part;
     mLastBookmark.pos = position;
     save();
 }
 
-Book::Bookmark Book::lastBookmark() const
+Book::Bookmark Book::lastBookmark()
 {
+    load();
     return Book::Bookmark(mLastBookmark);
 }
 
 void Book::addBookmark(int part, qreal position, const QString &note)
 {
+    load();
     mBookmarks.append(Bookmark(part, position, note));
     qSort(mBookmarks.begin(), mBookmarks.end());
     save();
@@ -345,18 +358,21 @@ void Book::addBookmark(int part, qreal position, const QString &note)
 
 void Book::deleteBookmark(int index)
 {
+    load();
     mBookmarks.removeAt(index);
     save();
 }
 
-QList<Book::Bookmark> Book::bookmarks() const
+QList<Book::Bookmark> Book::bookmarks()
 {
+    load();
     return mBookmarks;
 }
 
 QString Book::opsPath()
 {
     TRACE;
+    load();
     QString ret;
 
     QFile container(tmpDir() + "/META-INF/container.xml");
@@ -378,13 +394,15 @@ QString Book::opsPath()
     return ret;
 }
 
-QString Book::rootPath() const
+QString Book::rootPath()
 {
+    load();
     return mRootPath;
 }
 
-QString Book::name() const
+QString Book::name()
 {
+    load();
     if (title.size()) {
         QString ret = title;
         if (creators.length()) {
@@ -399,13 +417,16 @@ QString Book::name() const
     }
 }
 
-QString Book::shortName() const
+QString Book::shortName()
 {
+    load();
     return (title.isEmpty())? QFileInfo(path()).baseName(): title;
 }
 
 int Book::chapterFromPart(int index)
 {
+    TRACE;
+    load();
     int ret = -1;
 
     QString partId = parts[index];
@@ -431,7 +452,8 @@ int Book::chapterFromPart(int index)
 
 int Book::partFromChapter(int index, QString &fragment)
 {
-    Trace t("Book::partFromChapter");
+    TRACE;
+    load();
     fragment.clear();
     QString id = chapters[index];
     QString href = content[id].href;
@@ -461,6 +483,7 @@ int Book::partFromChapter(int index, QString &fragment)
 
 qreal Book::getProgress(int part, qreal position)
 {
+    load();
     Q_ASSERT(part < parts.size());
     QString key;
     qreal partSize = 0;
@@ -484,8 +507,6 @@ void Book::upgrade()
 {
     TRACE;
 
-    qDebug() << path();
-
     // Load book from old database (QSettings)
 
     QSettings settings;
@@ -525,5 +546,6 @@ void Book::upgrade()
 void Book::remove()
 {
     TRACE;
+    load();
     BookDb::instance()->remove(path());
 }

diff --git a/model/book.h b/model/book.h
index 034b539..ded10f0 100644 (file)
--- a/model/book.h
+++ b/model/book.h
@@ -66,13 +66,13 @@ public:
     void close();
 
     /** Return path to EPUB. */
-    QString path() const;
+    QString path();
 
     /**
      * Return path to root directory of extracted EPUB.
      * Only valid after parsing Book::opsPath().
      */
-    QString rootPath() const;
+    QString rootPath();
 
     /** Return temporary directory path for extracting EPUB file. */
     QString tmpDir() const;
@@ -84,7 +84,7 @@ public:
     void setLastBookmark(int part, qreal position);
 
     /** Get last bookmark. */
-    Bookmark lastBookmark() const;
+    Bookmark lastBookmark();
 
     /** Add bookmark. */
     void addBookmark(int part, qreal position, const QString &note);
@@ -93,16 +93,16 @@ public:
     void deleteBookmark(int index);
 
     /** List bookmarks. */
-    QList<Bookmark> bookmarks() const;
+    QList<Bookmark> bookmarks();
 
     /**
      * Get friendly name.
      * @return @see title or path name combined with author(s) name.
      */
-    QString name() const;
+    QString name();
 
     /** Get short friendly name: title or file name. */
-    QString shortName() const;
+    QString shortName();
 
     /** Get chapter index from part index. */
     int chapterFromPart(int index);
@@ -154,6 +154,7 @@ protected:
     QList<Bookmark> mBookmarks;             //< List of bookmarks.
     QString mRootPath;                      //< Path to root item in EPUB dir.
     QTemporaryFile mTempFile;               //< Guards extracting books.
+    bool loaded;                            //< True, if loaded from database.
 };
 
 #endif // BOOK_H

diff --git a/model/library.cpp b/model/library.cpp
index b440780..1a322fc 100644 (file)
--- a/model/library.cpp
+++ b/model/library.cpp
@@ -82,7 +82,7 @@ void Library::load()
         Book *book = new Book(path);
         connect(book, SIGNAL(opened(const QString &)),
                 this, SLOT(onBookOpened(const QString &)));
-        book->load();
+        // book->load();
         mBooks.append(book);
     }
 

diff --git a/pkg/changelog b/pkg/changelog
index 8ea68b6..db4909d 100644 (file)
--- a/pkg/changelog
+++ b/pkg/changelog
@@ -2,6 +2,7 @@ dorian (0.3.4-1) unstable; urgency=low
 
   * On Symbian, display confirmation after downloading a book
   * Navigate with volume keys on Symbian, too
+  * Speed up startup, load books on demand
 
  -- Akos Polster <akos@pipacs.com>  Fri,  5 Nov 2010 02:00:00 +0100