14 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
BlubbFish 7b298b591b BosMon Webserver first Running Version 2018-11-27 15:14:36 +00:00
BlubbFish 6f7632aa3d [v1.6.1] Fixing a Linebreak Bug
[v1.6.2] Adding a Test for Lora Binary
2018-11-07 19:22:12 +00:00
BlubbFish 51ee703bd4 Update for Lorabot 2018-10-29 22:35:18 +00:00
BlubbFish 47fb4f8c27 Zway-Bot [v1.7.2] Add Logging to some Modules, fixing a bug in overtaker (now it not removes every time all events, so only the latest event are watched)
[Utils] Fixing a bug if more than one argument with params
2018-10-02 14:53:59 +00:00
BlubbFish f2706b2b29 Zway-Bot [v1.7.1] Tiny fix for nullpointer exception 2018-09-29 18:13:17 +00:00
BlubbFish ab40973980 Zway [v1.5.0] Throw Exception if 3 times failed to connect to Raspberry server, add 3 new commandlcasses to IgnoredClasses
Zway-Bot [v1.7.0] rewrite to Threaded Modules, edit service file for systemd
2018-09-29 12:15:37 +00:00
BlubbFish f8f28105d9 Add more Logging
On Module load catch Exceptions and not load the plugin
2018-09-13 22:03:19 +00:00
BlubbFish f310d2a1df Make Deb of 1.2.0 of Lorabot 2018-09-11 13:47:29 +00:00
17 changed files with 1417 additions and 1287 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
+4 -5
View File
@@ -38,7 +38,7 @@ namespace BlubbFish.Utils
public ArgTouple(String type) public ArgTouple(String type)
{ {
this.Type = type; this.Type = type;
this.Data = ""; this.Data = null;
} }
public String Type { get; private set; } public String Type { get; private set; }
public String Data { get; private set; } public String Data { get; private set; }
@@ -100,7 +100,8 @@ namespace BlubbFish.Utils
if (this.args.Length > i + 1) { if (this.args.Length > i + 1) {
arg.SetData(this.args[++i]); arg.SetData(this.args[++i]);
} else { } else {
throw new ArgumentException(); Console.WriteLine(this.GetUsageList(""));
throw new ArgumentException("Argument: "+this.args[i]+" missing second argument.");
} }
} }
this.argList.Add(arg); this.argList.Add(arg);
@@ -142,11 +143,9 @@ namespace BlubbFish.Utils
foreach (ArgTouple t in this.argList) { foreach (ArgTouple t in this.argList) {
if (t.Type == name && t.Data != null) { if (t.Type == name && t.Data != null) {
return t.Data; return t.Data;
} else {
throw new ArgumentNullException();
} }
} }
return null; throw new ArgumentNullException();
} }
public Boolean HasAllRequiredArguments() public Boolean HasAllRequiredArguments()
View File
+98
View File
@@ -0,0 +1,98 @@
using System;
using System.ComponentModel;
using System.Reflection;
namespace BlubbFish.Utils {
public static class Helper {
#region PropertyHelper
public static Boolean HasProperty(this Object o, String type) {
Type t = o.GetType();
foreach (PropertyInfo item in t.GetProperties()) {
if (item.Name == type) {
return true;
}
}
return false;
}
public static Object GetProperty(this Object o, String name) {
PropertyInfo prop = o.GetType().GetProperty(name);
if (prop.CanRead) {
return prop.GetValue(o);
}
return null;
}
public static void SetProperty(this Object o, String name, String value) {
PropertyInfo prop = o.GetType().GetProperty(name);
if (prop.CanWrite) {
if (prop.PropertyType == typeof(Boolean) && Boolean.TryParse(value, out Boolean vb)) {
prop.SetValue(o, vb);
} else if (prop.PropertyType == typeof(Byte) && Byte.TryParse(value, out Byte v8)) {
prop.SetValue(o, v8);
} else if (prop.PropertyType == typeof(Int32) && Int32.TryParse(value, out Int32 v32)) {
prop.SetValue(o, v32);
} else if (prop.PropertyType == typeof(Single) && Single.TryParse(value, out Single vs)) {
prop.SetValue(o, vs);
} else if (prop.PropertyType == typeof(Double) && Double.TryParse(value, out Double vd)) {
prop.SetValue(o, vd);
} else if (prop.PropertyType == typeof(Int64) && Int64.TryParse(value, out Int64 v64)) {
prop.SetValue(o, v64);
} else if (prop.PropertyType.BaseType == typeof(Enum)) {
try {
prop.SetValue(o, Enum.Parse(prop.PropertyType, value));
} catch (Exception) { }
}
}
}
#endregion
#region InterfaceHelper
public static Boolean HasInterface(this Type o, Type interf) {
foreach (Type item in o.GetInterfaces()) {
if (item == interf) {
return true;
}
}
return false;
}
public static Boolean HasAbstract(this Type o, Type type) {
if (o.BaseType == type) {
return true;
}
return false;
}
#endregion
#region StringHelper
public static String GetEnumDescription(Enum value) {
FieldInfo fi = value.GetType().GetField(value.ToString());
DescriptionAttribute[] attributes = (DescriptionAttribute[])fi.GetCustomAttributes(typeof(DescriptionAttribute), false);
if (attributes != null && attributes.Length > 0) {
return attributes[0].Description;
} else {
return value.ToString();
}
}
public static String ToUpperLower(this String s) {
if (s.Length == 0) {
return "";
}
if (s.Length == 1) {
return s.ToUpper();
}
return s[0].ToString().ToUpper() + s.Substring(1).ToLower();
}
public static void WriteError(String text) {
Console.ForegroundColor = ConsoleColor.Red;
Console.Error.WriteLine("ERROR: " + text);
Console.ResetColor();
}
#endregion
}
}
+2 -2
View File
@@ -91,7 +91,7 @@ namespace BlubbFish.Utils {
Dictionary<String, String> sub = new Dictionary<String, String>(); Dictionary<String, String> sub = new Dictionary<String, String>();
String cap = ""; String cap = "";
foreach (String line in buf) { 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 (match.Success) {
if (sub.Count != 0 && cap != "") { if (sub.Count != 0 && cap != "") {
this.inifile.Add(cap, sub); this.inifile.Add(cap, sub);
@@ -140,7 +140,7 @@ namespace BlubbFish.Utils {
if(!key.StartsWith("[")) { if(!key.StartsWith("[")) {
key = "[" + key + "]"; 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); 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) { 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); origstream.WriteLine(text);
base.WriteLine(text); base.WriteLine(text);
this.newline = true;
base.Flush(); base.Flush();
} }
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Utils")] [assembly: AssemblyProduct("Utils")]
[assembly: AssemblyCopyright("Copyright © 2014 - 15.05.2018")] [assembly: AssemblyCopyright("Copyright © 2014 - 02.10.2018")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
@@ -32,5 +32,9 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.2")] [assembly: AssemblyVersion("1.4.0")]
[assembly: AssemblyFileVersion("1.1.2")] [assembly: AssemblyFileVersion("1.4.0")]
/**
* 1.4.0 Add Helper to Utils
*/
View File
+1
View File
@@ -45,6 +45,7 @@
<Compile Include="EventArgsHelper.cs" /> <Compile Include="EventArgsHelper.cs" />
<Compile Include="FileLogger.cs" /> <Compile Include="FileLogger.cs" />
<Compile Include="FileMutex.cs" /> <Compile Include="FileMutex.cs" />
<Compile Include="Helper.cs" />
<Compile Include="InIReader.cs" /> <Compile Include="InIReader.cs" />
<Compile Include="OwnController.cs" /> <Compile Include="OwnController.cs" />
<Compile Include="OwnModel.cs" /> <Compile Include="OwnModel.cs" />
Binary file not shown.