ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/xmlTools/trunk/posUpdate/Util.cs

Comparing xmlTools/trunk/posUpdate/Util.cs (file contents):
Revision 742 by s10k, Tue Mar 26 02:30:48 2013 UTC vs.
Revision 745 by s10k, Tue Mar 26 15:04:38 2013 UTC

#	Line 86 | Line 86 | namespace xmlTools
86		public static List<String> getXmlFilesWildcard(String filewildcard)
87		{
88		List<String> xmlFiles = new List<String>();
89	<	String[] files = System.IO.Directory.GetFiles(getExePath()); //Get all files in executable directory
89	>
90	>	String dir = Path.GetDirectoryName(filewildcard); // Get the specified directory
91	>	if (dir == "")
92	>	{
93	>	dir = Util.getExePath();
94	>	}
95	>	String wildcard = Path.GetFileName(filewildcard); // Get files/wildcard
96	>	String[] files = System.IO.Directory.GetFiles(dir); //Get all files in specified directory
97
98		foreach (String file in files)
99		{
100	<	Regex wildcardRegex = new Regex(Util.WildcardToRegex(filewildcard), RegexOptions.IgnoreCase); //case insensitivity
100	>	Regex wildcardRegex = new Regex(Util.WildcardToRegex(wildcard), RegexOptions.IgnoreCase); //case insensitivity
101		if (wildcardRegex.IsMatch(Path.GetFileName(file)))
102		{
103		xmlFiles.Add(file);
#	Line 141 | Line 148 | namespace xmlTools
148		{
149		return source.IndexOf(sToSearch, StringComparison.OrdinalIgnoreCase) >= 0;
150		}
151	+
152	+	// Thanks DarthDevilous for the regex! http://forums.thedailywtf.com/forums/t/2478.aspx
153	+	public static string[] stringToArgsArray(string args)
154	+	{
155	+	MatchCollection ms = Regex.Matches(args, "([^\" ]*(\"[^\"]*\")[^\" ]*)|[^\" ]+");
156	+	List<string> listArgs=new List<string>();
157	+	foreach (Match m in ms)
158	+	{
159	+	listArgs.Add(m.Value.Replace("\"","")); //remove quotes or it will cause an error
160	+	}
161	+	return listArgs.ToArray();
162	+	}
163		}
164		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)