1.6 Beta - Changed ipg process to use OProcess instead of popen for async io

3 files changed, 110 insertions, 31 deletions

diff --git a/noncore/settings/aqpkg/global.h b/noncore/settings/aqpkg/global.h
index e1a4ed4..cec9aa5 100644
--- a/noncore/settings/aqpkg/global.h
+++ b/noncore/settings/aqpkg/global.h
@@ -20,3 +20,3 @@
 
-#define VERSION_TEXT "AQPkg Version 1.5"
+#define VERSION_TEXT "AQPkg Version 1.6 BETA"
 
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index dad34b0..1efe030 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -33,2 +33,4 @@ using namespace std;
 
+#include <opie/oprocess.h>
+
 #include "utils.h"
@@ -57,5 +59,5 @@ bool Ipkg :: runIpkg( )
     bool ret = false;
+    QStringList commands;
 
     QDir::setCurrent( "/tmp" );
-    QString cmd = "";
 
@@ -63,7 +65,7 @@ bool Ipkg :: runIpkg( )
     {
-        cmd += "cd ";
-        cmd += runtimeDir;
-        cmd += " ; ";
+        commands << "cd ";
+        commands << runtimeDir;
+        commands << ";";
     }
-    cmd += "ipkg -force-defaults";
+    commands << "ipkg" << "-force-defaults";
 
@@ -71,3 +73,3 @@ bool Ipkg :: runIpkg( )
     if ( option == "install" )
-        cmd += " -dest "+ destination;
+        commands << "-dest" << destination;
 
@@ -77,11 +79,11 @@ bool Ipkg :: runIpkg( )
         if ( flags & FORCE_DEPENDS )
-            cmd += " -force-depends";
+            commands << "-force-depends";
         if ( flags & FORCE_REINSTALL  )
-            cmd += " -force-reinstall";
+            commands << "-force-reinstall";
         if ( flags & FORCE_REMOVE )
-            cmd += " -force-removal-of-essential-packages";
+            commands << "-force-removal-of-essential-packages";
         if ( flags & FORCE_OVERWRITE )
-            cmd += " -force-overwrite";
+            commands << "-force-overwrite";
         if ( flags & VERBOSE_WGET )
-            cmd += " -verbose_wget";
+            commands << "-verbose_wget";
 
@@ -100,4 +102,4 @@ bool Ipkg :: runIpkg( )
 #ifdef X86
-    cmd += " -f ";
-    cmd += IPKG_CONF;
+    commands << "-f";
+    commands << IPKG_CONF;
 #endif
@@ -106,8 +108,7 @@ bool Ipkg :: runIpkg( )
     if ( option == "reinstall" )
-        cmd += " install";
+        commands << "install";
     else
-        cmd += " " + option;
+        commands << option;
     if ( package != "" )
-        cmd += " " + package;
-    cmd += " 2>&1";
+        commands << package;
 
@@ -132,4 +133,2 @@ bool Ipkg :: runIpkg( )
     
-    emit outputText( cmd );
-
     // Execute command
@@ -138,3 +137,3 @@ bool Ipkg :: runIpkg( )
 
-    ret = executeIpkgCommand( cmd, option );
+    ret = executeIpkgCommand( commands, option );
 
@@ -149,3 +148,3 @@ bool Ipkg :: runIpkg( )
             emit outputText( QString( "Creating symbolic links for " )+ package );
-            
+
             linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
@@ -171,5 +170,4 @@ bool Ipkg :: runIpkg( )
         removeStatusEntry();
-    
 
-//    emit outputText( QString( "Finished - status=" ) + (ret ? "success" : "failure") );
+
     emit outputText( "Finished" );
@@ -177,2 +175,3 @@ bool Ipkg :: runIpkg( )
     return ret;
+
 }
@@ -257,3 +256,71 @@ void Ipkg :: removeStatusEntry()
 
