Changeset 745 for xmlTools/trunk/posUpdate

Timestamp:

Mar 26, 2013, 4:04:38 PM (12 years ago)

Author:

s10k

Message:

-added double quotes support (windows users can now specify paths with spaces)
-returning last error as output (helps AEI debugging)

Location:

xmlTools/trunk/posUpdate

Files:

• Program.cs (modified) (3 diffs)
• Util.cs (modified) (1 diff)
• XmlPatch.cs (modified) (3 diffs)
• xmlTools.csproj.user (modified) (1 diff)

xmlTools/trunk/posUpdate/Program.cs

@@ -11 +11 @@
     class Program
     {
-        public static readonly string toolsVersion = "0.8a";
+        public static readonly string toolsVersion = "0.8b";
+        private static appErrors lastError;
 
         public enum appErrors
         {
-            // 0-19 Errors with input parameters
-            ERROR_PARAMS = 0,
-            FILE_NOT_FOUND = 1,
-            ELEMENT_NOT_SPECIFIED=2,
-            ELEMENT_NOT_FOUND=3,
+            // 1-19 Errors with input parameters
+            ERROR_PARAMS = 1,
+            FILE_NOT_FOUND = 2,
+            ELEMENT_NOT_SPECIFIED=3,
+            ELEMENT_NOT_FOUND=4,
             // 20-199 General application errors
             BACKUPS_ALREADY_EXISTS=20,
@@ -36 +37 @@
             Console.Error.WriteLine("Error Code: "+(int)error);
             Console.Error.WriteLine(description);
-            
+
             if (exitApp)
             {
                 Environment.Exit(1);
             }
+
+            lastError = error;
         }
 
-        public static void Main(string[] args)
+        public static int Main(string[] args)
         {
             try
@@ -49 +52 @@
                 //We use a command parse library due to its advantages
                 CLAP.Parser.RunConsole<ParametersParser>(args);
+                return (int)lastError;
             }
             catch (Exception e)
             {
                 printAppError(appErrors.ERROR_PARAMS, "Error processing parameters:\n" + e.ToString());
+                return (int)appErrors.ERROR_PARAMS;
             }
         }

xmlTools/trunk/posUpdate/Util.cs

@@ -149 +149 @@
             return source.IndexOf(sToSearch, StringComparison.OrdinalIgnoreCase) >= 0;
         }
+
+        // Thanks DarthDevilous for the regex! http://forums.thedailywtf.com/forums/t/2478.aspx
+        public static string[] stringToArgsArray(string args)
+        {
+            MatchCollection ms = Regex.Matches(args, "([^\" ]*(\"[^\"]*\")[^\" ]*)|[^\" ]+");
+            List<string> listArgs=new List<string>();
+            foreach (Match m in ms)
+            {
+                listArgs.Add(m.Value.Replace("\"","")); //remove quotes or it will cause an error
+            }
+            return listArgs.ToArray();
+        }
     }
 }

xmlTools/trunk/posUpdate/XmlPatch.cs

@@ -285 +285 @@
 
                     // Filename already exists?
-                    if (command.IndexOf("filename:") != -1)
+                    if (Util.ContainsIgnoreCase(command,"filename:"))
                     {
                         paramType = "filename:";
                     }
-                    else if (command.IndexOf("filename=") != -1)
+                    else if (Util.ContainsIgnoreCase(command, "filename="))
                     {
                         paramType = "filename=";
@@ -305 +305 @@
                         if (endIdx == -1)
                         {
-                            endIdx = command.IndexOf("\"", startIdx); // or with quotes
+                            endIdx = command.IndexOf("\n", startIdx); // or with endline
                         }
                         string currFilename = command.Substring(startIdx, endIdx - startIdx);
@@ -318 +318 @@
                 }
 
-                command = command.Replace("\"", ""); // remove quotes
-
-                Program.Main(command.Split(' ')); // use the current process is more efficient than start a new one
+                Program.Main(Util.stringToArgsArray(command)); // use the current process is more efficient than start a new one
             }
             catch (Exception e)

xmlTools/trunk/posUpdate/xmlTools.csproj.user

@@ -2 +2 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <StartArguments>replaceall -element:FirstLevel -value:0 -nobackups -filename:C:\Users\home\AppData\Local\Temp\oni_aei\installrun_temp-2013_03_26-01_55_52\level0_final\xml\%2a.xml</StartArguments>
+    <StartArguments>patchfile -filename:TRAM-knockdown.oni-patch</StartArguments>
   </PropertyGroup>
   <PropertyGroup>