FCL/sf/app/files: comparison filemanager/src/filemanager/src/fmfindresultmodel.cpp

equal deleted inserted replaced

-:15bc28c9dd51
+:d58987eac7e8
 */
 #include "fmfindresultmodel.h"
 #include "fmfindthread.h"
 #include "fmfileiconprovider.h"
+#include "fmcommon.h"
 #include <QDateTime>
 #include <hbglobal.h>
+// wait \a circularWaitingTimeForStartFind microsecond to try to start find again
+// Since find can not be started while last find is not stopped.
+const int circularWaitingTimeForStartFind = 200;
+// wait \a firstWaitingTimeForStartFind microsecond to start find when accept find from caller.
+// Means user can continuously input words for search, so that find will not immediately start after accept each input event.
+// Search will be started after \a firstWaitingTimeForStartFind time of last user input
+const int firstWaitingTimeForStartFind = 750;
 /*!
 \fn void finished()
 This signal is emitted when find is finished.
 */
 */
 FmFindResultModel::FmFindResultModel( QObject *parent )
 : QAbstractListModel( parent )
 {
+FM_LOG("FmFindResultModel::FmFindResultModel");
 init();
-connect( mFindThread, SIGNAL(finished()), this, SIGNAL(finished()) );
+connect( mFindThread, SIGNAL( finished()), this, SLOT(onThreadFinished()) );
 	connect( mFindThread, SIGNAL(found(QStringList)), this, SLOT(on_findThread_found( QStringList) ), Qt::BlockingQueuedConnection );
+connect( &mTimer, SIGNAL(timeout()), this, SLOT(startFind()));
 }
 FmFindResultModel::~FmFindResultModel()
 {
+FM_LOG("FmFindResultModel::~FmFindResultModel START");
+mFindThread->stop();
+if( mFindThread->isRunning() ) {
+mStopEventLoop.exec();
+}
 	delete mIconProvider;
+FM_LOG("FmFindResultModel::~FmFindResultModel END");
+}
+/*!
+Send find \a regExp and \a pathList to find queue
+last un-stopped find will be stopped and start new find in 0 - 2 seconeds.
+*/
+void FmFindResultModel::find( const QRegExp &regExp, const QStringList &pathList )
+{
+mFindPath   = pathList;
+mRegExp     = regExp;
+mTimer.stop();
+	if (mFindThread->isRunning()) {
+mFindThread->stop();
+}
+mTimer.start( firstWaitingTimeForStartFind );
+}
+/*!
+Internal start entrance, will be triggered by timer
+Wait till last find stopped and start new find.
+*/
+void FmFindResultModel::startFind()
+{
+mTimer.stop();
+if (mFindThread->isRunning()) {
+mFindThread->stop();
+mTimer.start( circularWaitingTimeForStartFind );
+		return;
+}
+// Find starting. Initialize context.
+mFindThread->setFindPathList( mFindPath );
+mFindThread->setPattern( mRegExp );
+	removeRows( 0, rowCount() );
+emit findStarted();
+mFindThread->start();
+}
+/*!
+Return if find is inprogress
+*/
+bool FmFindResultModel::isFinding() const
+{
+return mFindThread->isRunning();
+}
+/*!
+Stop find
+*/
+void FmFindResultModel::stopFind()
+{
+mFindThread->stop();
+if( mFindThread->isRunning() ) {
+mStopEventLoop.exec();
+}
+}
+/*
+Find finish slot.
+*/
+void FmFindResultModel::onThreadFinished()
+{
+FM_LOG("FmFindResultModel::onThreadFinished");
+// close event loop so that blocked destructor and stopFind() can be released.
+mStopEventLoop.exit();
+emit findFinished();
 }
 /*!
 Returns the number of rows in the model. This value corresponds to the
 number of items in the model's internal string list.
 return mFindResult.count();
 return 0;
 }
+/*!
+Get model column count
+*/
 int FmFindResultModel::columnCount( const QModelIndex &parent ) const
 {
 if ( !parent.isValid() )
 return 4;
 return 0;
 }