+int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString option )
+{
+    // OK we're gonna use OProcess to run this thing
+    proc = new OProcess();
+
+    // Connect up our slots
+    connect(proc, SIGNAL(processExited(OProcess *)),
+            this, SLOT( processFinished()));
+
+    connect(proc, SIGNAL(receivedStdout(OProcess *, char *, int)),
+            this, SLOT(commandStdout(OProcess *, char *, int)));
+
+    connect(proc, SIGNAL(receivedStderr(OProcess *, char *, int)),
+            this, SLOT(commandStderr(OProcess *, char *, int)));
+    
+    for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it )
+    {
+         qDebug( "%s ", (*it).latin1() );
+         *proc << (*it).latin1();
+    }
+    cout << endl;
+
+    // Start the process going
+    finished = false;
+    if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
+    {
+        emit outputText( QString( "Couldn't start ipkg process" ) );
+        qDebug( "Couldn't start ipkg process!" );
+    }
+
+    // Now wait for it to finish
+    while ( !finished )
+        qApp->processEvents();
+}
+
+void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
+{
+    qDebug("received stdout %d bytes", buflen);
+
+    QString lineStr = buffer;
+    if ( lineStr[buflen-1] == '\n' )
+        buflen --;
+    lineStr = lineStr.left( buflen );
+    emit outputText( lineStr );
+    qDebug(lineStr);
+    buffer[0] = '\0';
+}
+
+void Ipkg::commandStderr(OProcess*, char *buffer, int buflen)
+{
+    qDebug("received stderrt %d bytes", buflen);
+
+    QString lineStr = buffer;
+    if ( lineStr[buflen-1] == '\n' )
+        buflen --;
+    lineStr=lineStr.left( buflen );
+    emit outputText( lineStr );
+    buffer[0] = '\0';
+}
+
+void Ipkg::processFinished()
+{
+    delete proc;
+    finished = true;
+}
+
+
 
+/*
 int Ipkg :: executeIpkgCommand( QString &cmd, const QString option )
@@ -295,3 +362,3 @@ int Ipkg :: executeIpkgCommand( QString &cmd, const QString option )
                 }
-                
+
                 if ( option == "update" )
@@ -322,3 +389,3 @@ int Ipkg :: executeIpkgCommand( QString &cmd, const QString option )
 }
-
+*/
 
@@ -350,6 +417,6 @@ QStringList* Ipkg :: getList( const QString &packageFilename, const QString &des
         f.setName( packageFileDir );
-//        cout << "Try to open " << packageFileDir.latin1() << endl;
+        qDebug( "Try to open %s", packageFileDir.latin1() );
         if ( ! f.open(IO_ReadOnly) )
         {
-            cout << "Could not open:" << packageFileDir << endl;
+            qDebug( "Could not open: %s", packageFileDir );
             emit outputText( QString( "Could not open :" ) + packageFileDir );
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index 7099ca7..25bae59 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
@@ -27,2 +27,3 @@
 #include <qstring.h>
+#include <qstringlist.h>
 #include <qlist.h>
@@ -35,3 +36,5 @@
 #define VERBOSE_WGET                            0x0020
-  
+
+class OProcess;
+
 class Ipkg : public QObject
@@ -53,2 +56,8 @@ signals:
     void outputText( const QString &text );
+
+public slots:
+    void commandStdout(OProcess*, char *buffer, int buflen);
+    void commandStderr(OProcess*, char *buffer, int buflen);
+    void processFinished();
+
     
@@ -60,4 +69,6 @@ private:
     QString destDir;
-    int flags;
     QString runtimeDir;
+    OProcess *proc;
+    int flags;
+    bool finished;
 
@@ -65,3 +76,3 @@ private:
     
-    int executeIpkgCommand( QString &cmd, const QString option );
+    int executeIpkgCommand( QStringList &cmd, const QString option );
     void removeStatusEntry();
@@ -71,2 +82,3 @@ private:
     void processLinkDir( const QString &file, const QString &baseDir, const QString &destDir );
+    
 };