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, 116 insertions, 53 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
@@ -51,3 +51,3 @@ enum {
 
-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 )
@@ -103,11 +103,11 @@ InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *da
                 InstallData *newitem = new InstallData();
-        
-        newitem->option = item->option;
-        newitem->packageName = item->packageName;
-        newitem->destination = item->destination;
-        newitem->recreateLinks = item->recreateLinks;
-        
-        if ( item->option == "I" )
+
+                newitem->option = item->option;
+                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 ) );
@@ -116,3 +116,2 @@ InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *da
                 {
-                        removeList.append( newitem );
                         remove.append( QString( "   %1\n" ).arg( item->packageName ) );
@@ -121,14 +120,14 @@ InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *da
                 {
-            updateList.append( newitem );
-            QString type;
-            if ( item->option == "R" )
-                type = tr( "(ReInstall)" );
-            else
-                type = tr( "(Upgrade)" );
-            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 ) );
+                        QString type;
+                        if ( item->option == "R" )
+                                type = tr( "(ReInstall)" );
+                        else
+                                type = tr( "(Upgrade)" );
+                        upgrade.append( QString( "   %1 %2\n" ).arg( item->packageName ).arg( type ) );
+                }
+        }
 
-    displayAvailableSpace( destination->currentText() );
+        output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) );
+
+        displayAvailableSpace( destination->currentText() );
 }
@@ -270,2 +269,3 @@ void InstallDlgImpl :: installSelected()
         connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
+        connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished()));
         pIpkg->runIpkg();
@@ -291,5 +291,10 @@ void InstallDlgImpl :: installSelected()
         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" );
+/*        
+                pIpkg->setOption( "remove" );
         QListIterator<InstallData> it( removeList );
@@ -344,14 +349,4 @@ void InstallDlgImpl :: installSelected()
         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() );
 }
@@ -402 +397,70 @@ void InstallDlgImpl :: displayAvailableSpace( const QString &text )
 
+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
@@ -47,3 +47,3 @@ class InstallDlgImpl : public QWidget
 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 );
@@ -57,5 +57,4 @@ private:
     DataManager *dataMgr;
-    QList<InstallData> installList;
-    QList<InstallData> removeList;
-    QList<InstallData> updateList;
+    QList<InstallData> packages;
+        bool firstPackage;
     int flags;
@@ -83,2 +82,3 @@ public slots:
     void displayAvailableSpace( const QString &text);
+        void ipkgFinished();
 };
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
@@ -57,6 +57,5 @@ Ipkg :: ~Ipkg()
 // dir is the directory to run ipkg in (defaults to "")
-bool Ipkg :: runIpkg( )
+void Ipkg :: runIpkg()
 {
     error = false;
-    bool ret = false;
     QStringList commands;
@@ -139,7 +138,8 @@ bool Ipkg :: runIpkg( )
 
-    ret = executeIpkgCommand( commands, option );
+    executeIpkgCommand( commands, option );
 
-    if ( aborted )
-        return false;
+}
 
+void Ipkg :: createSymLinks()
+{
     if ( option == "install" || option == "reinstall" || option == "upgrade" )
@@ -173,3 +173,2 @@ bool Ipkg :: runIpkg( )
     emit outputText( "" );
-    return ret;
 }
@@ -297,6 +296,2 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
     }
-
-    // Now wait for it to finish
-    while ( !finished )
-        qApp->processEvents();
 }
@@ -356,2 +351,4 @@ void Ipkg::processFinished()
     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
@@ -45,3 +45,4 @@ public:
     ~Ipkg();
-    bool runIpkg( );
+        void runIpkg();
+        void createSymLinks();
 
@@ -56,2 +57,3 @@ signals:
     void outputText( const QString &text );
+        void ipkgFinished();
 
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
@@ -299,3 +299,3 @@ void MainWindow :: init()
 }
-/*
+
 void MainWindow :: setDocument( const QString &doc )
@@ -329,3 +329,3 @@ void MainWindow :: setDocument( const QString &doc )
 }
-*/
+
 void MainWindow :: displaySettings()
@@ -994,3 +994,3 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
     {
-        InstallData *newitem = new InstallData();;
+        InstallData *newitem = new InstallData();
         newitem->option = "I";
@@ -1001,3 +1001,3 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
     {
-        InstallData *newitem = new InstallData();;
+        InstallData *newitem = new InstallData();
         newitem->option = "D";
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
@@ -108,3 +108,3 @@ private:
 public slots:
-//    void setDocument( const QString &doc );
+    void setDocument( const QString &doc );
     void displayFindBar();