6 Commits
Author SHA1 Message Date
BlubbFish c313994aeb add .gitignore 2019-02-14 21:53:05 +01:00
BlubbFish b184187e21 Move Utils to Subfolder 2019-02-14 11:43:34 +01:00
BlubbFish affe298cf9 add .gitignore remove releases 2019-02-12 19:06:35 +01:00
BlubbFish 62b0d478c5 [v1.7.0] Add support for IC880A Board 2019-01-29 17:09:45 +00:00
BlubbFish dcfb0e6272 mqtt-map auf dem congress 2018-12-30 19:51:43 +00:00
BlubbFish 37d3b8c5a8 Some tweaks to get it running right 2018-11-29 09:26:41 +00:00
17 changed files with 1417 additions and 1389 deletions
+3
View File
@@ -0,0 +1,3 @@
/.vs
/Utils/obj
/Utils/bin
+20
View File
@@ -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
View File
View File
View File
+2 -2
View File
@@ -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);
}
}
View File
View File
View File
+7 -2
View File
@@ -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();
}
View File
View File
Binary file not shown.