Compare commits
6
Commits
v1.4.0
..
c313994aeb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c313994aeb | ||
|
|
b184187e21 | ||
|
|
affe298cf9 | ||
|
|
62b0d478c5 | ||
|
|
dcfb0e6272 | ||
|
|
37d3b8c5a8 |
@@ -0,0 +1,3 @@
|
||||
/.vs
|
||||
/Utils/obj
|
||||
/Utils/bin
|
||||
@@ -0,0 +1,20 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2012
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "Utils\Utils.csproj", "{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -91,7 +91,7 @@ namespace BlubbFish.Utils {
|
||||
Dictionary<String, String> sub = new Dictionary<String, String>();
|
||||
String cap = "";
|
||||
foreach (String line in buf) {
|
||||
Match match = Regex.Match(line, @"^\[[a-zA-ZäöüÄÖÜ0-9\-_ ]+\]\w*$", RegexOptions.IgnoreCase);
|
||||
Match match = Regex.Match(line, @"^\[[a-zA-ZäöüÄÖÜ0-9\-\._/ ]+\]\w*$", RegexOptions.IgnoreCase);
|
||||
if (match.Success) {
|
||||
if (sub.Count != 0 && cap != "") {
|
||||
this.inifile.Add(cap, sub);
|
||||
@@ -140,7 +140,7 @@ namespace BlubbFish.Utils {
|
||||
if(!key.StartsWith("[")) {
|
||||
key = "[" + key + "]";
|
||||
}
|
||||
if (Regex.Match(key, @"^\[[a-zA-ZäöüÄÖÜ0-9\-_ ]+\]\w*$", RegexOptions.IgnoreCase).Success) {
|
||||
if (Regex.Match(key, @"^\[[a-zA-ZäöüÄÖÜ0-9\-\._/ ]+\]\w*$", RegexOptions.IgnoreCase).Success) {
|
||||
this.inifile.Add(key, item.Value);
|
||||
}
|
||||
}
|
||||
@@ -108,10 +108,15 @@ namespace BlubbFish.Utils {
|
||||
}
|
||||
|
||||
private void WriteLine(String value, TextWriter origstream, ConsoleWriterEventArgs.ConsoleType type) {
|
||||
String text = "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value;
|
||||
String text = "";
|
||||
if (this.newline) {
|
||||
text = "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value;
|
||||
} else {
|
||||
text = value;
|
||||
}
|
||||
this.newline = true;
|
||||
origstream.WriteLine(text);
|
||||
base.WriteLine(text);
|
||||
this.newline = true;
|
||||
base.Flush();
|
||||
}
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user