ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/xmlTools/trunk/posUpdate/Util.cs
(Generate patch)

Comparing xmlTools/trunk/posUpdate/Util.cs (file contents):
Revision 714 by s10k, Thu Mar 21 10:43:10 2013 UTC vs.
Revision 743 by s10k, Tue Mar 26 10:39:19 2013 UTC

# Line 18 | Line 18 | namespace xmlTools
18          /// <param name="file"></param>
19          static public bool backupFile(string file)
20          {
21 <            //try
22 <            //{
23 <            //    System.IO.File.Copy(file, file + ".bak", false); //make a backup first //false is to not override already created backups
24 <            //}
25 <            //catch (Exception e)
26 <            //{
27 <            //    Program.printAppError(Program.appErrors.BACKUPS_ALREADY_EXISTS, "Couldn't backup file " + file + " :\n" + e.Message);
28 <            //    return false;
29 <            //}
21 >            try
22 >            {
23 >                System.IO.File.Copy(file, file + ".bak", false); //make a backup first //false is to not override already created backups
24 >            }
25 >            catch (Exception e)
26 >            {
27 >                Program.printAppError(Program.appErrors.BACKUPS_ALREADY_EXISTS, "Couldn't backup file " + file + " :\n" + e.Message);
28 >                return false;
29 >            }
30              return true;
31          }
32  
# 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 136 | Line 143 | namespace xmlTools
143          {
144              return Type.GetType("Mono.Runtime") != null;
145          }
146 +
147 +        public static bool ContainsIgnoreCase(string source, string sToSearch)
148 +        {
149 +            return source.IndexOf(sToSearch, StringComparison.OrdinalIgnoreCase) >= 0;
150 +        }
151      }
152   }

Diff Legend

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