1. Fix for bug #872 - reduce CPU useage while ipkg is doing its thing 2. Re-enable setDocument function for identifying local ipks

6 files changed, 98 insertions, 35 deletions

diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index 76d0a80..896e370 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -49,7 +49,7 @@ enum {
 	MAXLINES = 100,
 };
 
-InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *dataManager, const char *title )
+InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title )
     : QWidget( 0, 0, 0 )
 {
     setCaption( title );
@@ -106,20 +106,18 @@ InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *da
         newitem->packageName = item->packageName;
         newitem->destination = item->destination;
         newitem->recreateLinks = item->recreateLinks;
+		packages.append( newitem );
         
         if ( item->option == "I" )
 		{
-			installList.append( newitem );
 			install.append( QString( "   %1\n" ).arg( item->packageName ) );
 		}
 		else if ( item->option == "D" )
 		{
-			removeList.append( newitem );
 			remove.append( QString( "   %1\n" ).arg( item->packageName ) );
 		}
 		else if ( item->option == "U" || item->option == "R" )
 		{
-            updateList.append( newitem );
             QString type;
             if ( item->option == "R" )
                 type = tr( "(ReInstall)" );
@@ -128,6 +126,7 @@ InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *da
             upgrade.append( QString( "   %1 %2\n" ).arg( item->packageName ).arg( type ) );
         }
     }
+
     output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) );
 
     displayAvailableSpace( destination->currentText() );
@@ -268,6 +267,7 @@ void InstallDlgImpl :: installSelected()
     {
         output->setText( "" );
         connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
+        connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished()));
         pIpkg->runIpkg();
     }
     else
@@ -289,8 +289,13 @@ void InstallDlgImpl :: installSelected()
 
         pIpkg = new Ipkg;
         connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
+        connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished()));
+
+		firstPackage = TRUE;
+		ipkgFinished();
 
         // First run through the remove list, then the install list then the upgrade list
+/*        
         pIpkg->setOption( "remove" );
         QListIterator<InstallData> it( removeList );
         InstallData *idata;
@@ -342,18 +347,8 @@ void InstallDlgImpl :: installSelected()
 
         delete pIpkg;
         pIpkg = 0;
+*/
     }
-
-    btnOptions->setEnabled( true );
-//    btnInstall->setEnabled( true );
-    btnInstall->setText( tr( "Close" ) );
-    btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
-    
-    btnOptions->setText( tr( "Save output" ) );
-    btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
-
-    if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
-        displayAvailableSpace( destination->currentText() );
 }
 
 
@@ -400,3 +395,72 @@ void InstallDlgImpl :: displayAvailableSpace( const QString &text )
         txtAvailableSpace->setText( space );
 }
 
+void InstallDlgImpl :: ipkgFinished()
+{
+	InstallData *item;
+	if ( firstPackage )
+		item = packages.first();
+	else
+	{
+		// Create symlinks if necessary before moving on to next package
+		pIpkg->createSymLinks();
+
+		item = packages.next();
+	}
+
+	firstPackage = FALSE;
+	if ( item )
+	{
+		pIpkg->setPackage( item->packageName );
+		int tmpFlags = flags;
+
+		if ( item->option == "I" )
+		{
+			pIpkg->setOption( "install" );
+			Destination *d = dataMgr->getDestination( destination->currentText() );
+			pIpkg->setDestination( d->getDestinationName() );
+			pIpkg->setDestinationDir( d->getDestinationPath() );
+		
+			if ( d->linkToRoot() )
+				tmpFlags |= MAKE_LINKS;
+		}
+		else if ( item->option == "D" )
+		{
+			pIpkg->setOption( "remove" );
+			pIpkg->setDestination( item->destination->getDestinationName() );
+			pIpkg->setDestinationDir( item->destination->getDestinationPath() );
+
+			if ( item->destination->linkToRoot() )
+				tmpFlags |= MAKE_LINKS;
+		}
+		else
+		{
+			if ( item->option == "R" )
+				pIpkg->setOption( "reinstall" );
+			else
+				pIpkg->setOption( "upgrade" );
+			
+			pIpkg->setDestination( item->destination->getDestinationName() );
+			pIpkg->setDestinationDir( item->destination->getDestinationPath() );
+			pIpkg->setPackage( item->packageName );
+
+			tmpFlags |= FORCE_REINSTALL;
+			if ( item->destination->linkToRoot() && item->recreateLinks )
+				tmpFlags |= MAKE_LINKS;
+		}
+		pIpkg->setFlags( tmpFlags, infoLevel );
+		pIpkg->runIpkg();
+	}
+	else
+	{
+		btnOptions->setEnabled( true );
+		btnInstall->setText( tr( "Close" ) );
+		btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
+
+		btnOptions->setText( tr( "Save output" ) );
+		btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
+
+		if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
+			displayAvailableSpace( destination->currentText() );
+	}
+}
\ No newline at end of file
diff --git a/noncore/settings/aqpkg/installdlgimpl.h b/noncore/settings/aqpkg/installdlgimpl.h
index 15cf427..9a7dbff 100644
--- a/noncore/settings/aqpkg/installdlgimpl.h
+++ b/noncore/settings/aqpkg/installdlgimpl.h
@@ -45,7 +45,7 @@ class InstallDlgImpl : public QWidget
 {
     Q_OBJECT
 public:
-    InstallDlgImpl( QList<InstallData> &packageList, DataManager *dataManager, const char *title = 0 );
+    InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title = 0 );
     InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title = 0 );
     ~InstallDlgImpl();
 
