From: Reggie Burnett Date: September 17 2012 10:01pm Subject: bzr commit into ABSv2 branch (reggie.burnett:37) List-Archive: http://lists.mysql.com/commits/144795 Message-Id: <201209172201.q8HM1JqW030518@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0958738257==" --===============0958738257== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///C:/work/wex/absv2/ based on revid:iggy.galarza@stripped 37 Reggie Burnett 2012-09-17 added a small method to return files in a dir that match a regex modified: AbsUtility/ProductFile.cs AbsUtility/Utility.cs === modified file 'AbsUtility/ProductFile.cs' === modified file 'AbsUtility/ProductFile.cs' --- a/AbsUtility/ProductFile.cs 2012-09-17 21:54:48 +0000 +++ b/AbsUtility/ProductFile.cs 2012-09-17 22:01:12 +0000 @@ -52,7 +52,7 @@ throw new Exception("Every product file requires a regular expression"); if (Generated && String.IsNullOrEmpty(GenerationScript)) throw new Exception("Generated files require a supplied generation script"); - string[] files = Directory.GetFiles(Product.IncomingFolder, RegularExpression); + string[] files = Utility.MatchFiles(Product.IncomingFolder, RegularExpression); if (files.Length != 1 && checkGenerated) throw new Exception("Regular expression did not match exactly 1 file"); File = files[0]; === modified file 'AbsUtility/Utility.cs' --- a/AbsUtility/Utility.cs 2012-09-17 20:04:19 +0000 +++ b/AbsUtility/Utility.cs 2012-09-17 22:01:12 +0000 @@ -181,5 +181,19 @@ } return !File.Exists(stoppedFile); } + + public static string[] MatchFiles(string dir, string regexPattern) + { + List fileList = new List(); + + Regex regex = new Regex(regexPattern); + string[] files = Directory.GetFiles(dir); + foreach (string file in files) + { + if (regex.Match(file).Success) + fileList.Add(file); + } + return fileList.ToArray(); + } } } --===============0958738257== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/reggie.burnett@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: reggie.burnett@stripped\ # uily5miqfn0h3hzp # target_branch: file:///C:/work/wex/absv2/ # testament_sha1: fa8b58cb4143cb3d23d856f4b916f954190ce3b5 # timestamp: 2012-09-17 17:01:12 -0500 # base_revision_id: iggy.galarza@stripped\ # fk41ravj2f9rxbo4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRJ35u4AAk9fgFUSUGf//3em Xgq////6UAT5F4KSrJJpW2lCURBHqaYp4qPw0Sn6U9E/VN6hAAyMgfqGkHMARgmIBgEwTRkNDAJg jEwkUCTJpiKfoTU2RBoek000A0aaGgNGhzAEYJiAYBME0ZDQwCYIxMJJCaDUxNNU/JpqnpmkTeoi aaPU/VD1ADQHolELXp21sf0+piajXNBFg1reiGAKnBUZZSg4Q7txHJDujCTk5QwSQTQsvx6tZ0nE NtN9nWH6lkjAw8SwN5GsSlqx6C8e7n4/deZs1H57v0emFw4Yfzy1TRTaWkp4sKJZvVAjH0q0I9tn uuJzlH5D8KAaohdXqH7d554GSvaXM6iljWF5jESCnggniHRsB2M9ZwB2aBbE1aWZR0AKLZmGGJwZ ozIySOF322tIUom2Tu8BXgbqUg15FUwSWBI2PmIG0CgwD65bQnZPfp11NOywCkv85o7QIpAx1dhh Ch15s3F2IVlLTZV7g2VITgsvqMTYdMqJiFI4sJp8LvEIBQUAQKwNiQPSBh4PBgMQxziby3UfK5nI ifLD0DtJvVPWzMpS48Jy6+x+156XhGkzDiUHIC8ddnkUjyAV3eUOLZMzjqByoFhpCRF8aunzBbXw hXAqk9eJOuJIL3mRZgjjPr6nBGwp0HlYMdwFddcLy1D7B9DBddhGNBucEfWuZNbwGp3P2oC2UgvL eRWD56gdaZoZAGZCg4V1lheyWYwK0lulgyN1NJnkTdlpiVxNBohtsC+VZDNHLKt32OgUvipwBsqh BUInobUXwWHgMDU2hgObUY4eZ3nKjgDIPDpKsabfXcR5KuRvLWTXwqiPeejCcuV0HLIu1ZSzFi58 0AoWo8OBmOOhAgdPmiw27PfgJShClmLJkXB9L6CiF+W1EUIqVP6ix6GpDPKs9fQFgpAM5yEYMKP9 vDO2pMRDlRLDM6bzAnB2abSKSSswUkaqiJRMJTRcKg2MMePuu0qlcY7AiHQdMj+J7aqTpCAdq19r U2oadDCGQFm3fJjkcbOFu4m1O4lJs2dWiSO3myhGy7pZt+WPCpeFQ42eAoKogvowmnV3yYOvNafF FE2F1rTgwktRN1l8a6LQiDURS9E1oQR3chWPNw0qDtPEiZaBdJfE7vYajviyXUPMDHygd49cwYXv DLeLEQWhkGaQ9g3AwYAcnrmLjY3ADBFcTdxwhn1dyHckT/GlWhtR+2IacxdADNi6kYWI4MuXOU2A ogVr/PBH/IhiKI0A+oz4l4OyRHMPYFKHvDHQPd0RSJMkvJhQL40QAnQqGp3mx1mqqTtq8wGMKrDI qisbm2ZwGrCrtoiVEiY8RpSJzAyo7NwfLrSig0uAKRfCY9BKpEg8GBNEiUyqT0qKDEgh9mqzWYfj 5u41BiFhUBoPYNbUL0g73OGuNNO9t5ry9MhvypWmK6MlPHBT8moC5byAyQ/8yoi34xnzBgrB65jB 3uCpz7M2UiGCIFFzPDIpocKkaiGI8SWxXV2w6IXtRkIjlmcQUKBCisDe6p6Hw8B3DLirKi0zNkAI VMLEjdUOHCy+eCN4Hl3yvP1xEPOejpBarEWgx1GD3jNAPpOyCI0uIDDAIcIDCWlU5wOXjb/4u5Ip woSAk783cA== --===============0958738257==--