Changeset 926 for XmlTools2/trunk/xmlpatch.cpp

Timestamp:

Feb 5, 2014, 7:31:05 PM (11 years ago)

Author:

s10k

Message:

XmlTools2
Added --aei-patch-files-list for AEI2

File:

• XmlTools2/trunk/xmlpatch.cpp (modified) (4 diffs)

XmlTools2/trunk/xmlpatch.cpp

@@ -100 +100 @@
             for (pugi::xml_node currNodeToInsert = newNode.first_child(); currNodeToInsert; currNodeToInsert = currNodeToInsert.next_sibling())
             {
-               nodesToInsertion[j].append_copy(currNodeToInsert); // append the new node
+                nodesToInsertion[j].append_copy(currNodeToInsert); // append the new node
             }
 
@@ -188 +188 @@
 void XmlPatch::executeCommandOperation(const QString &commandString){
 
-    QProcess newXmlToolsInstance;
-    QString resultOutput;
-
     // Avoid infinite fork loops
-    if(commandString.contains(" -p ") || commandString.contains(" --patch-files ")){
+    if(commandString.contains("-p ") || commandString.contains("--patch-files ")){
         UtilXmlTools::displayErrorMessage("@COMMAND","Use of --patch-files option is not allowed inside a patch file");
     }
 
-    newXmlToolsInstance.start(GlobalVars::AppExecutable + " " + commandString);
-    newXmlToolsInstance.waitForFinished(-1); // wait for new instance to finish
-
-    resultOutput=newXmlToolsInstance.readAll();
-
-    if(newXmlToolsInstance.exitCode()!=0){
-        UtilXmlTools::displayErrorMessage("@COMMAND", "An error ocurred:\n" + resultOutput);
-        exit(1);
+    // Reserved to AEI
+    if(commandString.contains("--aei-patch-files-list ")){
+        UtilXmlTools::displayErrorMessage("@COMMAND","Use of --aei-patch-files-list option is not allowed inside a patch file");
     }
 
     std::cout << "@COMMAND patch operation output:\n"
-              << "########################################################################\n"
-              << resultOutput.toLatin1().constData()
-              << "########################################################################"
-              << std::endl;
+    << "########################################################################"
+    << std::endl;
+
+    OptionsParser myParser(Util::QStringToArgsArray(commandString));
+    myParser.parse();
+
+    std::cout
+    << "########################################################################"
+    << std::endl;
 
     UtilXmlTools::displaySuccessMessage(1,"@COMMAND");
@@ -426 +423 @@
         else if(line.startsWith("@COMMAND")){
 
-            command=getPatchParameterValue(line,"Arguments");
+            command=GlobalVars::AppExecutable;
+
+            // Append files if forced to
+            if(!this->forceTargetFilesWildcard.isEmpty()){
+                command+=" --files '"+this->forceTargetFilesWildcard+"' ";
+            }
+
+            command+=" "+getPatchParameterValue(line,"Options");
+
+            // Add --no-backups and --no-verbose if patch was called with that arguments
+            if(!this->backupsEnabled){
+                command.append(" --no-backups");
+            }
+
+            if(!this->verboseEnabled){
+                command.append(" --no-verbose");
+            }
 
             command.replace("'","\""); //replace apostrophe by quotes, to avoid problems
@@ -433 +446 @@
 
             command.clear();
+            filesWildcard.clear();
         }
         else if(line.startsWith("@CUSTOM_CODE")){