Changed launcher to only add/remove icons/tabs that have changed when removable

media is mounted/unmounted. A card insert on my machine used to take 7500ms.
It now takes 548ms. Same with card removal.
Old code has been left as is an can be re-enabled with a simple comment.

2 files changed, 91 insertions, 2 deletions

diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index 92b8c25..59dd721 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -316,38 +316,126 @@ void DocumentList::linkChanged( QString arg )
 	DocLnk* dl = new DocLnk( arg );
 	if ( d->store( dl ) ) {
 	    // Add if it's a link we are interested in
         //odebug << "add case" << oendl;
 	    add( *dl );
 	}
 
     }
 }
 
 void DocumentList::restoreDone()
 {
     reloadAppLnks();
     reloadDocLnks();
 }
 
+void DocumentList::DiffAppLnks()
+{
+    static AppLnkSet *appLnkSet2;
+
+    appLnkSet2 = new AppLnkSet( MimeType::appsFolderName() );
+
+    if ( d->sendAppLnks && d->serverGui ) {
+	static QStringList prevTypeList = appLnkSet->types();
+	QStringList types = appLnkSet2->types();
+	for ( QStringList::Iterator ittypes=types.begin(); ittypes!=types.end(); ++ittypes) {
+	    if ( !(*ittypes).isEmpty() ) {
+		if ( !prevTypeList.contains(*ittypes) ) {
+		    QString name = appLnkSet2->typeName(*ittypes);
+		    QPixmap pm = appLnkSet2->typePixmap(*ittypes);
+		    QPixmap bgPm = appLnkSet2->typeBigPixmap(*ittypes);
+
+		    if (pm.isNull()) {
+			QImage img( Resource::loadImage( "UnknownDocument" ) );
+			pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
+			bgPm = img.smoothScale( AppLnk::bigIconSize(), AppLnk::bigIconSize() );
+		    }
+
+            odebug << "adding type " << (*ittypes) << "" << oendl;
+
+		    // ### our current launcher expects docs tab to be last
+		    d->serverGui->typeAdded( *ittypes, name.isNull() ? (*ittypes) : name, pm, bgPm );
+		}
+		prevTypeList.remove(*ittypes);
+	    }
+	}
+	for ( QStringList::Iterator ittypes=prevTypeList.begin(); ittypes!=prevTypeList.end(); ++ittypes) {
+        odebug << "removing type " << (*ittypes) << "" << oendl;
+	    d->serverGui->typeRemoved(*ittypes);
+	}
+	prevTypeList = types;
+    }
+
+
+    QListIterator<AppLnk> it1( appLnkSet->children() );
+    QListIterator<AppLnk> it2( appLnkSet2->children() );
+
+    AppLnk *i;
+    AppLnk *j;
+    bool found;
+
+    while ( (j=it2.current()) ) {
+	it1 = appLnkSet->children();
+	found = false;
+	while ( (i=it1.current()) ){
+	    if (strcmp(i->name().ascii(),j->name().ascii()) == 0)
+		found = true;
+	    ++it1;
+	}
+	if (!found) {
+	    qDebug("Item %s needs to be added",j->name().ascii() );
+	    d->serverGui->applicationAdded( j->type(), *j );
+	}		    
+	    ++it2; 
+    }
+
+    it1 = appLnkSet->children();
+     while ( (i=it1.current()) ) {
+	it2 = appLnkSet2->children();
+	found = false;
+	while ( (j=it2.current()) ){
+	    if (strcmp(i->name().ascii(),j->name().ascii()) == 0)
+		found = true;
+	    ++it2;
+	}
+	if (!found) {
+	    qDebug("Item %s needs to be removed",i->name().ascii() );
+	    d->serverGui->applicationRemoved( i->type(), *i );
+	}
+		    
+	    ++it1; 
+    }
+    
+    delete appLnkSet;
+    appLnkSet = appLnkSet2;
+
+}
 void DocumentList::storageChanged()
 {
+    QTime t;
     // ### can implement better
-    reloadAppLnks();
+
+    t.start();
+    DiffAppLnks();
+//    reloadAppLnks();
+    qDebug("Reload App links took %i ms",t.elapsed() );
     reloadDocLnks();
-    // ### Optimization opportunity
+//    odebug << "Reload links took " << t.elapsed() << " ms " << oendl;
+    qDebug("Reload All links took %i ms",t.elapsed() );
+// ### Optimization opportunity
     // Could be a bit more intelligent and somehow work out which
     // mtab entry has changed and then only scan that and add and remove
     // links appropriately.
 //    rescan();
 }
 
 void DocumentList::sendAllDocLinks()
 {
     if ( d->tid != 0 ) {
 	// We are in the middle of scanning, set a flag so
 	// we do this when we finish our scanning
 	d->needToSendAllDocLinks = true;
 	return;
     }
 
     QString contents;
diff --git a/core/launcher/documentlist.h b/core/launcher/documentlist.h
index bd5c031..232bb6a 100644
--- a/core/launcher/documentlist.h
+++ b/core/launcher/documentlist.h
@@ -29,32 +29,33 @@ class DocumentListPrivate;
 class ServerInterface;
 
 class DocumentList : public QObject {
     Q_OBJECT
 public:
     DocumentList( ServerInterface *serverGui, bool scanDocs = TRUE,
 		  QObject *parent = 0, const char *name = 0 );
     ~DocumentList();
 
     void linkChanged( QString link );
     void restoreDone();
     void storageChanged();
     void sendAllDocLinks();
 
     void reloadAppLnks();
     void reloadDocLnks();
+    void DiffAppLnks();
 
 // Orig DocList stuff
     void start();
     void pause();
     void resume();
     void rescan();
 
     static AppLnkSet *appLnkSet;
 
 /*
     void resend();
 signals:
     void added( const DocLnk& doc );
     void removed( const DocLnk& doc );
     void changed( const DocLnk& oldDoc, const DocLnk& newDoc );
     void allRemoved();