From ebf2ee72b2b0b258fb032e0b4d1bc5e758906709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Wed, 15 Oct 2014 16:30:51 +0200 Subject: [PATCH] Updated LibraryWindow::reloadAfterCopyMove for only re-fetching/updating the affected folders by a copy/move action --- YACReaderLibrary/db/treeitem.cpp | 80 +++++------------------------ YACReaderLibrary/db/treeitem.h | 3 +- YACReaderLibrary/db/treemodel.cpp | 78 ++++++++++++++++++++++++++-- YACReaderLibrary/db/treemodel.h | 3 +- YACReaderLibrary/library_window.cpp | 4 +- 5 files changed, 94 insertions(+), 74 deletions(-) diff --git a/YACReaderLibrary/db/treeitem.cpp b/YACReaderLibrary/db/treeitem.cpp index 8acf353c..ec31049e 100644 --- a/YACReaderLibrary/db/treeitem.cpp +++ b/YACReaderLibrary/db/treeitem.cpp @@ -1,70 +1,19 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* - treeitem.cpp - - A container for items of data supplied by the simple tree model. -*/ - #include #include "treeitem.h" #include "qnaturalsorting.h" -//! [0] TreeItem::TreeItem(const QList &data, TreeItem *parent) { parentItem = parent; itemData = data; } -//! [0] -//! [1] TreeItem::~TreeItem() { qDeleteAll(childItems); } -//! [1] -//! [2] void TreeItem::appendChild(TreeItem *item) { item->parentItem = this; @@ -74,7 +23,7 @@ void TreeItem::appendChild(TreeItem *item) else { TreeItem * last = childItems.back(); - QString nameLast = last->data(1).toString(); //TODO usar info name si está disponible, sino el nombre del fichero..... + QString nameLast = last->data(1).toString(); //TODO usar info name si est� disponible, sino el nombre del fichero..... QString nameCurrent = item->data(1).toString(); QList::iterator i; i = childItems.end(); @@ -84,7 +33,7 @@ void TreeItem::appendChild(TreeItem *item) i--; nameLast = (*i)->data(1).toString(); } - if(!naturalSortLessThanCI(nameCurrent,nameLast)) //si se ha encontrado un elemento menor que current, se inserta justo después + if(!naturalSortLessThanCI(nameCurrent,nameLast)) //si se ha encontrado un elemento menor que current, se inserta justo despu�s childItems.insert(++i,item); else childItems.insert(i,item); @@ -93,49 +42,48 @@ void TreeItem::appendChild(TreeItem *item) //childItems.append(item); } -//! [2] -//! [3] TreeItem *TreeItem::child(int row) { return childItems.value(row); } -//! [3] -//! [4] int TreeItem::childCount() const { return childItems.count(); } -//! [4] -//! [5] int TreeItem::columnCount() const { return itemData.count(); } -//! [5] -//! [6] QVariant TreeItem::data(int column) const { return itemData.value(column); } -//! [6] void TreeItem::setData(int column, const QVariant & value) { itemData[column] = value; } -//! [7] +void TreeItem::clearChildren() +{ + qDeleteAll(childItems); + childItems.clear(); +} + +QList TreeItem::children() +{ + return childItems; +} + TreeItem *TreeItem::parent() { return parentItem; } -//! [7] -//! [8] int TreeItem::row() const { if (parentItem) @@ -143,8 +91,6 @@ int TreeItem::row() const return 0; } -//! [8] - QList TreeItem::getData() const { diff --git a/YACReaderLibrary/db/treeitem.h b/YACReaderLibrary/db/treeitem.h index fb2c0927..833f4a94 100644 --- a/YACReaderLibrary/db/treeitem.h +++ b/YACReaderLibrary/db/treeitem.h @@ -45,7 +45,6 @@ #include #include -//! [0] class TreeItem { public: @@ -66,6 +65,8 @@ public: QList comicNames; TreeItem * originalItem; void setData(int column, const QVariant &value); + void clearChildren(); + QList children(); private: QList childItems; QList itemData; diff --git a/YACReaderLibrary/db/treemodel.cpp b/YACReaderLibrary/db/treemodel.cpp index bebe9096..02a0e383 100644 --- a/YACReaderLibrary/db/treemodel.cpp +++ b/YACReaderLibrary/db/treemodel.cpp @@ -311,11 +311,33 @@ void TreeModel::setupModelData(QSqlQuery &sqlquery, TreeItem *parent) item->id = record.value("id").toULongLong(); //la inserci�n de hijos se hace de forma ordenada TreeItem * parent = items.value(record.value("parentId").toULongLong()); - if(parent !=0) //TODO if parent==0 the parent of item was removed from the DB and delete on cascade didn't work, ERROR. + //if(parent !=0) //TODO if parent==0 the parent of item was removed from the DB and delete on cascade didn't work, ERROR. parent->appendChild(item); //se a�ade el item al map, de forma que se pueda encontrar como padre en siguientes iteraciones items.insert(item->id,item); - } + } +} + +void TreeModel::updateFolderModelData(QSqlQuery &sqlquery, TreeItem *parent) +{ + while (sqlquery.next()) { + QList data; + QSqlRecord record = sqlquery.record(); + + data << record.value("name").toString(); + data << record.value("path").toString(); + data << record.value("finished").toBool(); + data << record.value("completed").toBool(); + TreeItem * item = new TreeItem(data); + + item->id = record.value("id").toULongLong(); + //la inserci�n de hijos se hace de forma ordenada + TreeItem * parent = items.value(record.value("parentId").toULongLong()); + if(parent !=0) //TODO if parent==0 the parent of item was removed from the DB and delete on cascade didn't work, ERROR. + parent->appendChild(item); + //se a�ade el item al map, de forma que se pueda encontrar como padre en siguientes iteraciones + items.insert(item->id,item); + } } void TreeModel::setupFilteredModelData() @@ -545,7 +567,57 @@ QStringList TreeModel::getSubfoldersNames(const QModelIndex &mi) return result; } -void TreeModel::fetchMore(const QModelIndex &parent) +void TreeModel::fetchMoreFromDB(const QModelIndex &parent) { + TreeItem * item; + if(parent.isValid()) + item = static_cast(parent.internalPointer()); + else + item = rootItem; + //Remove all children + beginRemoveRows(parent, 0, item->childCount()); + item->clearChildren(); + endRemoveRows(); + + QSqlDatabase db = DataBaseManagement::loadDatabase(_databasePath); + + QList items; + QList nextLevelItems; + + QSqlQuery selectQuery(db); + selectQuery.prepare("select * from folder where id <> 1 and parentId = :parentId order by parentId,name"); + + items << item; + bool firstLevelUpdate = false; + while(items.size() > 0) + { + nextLevelItems.clear(); + foreach(TreeItem * item, items) + { + selectQuery.bindValue(":parentId", item->id); + + selectQuery.exec(); + //Reload all children + if(!firstLevelUpdate) + { + beginInsertRows(parent, 0, selectQuery.numRowsAffected()); + firstLevelUpdate = true; + } + + updateFolderModelData(selectQuery,item); + + if(!firstLevelUpdate) + endInsertRows(); + + nextLevelItems << item->children(); + + } + + items.clear(); + items = nextLevelItems; + } + + db.close(); + QSqlDatabase::removeDatabase(_databasePath); } diff --git a/YACReaderLibrary/db/treemodel.h b/YACReaderLibrary/db/treemodel.h index 7a5f61f4..8a5e2f4b 100644 --- a/YACReaderLibrary/db/treemodel.h +++ b/YACReaderLibrary/db/treemodel.h @@ -87,7 +87,7 @@ public: QStringList getSubfoldersNames(const QModelIndex & mi); - void fetchMore(const QModelIndex & parent); + void fetchMoreFromDB(const QModelIndex & parent); enum Columns { Name = 0, @@ -98,6 +98,7 @@ public: private: void setupModelData( QSqlQuery &sqlquery, TreeItem *parent); + void updateFolderModelData( QSqlQuery &sqlquery, TreeItem *parent); void setupFilteredModelData( QSqlQuery &sqlquery, TreeItem *parent); void setupFilteredModelData(); diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 621cc9c7..1751c70d 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -1399,6 +1399,7 @@ void LibraryWindow::updateTreeFolder() void LibraryWindow::updateFolder(const QModelIndex & miFolder) { + QLOG_DEBUG() << "UPDATE FOLDER!!!!"; updateDestination = miFolder; importWidget->setUpdateLook(); @@ -1425,8 +1426,7 @@ void LibraryWindow::reloadAfterCopyMove() if(getCurrentFolderIndex() == updateDestination) reloadCovers(); - //TODO do not reload the whole model, just the current folder... - foldersModel->setupModelData(QDir::cleanPath(libraries.getPath(selectedLibrary->currentText())+"/.yacreaderlibrary")); + foldersModel->fetchMoreFromDB(updateDestination); enableNeededActions(); }