A bit more background threading magic.

Make lumina-fm show dir contents a *lot* faster now.

4 files changed, 54 insertions, 49 deletions

diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
index a3a8f7ee..50099a51 100644
--- a/src-qt5/desktop-utils/lumina-fm/Browser.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
@@ -152,7 +152,7 @@ void Browser::loadDirectory(QString dir, bool force){
     QStringList files;
     if(showHidden){ files = directory.entryList( QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot, QDir::NoSort); }
     else{ files = directory.entryList( QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot, QDir::NoSort); }
-    if(dirupdate){ emit itemsLoading(files.length()); }
+    if(dirupdate || old.isEmpty()){ emit itemsLoading(files.length()); }
     //qDebug() << "Files Found:" << files.length();
     for(int i=0; i<files.length(); i++){
       watcher->addPath(directory.absoluteFilePath(files[i]));
diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
index 978992c1..c4b1c8d8 100644
--- a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
@@ -9,6 +9,7 @@
 #include <QVBoxLayout>
 #include <QTimer>
 #include <QSettings>
+#include <QtConcurrent>
 
 #include <LUtils.h>
 #include <LuminaOS.h>
@@ -310,42 +311,39 @@ void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo *info){
   int num = 0;
   if(listWidget!=0){
     //LIST WIDGET - name and icon only
+    QListWidgetItem *it = 0;
+    //Find the existing item for this
     if(info->isDesktopFile() && info->XDG()->isValid()){
       QList<QListWidgetItem*> items = listWidget->findItems(info->XDG()->name, Qt::MatchExactly);
       //Could be multiple items with the same text in this case - check paths as well
-      bool found = false;
-      for(int i=0; i<items.length() && !found; i++){
-        if(items[i]->whatsThis()==info->absoluteFilePath()){
-          found = true;
-          items[i]->setText(info->XDG()->name);
-          items[i]->setIcon(ico);
-        }
-      }
-      if(!found){
-        //New Item
-        QListWidgetItem *it = new CQListWidgetItem(ico, info->XDG()->name, listWidget);
-          it->setWhatsThis(info->absoluteFilePath());
-          it->setData(Qt::UserRole, (info->isDir() ? "dir" : "file")); //used for sorting
-        listWidget->addItem(it);
+      for(int i=0; i<items.length() && it==0; i++){
+        if(items[i]->whatsThis()==info->absoluteFilePath()){ it = items[i]; }
       }
     }else{
       //non-desktop entry
-      if(!listWidget->findItems(info->fileName(), Qt::MatchExactly).isEmpty()){
-        //Update existing item
-        QListWidgetItem *it = listWidget->findItems(info->fileName(), Qt::MatchExactly).first();
-        it->setText(info->fileName());
-        it->setWhatsThis(info->absoluteFilePath());
-        it->setIcon(ico);
-
-      }else{
-        //New item
-        QListWidgetItem *it = new CQListWidgetItem(ico, info->fileName(), listWidget);
+      QList<QListWidgetItem*> items = listWidget->findItems(info->fileName(), Qt::MatchExactly);
+      //Could be multiple items with the same text in this case - check paths as well
+      for(int i=0; i<items.length() && it==0; i++){
+        if(items[i]->whatsThis()==info->absoluteFilePath()){ it = items[i]; }
+      }
+    }
+    //No existing item - make a new one
+    if(it==0){
+      it = new CQListWidgetItem(ico, info->fileName(), listWidget);
           it->setWhatsThis(info->absoluteFilePath());
           it->setData(Qt::UserRole, (info->isDir() ? "dir" : "file")); //used for sorting
         listWidget->addItem(it);
-      }
-      num = listWidget->count();
-    } //end non-desktop entry
+    }
+    num = listWidget->count();
+    //Now update the information for the item
+    if(info->isDesktopFile() && info->XDG()->isValid()){
+      it->setText(info->XDG()->name);
+      it->setIcon(ico);
+    }else{
+      it->setIcon(ico);
+      it->setText(info->fileName());
+    }
+
   }else if(treeWidget!=0){
     QTreeWidgetItem *it = 0;
     if(info->isDesktopFile()){
@@ -392,11 +390,11 @@ void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo *info){
     it->setWhatsThis(4, info->created().toString("yyyyMMddhhmmsszzz") ); //sorts by this actually
     num = treeWidget->topLevelItemCount();
   }
-
   if(num < numItems){
     //Still loading items
-    //this->setEnabled(false);
+    this->setEnabled(false);
   }else{
+    //qDebug() << "Got Items Loaded:" << num << numItems;
     if(freshload && treeWidget!=0){
       //qDebug() << "Resize Tree Widget Contents";
       //for(int i=treeWidget->columnCount()-1; i>0; i--){ treeWidget->resizeColumnToContents(i); }
@@ -404,8 +402,30 @@ void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo *info){
       //treeWidget->resizeColumnToContents(0);
     }
     freshload = false; //any further changes are updates - not a fresh load of a dir
+    QtConcurrent::run(this, &BrowserWidget::loadStatistics, this);
+    //QTimer::singleShot(0, this, SLOT(loadStatistics()));
     //Done loading items
-    //this->setEnabled(true);
+    this->setEnabled(true);
+
+  }//end check for finished loading items
+}
+
+void BrowserWidget::itemsLoading(int total){
+  //qDebug() << "Got number of items loading:" << total;
+  if(listWidget!=0){ listWidget->setWhatsThis( BROWSER->currentDirectory() ); }
+  if(treeWidget!=0){ treeWidget->setWhatsThis(BROWSER->currentDirectory() ); }
+  numItems = total; //save this for later
+  if(total<1){
+    emit updateDirectoryStatus( tr("No Directory Contents") );
+    this->setEnabled(true);
+  }
+}
+
+void BrowserWidget::selectionChanged(){
+  emit hasFocus(ID); //let the parent know the widget is "active" with the user
+}
+
+void BrowserWidget::loadStatistics(BrowserWidget* bw){
     //Assemble any status message
     QString stats = QString(tr("Capacity: %1")).arg(LOS::FileSystemCapacity(BROWSER->currentDirectory()));
     int nF, nD;
@@ -443,24 +463,8 @@ void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo *info){
         stats.prepend( QString(tr("Dirs: %1")).arg(QString::number(nD)) );
       }
     }
-    emit updateDirectoryStatus( stats.simplified() );
+    bw->emit updateDirectoryStatus( stats.simplified() );
     statustip = stats.simplified(); //save for later
-  }//end check for finished loading items
-}
-
-void BrowserWidget::itemsLoading(int total){
-  //qDebug() << "Got number of items loading:" << total;
-  if(listWidget!=0){ listWidget->setWhatsThis( BROWSER->currentDirectory() ); }
-  if(treeWidget!=0){ treeWidget->setWhatsThis(BROWSER->currentDirectory() ); }
-  numItems = total; //save this for later
-  if(total<1){
-    emit updateDirectoryStatus( tr("No Directory Contents") );
-    this->setEnabled(true);
-  }
-}
-
-void BrowserWidget::selectionChanged(){
-  emit hasFocus(ID); //let the parent know the widget is "active" with the user
 }
 
 void BrowserWidget::resizeEvent(QResizeEvent *ev){
diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.h b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.h
index 38e7b10c..2f8c3ed7 100644
--- a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.h
+++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.h
@@ -79,6 +79,7 @@ private slots:
 	void itemDataAvailable(QIcon, LFileInfo*);
 	void itemsLoading(int total);
 	void selectionChanged();
+	void loadStatistics(BrowserWidget *bw); //designed to be run in a background thread
 
 protected:
 	void resizeEvent(QResizeEvent *ev);
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
index ccae4087..6f384cfa 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
@@ -628,7 +628,7 @@ void DirWidget::UpdateContextMenu(){
 }
 
 void DirWidget::currentDirectoryChanged(QString cur, bool widgetonly){
-  qDebug() << "Got current directory changed:" << cur << widgetonly;
+  //qDebug() << "Got current directory changed:" << cur << widgetonly;
   QFileInfo info(cur);
   canmodify = info.isWritable();
   if(widgetonly){ ui->label_status->setText(currentBrowser()->status()); }