From 236b0ce2b4bc73efc2d45c28ca6de18a513d5816 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 22 Apr 2018 17:57:14 +0200
Subject: [PATCH] re-enabled search while typing, now that it is fast enough

---
 .../src/gui/FileTransfer/SharedFilesDialog.cpp | 18 ++++++++----------
 retroshare-gui/src/gui/RemoteDirModel.cpp      |  2 ++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index ee75f29aa..a1df23308 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -943,7 +943,7 @@ void SharedFilesDialog::restoreExpandedPathsAndSelection(const std::set<std::str
 
 void SharedFilesDialog::expandAll()
 {
-    if(ui.dirTreeView->model() == NULL)
+    if(ui.dirTreeView->model() == NULL || ui.dirTreeView->model() == flat_proxyModel)	// this method causes infinite loops on flat models
         return ;
 
     ui.dirTreeView->blockSignals(true) ;
@@ -956,7 +956,6 @@ void SharedFilesDialog::expandAll()
         std::string path = ui.dirTreeView->model()->index(row,0).data(Qt::DisplayRole).toString().toStdString();
         recursExpandAll(ui.dirTreeView->model()->index(row,0));
     }
-    //QItemSelection selection ;
 
     ui.dirTreeView->blockSignals(false) ;
 
@@ -972,14 +971,6 @@ void SharedFilesDialog::recursExpandAll(const QModelIndex& index)
 
 		if(ui.dirTreeView->model()->rowCount(idx) > 0)
 			recursExpandAll(idx) ;
-
-//		QModelIndex midx = proxyModel->mapToSource(idx) ;
-//
-//		if (!midx.isValid())
-//			continue ;
-//
-//		if (model->getType(midx) != DIR_TYPE_FILE)
-//			recursExpandAll(idx) ;
 	}
 }
 
@@ -1332,6 +1323,7 @@ void SharedFilesDialog::onFilterTextEdited()
 	ui.filterStartButton->setEnabled(true) ;
 	ui.filterPatternFrame->setToolTip(QString());
 
+	FilterItems();
 #ifndef DISABLE_SEARCH_WHILE_TYPING
 	mFilterTimer->start( 500 ); // This will fire filterRegExpChanged after 500 ms.
 	// If the user types something before it fires, the timer restarts counting
@@ -1519,11 +1511,15 @@ void SharedFilesDialog::FilterItems()
 
 	if(mLastFilterText == text)	// do not filter again if we already did. This is an optimization
 	{
+#ifdef DEBUG_SHARED_FILES_DIALOG
 		std::cerr << "Last text is equal to text. skipping" << std::endl;
+#endif
 		return ;
 	}
 
+#ifdef DEBUG_SHARED_FILES_DIALOG
 	std::cerr << "New last text. Performing the filter on string \"" << text.toStdString() << "\"" << std::endl;
+#endif
 	mLastFilterText = text ;
 
 	QCursorContextBlocker q(ui.dirTreeView) ;
@@ -1563,7 +1559,9 @@ void SharedFilesDialog::FilterItems()
 	else
 		ui.filterPatternFrame->setToolTip(tr("Found %1 results.").arg(found)) ;
 
+#ifdef DEBUG_SHARED_FILES_DIALOG
 	std::cerr << found << " results found by search." << std::endl;
+#endif
 }
 
 #ifdef DEPRECATED_CODE
diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp
index fddfbb404..6f7608e77 100644
--- a/retroshare-gui/src/gui/RemoteDirModel.cpp
+++ b/retroshare-gui/src/gui/RemoteDirModel.cpp
@@ -1524,7 +1524,9 @@ void RetroshareDirModel::filterItems(const std::list<std::string>& keywords,uint
 		std::cerr << std::endl;
 #endif
 	}
+#ifdef RDM_SEARCH_DEBUG
 	std::cerr << mFilteredPointers.size() << " pointers in filter set." << std::endl;
+#endif
 }