+/*!
+Get model data
+*/
 QVariant FmFindResultModel::data( const QModelIndex &index, int role ) const
 {
 if (!indexValid( index ))
 return QVariant();
 }
 return QVariant();
 }
+/*!
+Get filePath by \a index
+*/
 QString FmFindResultModel::filePath ( const QModelIndex & index ) const
 {
 return fileInfo( index ).filePath();
 }
+/*!
+Get header data by column number \a section
+*/
 QVariant FmFindResultModel::headerData( int section, Qt::Orientation orientation, int role ) const
 {
 if (orientation == Qt::Horizontal) {
 if (role != Qt::DisplayRole)
 return QVariant();
 emit modelCountChanged( rowCount() );
 	return true;
 }
+/*!
+Get QFileInfo by \a index
+*/
 QFileInfo FmFindResultModel::fileInfo( const QModelIndex &index ) const
 {
 if (index.row() >= 0 && index.row() < mFindResult.size())
 return QFileInfo( mFindResult[index.row()] );
 else
 return QFileInfo();
 }
-QString FmFindResultModel::findPath() const
-{
-return mFindThread->findPath();
-}
-void FmFindResultModel::setFindPath( const QString &path )
-{
-mFindThread->setFindPath( path );
-}
-QRegExp FmFindResultModel::pattern() const
-{
-return mFindThread->pattern();
-}
-void FmFindResultModel::setPattern( const QRegExp &regExp )
-{
-mFindThread->setPattern( regExp );
-}
-void FmFindResultModel::find()
-{
-	if(mFindThread->isRunning())
-		return;
-if( findPath().isEmpty() ){
-mFindThread->setLastResult( mFindResult );
-}
-	removeRows( 0, rowCount() );
-mFindThread->start();
-}
-void FmFindResultModel::stop()
-{
-mFindThread->stop();
-mFindThread->wait();
-}
-bool FmFindResultModel::isFinding() const
-{
-return mFindThread->isRunning();
-}
 /*
 Receive \a dataList as some found result
 Then insert dataList to model
 */
 void FmFindResultModel::on_findThread_found( const QStringList &dataList )
 		return;
 }
 insertRows( rowCount(), dataList );
 }
+/*
+Get if \a index is valid
+*/
 bool FmFindResultModel::indexValid( const QModelIndex &index ) const
 {
-Q_UNUSED( index );
+if( ( index.row() < 0 ) || ( index.row() >= rowCount() ) ) {
-return true;
+return false;
-}
+} else if( ( index.column() < 0 ) || ( index.column() >= columnCount() ) ) {
+return false;
+} else {
+return true;
+}
+}
+/*
+Init model
+*/
 void FmFindResultModel::init()
 {
 mFindThread = new FmFindThread( this );
 mFindThread->setObjectName( "findThread" );
 mIconProvider = new FmFileIconProvider();
 }
+/*
+Sort by name
+*/
 bool FmFindResultModel::caseNameLessThan(const QPair<QString,int> &s1,
 const QPair<QString,int> &s2)
 {
 QFileInfo info1( s1.first );
 QFileInfo info2( s2.first );
 return info1.fileName() < info2.fileName();
 }
+/*
+Sort by time
+*/
 bool FmFindResultModel::caseTimeLessThan(const QPair<QString,int> &s1,
 const QPair<QString,int> &s2)
 {
 QFileInfo info1( s1.first );
 QFileInfo info2( s2.first );
 return info1.lastModified() < info2.lastModified();
 }
+/*
+Sort by size
+*/
 bool FmFindResultModel::caseSizeLessThan(const QPair<QString,int> &s1,
 const QPair<QString,int> &s2)
 {
 QFileInfo info1( s1.first );
 QFileInfo info2( s2.first );
 return info1.size() < info2.size();
 }
+/*
+Sort by type
+*/
 bool FmFindResultModel::caseTypeLessThan(const QPair<QString,int> &s1,
 const QPair<QString,int> &s2)
 {
 QFileInfo info1( s1.first );
 QFileInfo info2( s2.first );

changeset 46	d58987eac7e8
parent 37	15bc28c9dd51