Compare commits
32
Commits
v1.1.0
...
c313994aeb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c313994aeb | ||
|
|
b184187e21 | ||
|
|
affe298cf9 | ||
|
|
62b0d478c5 | ||
|
|
dcfb0e6272 | ||
|
|
37d3b8c5a8 | ||
|
|
7b298b591b | ||
|
|
6f7632aa3d | ||
|
|
51ee703bd4 | ||
|
|
47fb4f8c27 | ||
|
|
f2706b2b29 | ||
|
|
ab40973980 | ||
|
|
f8f28105d9 | ||
|
|
f310d2a1df | ||
|
|
bf047a58e3 | ||
|
|
22d8a9ff2a | ||
|
|
de32d997fb | ||
|
|
6ac8ec0cfa | ||
|
|
c215d27841 | ||
|
|
2e05bde250 | ||
|
|
f8cf31c941 | ||
|
|
73ea61487e | ||
|
|
b3b9ceb283 | ||
|
|
45f40263ad | ||
|
|
d84add4871 | ||
|
|
884a59b206 | ||
|
|
6f8cebc25d | ||
|
|
185b4bc00c | ||
|
|
475a05c36a | ||
|
|
732811c928 | ||
|
|
3b9ba9571d | ||
|
|
5b9dcfde02 |
@@ -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
|
||||||
@@ -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,12 +143,10 @@ 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();
|
throw new ArgumentNullException();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Boolean HasAllRequiredArguments()
|
public Boolean HasAllRequiredArguments()
|
||||||
{
|
{
|
||||||
@@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,7 +8,7 @@ namespace BlubbFish.Utils {
|
|||||||
public class InIReader : IDisposable
|
public class InIReader : IDisposable
|
||||||
{
|
{
|
||||||
private Dictionary<String, Dictionary<String, String>> inifile;
|
private Dictionary<String, Dictionary<String, String>> inifile;
|
||||||
private FileSystemWatcher k;
|
private readonly FileSystemWatcher k;
|
||||||
private readonly String filename;
|
private readonly String filename;
|
||||||
private static List<String> search_path = new List<String>() {
|
private static List<String> search_path = new List<String>() {
|
||||||
Directory.GetCurrentDirectory()
|
Directory.GetCurrentDirectory()
|
||||||
@@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,7 +9,7 @@ namespace BlubbFish.Utils
|
|||||||
public abstract class OwnModel<T> where T : class
|
public abstract class OwnModel<T> where T : class
|
||||||
{
|
{
|
||||||
private static readonly Lazy<T> _instance = new Lazy<T>(() => CreateInstanceOfT());
|
private static readonly Lazy<T> _instance = new Lazy<T>(() => CreateInstanceOfT());
|
||||||
private List<OwnView> observer = new List<OwnView>();
|
private readonly List<OwnView> observer = new List<OwnView>();
|
||||||
public static T Instance
|
public static T Instance
|
||||||
{
|
{
|
||||||
get {
|
get {
|
||||||
@@ -35,5 +35,6 @@ namespace BlubbFish.Utils
|
|||||||
this.observer.ForEach(delegate (OwnView view) { view.Update(); });
|
this.observer.ForEach(delegate (OwnView view) { view.Update(); });
|
||||||
}
|
}
|
||||||
abstract protected void Init();
|
abstract protected void Init();
|
||||||
|
abstract public void Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -64,6 +64,8 @@ namespace BlubbFish.Utils {
|
|||||||
this.fw.Close();
|
this.fw.Close();
|
||||||
if(new FileInfo(this.loggerfile).Length > 0) {
|
if(new FileInfo(this.loggerfile).Length > 0) {
|
||||||
File.Move(this.loggerfile, file);
|
File.Move(this.loggerfile, file);
|
||||||
|
} else {
|
||||||
|
File.Delete(this.loggerfile);
|
||||||
}
|
}
|
||||||
this.loggerfile = file;
|
this.loggerfile = file;
|
||||||
this.fw = new FileWriter(this.loggerfile);
|
this.fw = new FileWriter(this.loggerfile);
|
||||||
@@ -106,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.0")]
|
[assembly: AssemblyVersion("1.4.0")]
|
||||||
[assembly: AssemblyFileVersion("1.1.0")]
|
[assembly: AssemblyFileVersion("1.4.0")]
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 1.4.0 Add Helper to Utils
|
||||||
|
*/
|
||||||
@@ -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.
Reference in New Issue
Block a user