@@ -55,9 +55,8 @@ protected:
 
 private:
     DataManager *dataMgr;
-    QList<InstallData> installList;
-    QList<InstallData> removeList;
-    QList<InstallData> updateList;
+    QList<InstallData> packages;
+	bool firstPackage;
     int flags;
     int infoLevel;
     Ipkg *pIpkg;
@@ -81,6 +80,7 @@ public slots:
     void installSelected();
     void displayText(const QString &text );
     void displayAvailableSpace( const QString &text);
+	void ipkgFinished();
 };
 
 #endif
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index e906653..34999ad 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -55,10 +55,9 @@ Ipkg :: ~Ipkg()
 // destDir is the dir that the destination alias points to (used to link to root)
 // flags is the ipkg options flags
 // dir is the directory to run ipkg in (defaults to "")
-bool Ipkg :: runIpkg( )
+void Ipkg :: runIpkg()
 {
     error = false;
-    bool ret = false;
     QStringList commands;
 
     QDir::setCurrent( "/tmp" );
@@ -137,11 +136,12 @@ bool Ipkg :: runIpkg( )
     dependantPackages = new QList<QString>;
     dependantPackages->setAutoDelete( true );
 
-    ret = executeIpkgCommand( commands, option );
+    executeIpkgCommand( commands, option );
 
-    if ( aborted )
-        return false;
+}
 
+void Ipkg :: createSymLinks()
+{
     if ( option == "install" || option == "reinstall" || option == "upgrade" )
     {
         // If we are not removing packages and make links option is selected
@@ -171,7 +171,6 @@ bool Ipkg :: runIpkg( )
 
     emit outputText( "Finished" );
     emit outputText( "" );
-    return ret;
 }
 
 void Ipkg :: removeStatusEntry()
@@ -295,10 +294,6 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
     {
         emit outputText( QString( "Couldn't start ipkg process" ) );
     }
-
-    // Now wait for it to finish
-    while ( !finished )
-        qApp->processEvents();
 }
 
 void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
@@ -354,6 +349,8 @@ void Ipkg::processFinished()
     delete proc;
     proc = 0;
     finished = true;
+
+	emit ipkgFinished();
 }
 
 
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index 531bfc0..a0d38e3 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
@@ -43,7 +43,8 @@ class Ipkg : public QObject
 public:
     Ipkg();
     ~Ipkg();
-    bool runIpkg( );
+	void runIpkg();
+	void createSymLinks();
 
     void setOption( const char *opt )               { option = opt; }
     void setPackage( const char *pkg )              { package = pkg; }
@@ -54,6 +55,7 @@ public:
 
 signals:
     void outputText( const QString &text );
+	void ipkgFinished();
 
 public slots:
     void commandStdout(OProcess*, char *buffer, int buflen);
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 1aec6a8..58f6feb 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -297,7 +297,7 @@ void MainWindow :: init()
 
     stack->raiseWidget( networkPkgWindow );
 }
-/*
+
 void MainWindow :: setDocument( const QString &doc )
 {
     // Remove path from package
@@ -327,7 +327,7 @@ void MainWindow :: setDocument( const QString &doc )
         }
     }
 }
-*/
+
 void MainWindow :: displaySettings()
 {
     SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true );
@@ -992,14 +992,14 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
     QString dest = "root";
     if ( !p->isInstalled() )
     {
-        InstallData *newitem = new InstallData();;
+        InstallData *newitem = new InstallData();
         newitem->option = "I";
         newitem->packageName = name;
         return newitem;
     }
     else
     {
-        InstallData *newitem = new InstallData();;
+        InstallData *newitem = new InstallData();
         newitem->option = "D";
         if ( !p->isPackageStoredLocally() )
             newitem->packageName = p->getInstalledPackageName();
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index 0295519..c4548b1 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -106,7 +106,7 @@ private:
     void initProgressWidget();
     
 public slots:
-//    void setDocument( const QString &doc );
+    void setDocument( const QString &doc );
     void displayFindBar();
     void displayJumpBar();
     void repeatFind();