Changeset 897 for Vago/trunk/Vago/converter.cpp

Timestamp:

Jan 8, 2014, 12:32:55 PM (11 years ago)

Author:

s10k

Message:

Vago 09

File:

• Vago/trunk/Vago/converter.cpp (modified) (5 diffs)

Vago/trunk/Vago/converter.cpp

@@ -10 +10 @@
 void Converter::run()
 {
-    QProcess *myProcess = new QProcess();
+    this->processHasKilled=false;
+    this->myProcess = new QProcess();
     QString result = QString();
     QString errorMessage = "";
     int numErrors=0;
 
-    myProcess->setWorkingDirectory(this->AppDir);
+    myProcess->setWorkingDirectory(this->AppDir); // Set working directory (for work with AEI2/Mac OS)
 
     if(this->myData->size()!=1){
@@ -23 +24 @@
         emit setupPB(0); //Intermitent bar, we don't have any estimation when the task is done
     }
-
-    //myProcess->setProcessChannelMode(QProcess::MergedChannels); //we want both stdout and stderr
 
     for(int i=0; i<this->myData->size(); i++){
@@ -37 +36 @@
 
             commandToExec=commands.mid(currentIndex,(nextIndex-currentIndex));
-            myProcess->start(GlobalVars::OniSplitExeName+" "+commandToExec);
-            myProcess->waitForFinished(-1);
-            result=myProcess->readAllStandardError();
+            this->myProcess->start(GlobalVars::OniSplitExeName+" "+commandToExec);
+            this->myProcess->waitForFinished(-1);
+
+            if(this->processHasKilled){ // If the process has killed there's no need to proceed with reading output or process more commands
+                delete this->myProcess; //delete object and make pointer invalid
+                this->myData->clear(); //clean list
+                emit conversionAborted();
+                return;
+            }
+
+            result=this->myProcess->readAllStandardError();
 
             if(!result.isEmpty()){ //if(!result.startsWith("Importing",Qt::CaseSensitive) && !result.startsWith("Importing",Qt::CaseSensitive)){ //case sensitive is faster
@@ -57 +64 @@
     }
 
-    delete myProcess; //delete object and make pointer invalid
+    delete this->myProcess; //delete object and make pointer invalid
     this->myData->clear(); //clean list
 
@@ -71 +78 @@
 }
 
+// Kill the process if requested
+void Converter::terminateCurrProcess(){
+    this->myProcess->kill();
+    this->processHasKilled=true;
+    this->myLogger->writeString("Received signal to kill current OniSplit operation (user requested).");
+}