Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fa3ef6fd60 | ||
|
|
d5831bf292 | ||
|
|
3f1e03cd4d | ||
|
|
387301626a | ||
|
|
3a7cc65ba8 | ||
|
|
c75464632c | ||
|
|
69d94cfc06 | ||
|
|
8bc6bd5824 | ||
|
|
1a6661326f | ||
|
|
d2e28fa5b2 | ||
|
|
ca3d6e62ee | ||
|
|
53ecb8908a | ||
|
|
3a8f1a58bc | ||
|
|
d389b52d17 | ||
|
|
c2e6db4f8a | ||
|
|
436ecf01f8 | ||
|
|
469477210e | ||
|
|
44c0adc8db | ||
|
|
ecb7e2bb6b | ||
|
|
8ae22ff701 | ||
|
|
7c81c5391f | ||
|
|
04725ea161 | ||
|
|
931af38cb9 | ||
|
|
23a80e51f0 | ||
|
|
664a5049af | ||
|
|
5669dd5ac3 | ||
|
|
3d459543d1 | ||
|
|
df5b97b130 | ||
|
|
89f50800ce | ||
|
|
df97abf0e0 | ||
|
|
9d21634765 | ||
|
|
901eefe701 | ||
|
|
dc09218157 | ||
|
|
8b611dfcec | ||
|
|
ad2d41dde0 | ||
|
|
4a91406d4f | ||
|
|
f9216f7bc9 | ||
|
|
61a7f1ff7b | ||
|
|
3d1105a614 | ||
|
|
3358262211 | ||
|
|
2bbe2e023b | ||
|
|
dcd26b83aa | ||
|
|
740b9152b5 | ||
|
|
fca2575ab6 | ||
|
|
0fe8437e0d | ||
|
|
a7ce209510 | ||
|
|
75dd6e8e5e | ||
|
|
80a3d4ae8f | ||
|
|
362f120efd | ||
|
|
beabdc513c | ||
|
|
66843e9b50 |
+3
-2
@@ -12,7 +12,7 @@ namespace BlubbFish.Utils
|
|||||||
Touple
|
Touple
|
||||||
}
|
}
|
||||||
#region Classes
|
#region Classes
|
||||||
public class VaildArguments
|
public struct VaildArguments
|
||||||
{
|
{
|
||||||
public VaildArguments(ArgLength length, Boolean required)
|
public VaildArguments(ArgLength length, Boolean required)
|
||||||
{
|
{
|
||||||
@@ -28,7 +28,7 @@ namespace BlubbFish.Utils
|
|||||||
public ArgLength Length { get; private set; }
|
public ArgLength Length { get; private set; }
|
||||||
public Boolean Required { get; private set; }
|
public Boolean Required { get; private set; }
|
||||||
}
|
}
|
||||||
private class ArgTouple
|
private struct ArgTouple
|
||||||
{
|
{
|
||||||
public ArgTouple(String type, String data)
|
public ArgTouple(String type, String data)
|
||||||
{
|
{
|
||||||
@@ -38,6 +38,7 @@ namespace BlubbFish.Utils
|
|||||||
public ArgTouple(String type)
|
public ArgTouple(String type)
|
||||||
{
|
{
|
||||||
this.Type = type;
|
this.Type = type;
|
||||||
|
this.Data = "";
|
||||||
}
|
}
|
||||||
public String Type { get; private set; }
|
public String Type { get; private set; }
|
||||||
public String Data { get; private set; }
|
public String Data { get; private set; }
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace BlubbFish.Utils {
|
||||||
|
public class UpdaterEventArgs : EventArgs {
|
||||||
|
public UpdaterEventArgs(Boolean hasUpdates, String message) {
|
||||||
|
this.HasUpdates = hasUpdates;
|
||||||
|
this.Message = message;
|
||||||
|
}
|
||||||
|
public String Message { get; private set; }
|
||||||
|
public Boolean HasUpdates { get; private set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class UpdaterFailEventArgs : EventArgs {
|
||||||
|
public UpdaterFailEventArgs(Exception e) {
|
||||||
|
this.Except = e;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Exception Except { get; private set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class LogEventArgs : EventArgs {
|
||||||
|
public LogEventArgs(String location, String message, OwnObject.LogLevel level, DateTime date) {
|
||||||
|
this.Location = location;
|
||||||
|
this.Message = message;
|
||||||
|
this.Level = level;
|
||||||
|
this.Date = date;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String Location { get; private set; }
|
||||||
|
public String Message { get; private set; }
|
||||||
|
public OwnObject.LogLevel Level { get; private set; }
|
||||||
|
public DateTime Date { get; private set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
+17
-1
@@ -5,7 +5,7 @@ using System.Text;
|
|||||||
|
|
||||||
namespace BlubbFish.Utils
|
namespace BlubbFish.Utils
|
||||||
{
|
{
|
||||||
public class FileMutex
|
public class FileMutex : IDisposable
|
||||||
{
|
{
|
||||||
private static FileMutex instance;
|
private static FileMutex instance;
|
||||||
private String filename;
|
private String filename;
|
||||||
@@ -47,9 +47,25 @@ namespace BlubbFish.Utils
|
|||||||
|
|
||||||
public Boolean Delete()
|
public Boolean Delete()
|
||||||
{
|
{
|
||||||
|
if(this.file != null) {
|
||||||
this.file.Close();
|
this.file.Close();
|
||||||
|
}
|
||||||
|
|
||||||
File.Delete(this.filename);
|
File.Delete(this.filename);
|
||||||
return !File.Exists(this.filename);
|
return !File.Exists(this.filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected virtual void Dispose(Boolean disposing) {
|
||||||
|
if (disposing) {
|
||||||
|
if(this.file != null) {
|
||||||
|
this.file.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose() {
|
||||||
|
Dispose(true);
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+129
-28
@@ -2,27 +2,66 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace BlubbFish.Utils
|
namespace BlubbFish.Utils {
|
||||||
|
public class InIReader : IDisposable
|
||||||
{
|
{
|
||||||
public class InIReader
|
private Dictionary<String, Dictionary<String, String>> inifile;
|
||||||
{
|
private FileSystemWatcher k;
|
||||||
private Dictionary<String, Dictionary<String, String>> cont;
|
|
||||||
private FileSystemWatcher k = new FileSystemWatcher(Directory.GetCurrentDirectory(), "*.ini");
|
|
||||||
private String filename;
|
private String filename;
|
||||||
|
private static List<String> search_path = new List<String>() {
|
||||||
|
Directory.GetCurrentDirectory()
|
||||||
|
};
|
||||||
|
|
||||||
private static Dictionary<String, InIReader> instances = new Dictionary<String, InIReader>();
|
private static Dictionary<String, InIReader> instances = new Dictionary<String, InIReader>();
|
||||||
|
|
||||||
|
public static void SetSearchPath(List<String> directorys) {
|
||||||
|
search_path.AddRange(directorys);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Boolean ConfigExist(String filename) {
|
||||||
|
foreach (String path in search_path) {
|
||||||
|
if (File.Exists(path + Path.DirectorySeparatorChar + filename)) {
|
||||||
|
return true;
|
||||||
|
} else if (File.Exists(path + Path.DirectorySeparatorChar + filename + ".ini")) {
|
||||||
|
return true;
|
||||||
|
} else if (File.Exists(path + Path.DirectorySeparatorChar + filename + ".conf")) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
private InIReader(String filename)
|
private InIReader(String filename)
|
||||||
{
|
{
|
||||||
this.filename = filename;
|
foreach (String path in search_path) {
|
||||||
|
if (File.Exists(path + Path.DirectorySeparatorChar + filename)) {
|
||||||
|
this.filename = path + Path.DirectorySeparatorChar + filename;
|
||||||
|
this.k = new FileSystemWatcher(path, filename);
|
||||||
|
break;
|
||||||
|
} else if (File.Exists(path + Path.DirectorySeparatorChar + filename + ".ini")) {
|
||||||
|
this.filename = path + Path.DirectorySeparatorChar + filename + ".ini";
|
||||||
|
this.k = new FileSystemWatcher(path, filename + ".ini");
|
||||||
|
break;
|
||||||
|
} else if(File.Exists(path + Path.DirectorySeparatorChar + filename + ".conf")) {
|
||||||
|
this.filename = path + Path.DirectorySeparatorChar + filename + ".conf";
|
||||||
|
this.k = new FileSystemWatcher(path, filename + ".conf");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(this.filename == null) {
|
||||||
|
throw new ArgumentException(filename + " not found!");
|
||||||
|
}
|
||||||
this.k.Changed += new FileSystemEventHandler(this.ReadAgain);
|
this.k.Changed += new FileSystemEventHandler(this.ReadAgain);
|
||||||
LoadFile();
|
LoadFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gibt eine InIReader-Instanz zu einer Datei zurück
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="filename">Dateiname</param>
|
||||||
|
/// <returns></returns>
|
||||||
public static InIReader GetInstance(String filename)
|
public static InIReader GetInstance(String filename)
|
||||||
{
|
{
|
||||||
if (!instances.Keys.Contains(filename)) {
|
if (!instances.Keys.Contains(filename)) {
|
||||||
@@ -38,7 +77,7 @@ namespace BlubbFish.Utils
|
|||||||
|
|
||||||
private void LoadFile()
|
private void LoadFile()
|
||||||
{
|
{
|
||||||
this.cont = new Dictionary<String, Dictionary<String, String>>();
|
this.inifile = new Dictionary<String, Dictionary<String, String>>();
|
||||||
StreamReader file = new StreamReader(this.filename);
|
StreamReader file = new StreamReader(this.filename);
|
||||||
List<String> buf = new List<String>();
|
List<String> buf = new List<String>();
|
||||||
String fline = "";
|
String fline = "";
|
||||||
@@ -52,10 +91,10 @@ 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-Z0-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.cont.Add(cap, sub);
|
this.inifile.Add(cap, sub);
|
||||||
}
|
}
|
||||||
cap = line;
|
cap = line;
|
||||||
sub = new Dictionary<String, String>();
|
sub = new Dictionary<String, String>();
|
||||||
@@ -68,45 +107,97 @@ namespace BlubbFish.Utils
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (sub.Count != 0 && cap != "") {
|
if (sub.Count != 0 && cap != "") {
|
||||||
this.cont.Add(cap, sub);
|
this.inifile.Add(cap, sub);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<String> GetSections()
|
/// <summary>
|
||||||
|
/// Gibt eine Liste an Sektionen zurück
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="withBrackets">Default = true; false, wenn die Liste ohne Klammern sein soll.</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public List<String> GetSections(Boolean withBrackets = true)
|
||||||
{
|
{
|
||||||
return this.cont.Keys.ToList<String>();
|
if(withBrackets) {
|
||||||
|
return this.inifile.Keys.ToList();
|
||||||
|
} else {
|
||||||
|
List<String> ret = new List<String>();
|
||||||
|
foreach (String item in this.inifile.Keys) {
|
||||||
|
ret.Add(item.Substring(1, item.Length - 2));
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Überschreibt eine InI-Datei mit der Kompletten neuen Configuration
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="config">Neue Konfiguration</param>
|
||||||
|
public void SetSections(Dictionary<String, Dictionary<String, String>> config) {
|
||||||
|
this.inifile.Clear();
|
||||||
|
foreach (KeyValuePair<String, Dictionary<String, String>> item in config) {
|
||||||
|
String key = item.Key;
|
||||||
|
if(!key.StartsWith("[")) {
|
||||||
|
key = "[" + key + "]";
|
||||||
|
}
|
||||||
|
if (Regex.Match(key, @"^\[[a-zA-ZäöüÄÖÜ0-9\-_ ]+\]\w*$", RegexOptions.IgnoreCase).Success) {
|
||||||
|
this.inifile.Add(key, item.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.Changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Dictionary<String, String> GetSection(String section) {
|
||||||
|
if(this.inifile.Keys.Contains(section)) {
|
||||||
|
return this.inifile[section];
|
||||||
|
}
|
||||||
|
if(this.inifile.Keys.Contains("["+section+"]")) {
|
||||||
|
return this.inifile["[" + section + "]"];
|
||||||
|
}
|
||||||
|
return new Dictionary<String, String>();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gibt einen einzelnen Wert zurück
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="section">Name der Sektion</param>
|
||||||
|
/// <param name="key">Name des Wertes</param>
|
||||||
|
/// <returns></returns>
|
||||||
public String GetValue(String section, String key)
|
public String GetValue(String section, String key)
|
||||||
{
|
{
|
||||||
if (!section.StartsWith("[")) {
|
if (!section.StartsWith("[")) {
|
||||||
section = "[" + section + "]";
|
section = "[" + section + "]";
|
||||||
}
|
}
|
||||||
if (this.cont.Keys.Contains(section)) {
|
if (this.inifile.Keys.Contains(section)) {
|
||||||
if (this.cont[section].Keys.Contains(key)) {
|
if (this.inifile[section].Keys.Contains(key)) {
|
||||||
return this.cont[section][key];
|
return this.inifile[section][key];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Setzt einen Wert in einer Sektion
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="section">Name der Sektion</param>
|
||||||
|
/// <param name="key">Name des Wertes</param>
|
||||||
|
/// <param name="value">Wert</param>
|
||||||
public void SetValue(String section, String key, String value)
|
public void SetValue(String section, String key, String value)
|
||||||
{
|
{
|
||||||
if (!section.StartsWith("[")) {
|
if (!section.StartsWith("[")) {
|
||||||
section = "[" + section + "]";
|
section = "[" + section + "]";
|
||||||
}
|
}
|
||||||
if (this.cont.Keys.Contains(section)) {
|
if (this.inifile.Keys.Contains(section)) {
|
||||||
if (this.cont[section].Keys.Contains(key)) {
|
if (this.inifile[section].Keys.Contains(key)) {
|
||||||
this.cont[section][key] = value;
|
this.inifile[section][key] = value;
|
||||||
} else {
|
} else {
|
||||||
this.cont[section].Add(key, value);
|
this.inifile[section].Add(key, value);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Dictionary<String, String> sub = new Dictionary<String, String> {
|
Dictionary<String, String> sub = new Dictionary<String, String> {
|
||||||
{ key, value }
|
{ key, value }
|
||||||
};
|
};
|
||||||
this.cont.Add(section, sub);
|
this.inifile.Add(section, sub);
|
||||||
}
|
}
|
||||||
this.Changed();
|
this.Changed();
|
||||||
}
|
}
|
||||||
@@ -125,7 +216,7 @@ namespace BlubbFish.Utils
|
|||||||
file.BaseStream.SetLength(0);
|
file.BaseStream.SetLength(0);
|
||||||
file.BaseStream.Flush();
|
file.BaseStream.Flush();
|
||||||
file.BaseStream.Seek(0, SeekOrigin.Begin);
|
file.BaseStream.Seek(0, SeekOrigin.Begin);
|
||||||
foreach (KeyValuePair<String, Dictionary<String, String>> cap in this.cont) {
|
foreach (KeyValuePair<String, Dictionary<String, String>> cap in this.inifile) {
|
||||||
file.WriteLine(cap.Key);
|
file.WriteLine(cap.Key);
|
||||||
foreach (KeyValuePair<String, String> sub in cap.Value) {
|
foreach (KeyValuePair<String, String> sub in cap.Value) {
|
||||||
file.WriteLine(sub.Key + "=" + sub.Value);
|
file.WriteLine(sub.Key + "=" + sub.Value);
|
||||||
@@ -146,10 +237,10 @@ namespace BlubbFish.Utils
|
|||||||
if (!name.StartsWith("[")) {
|
if (!name.StartsWith("[")) {
|
||||||
name = "[" + name + "]";
|
name = "[" + name + "]";
|
||||||
}
|
}
|
||||||
if (this.cont.Keys.Contains(name)) {
|
if (this.inifile.Keys.Contains(name)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
this.cont.Add(name, new Dictionary<String, String>());
|
this.inifile.Add(name, new Dictionary<String, String>());
|
||||||
this.Changed();
|
this.Changed();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -164,12 +255,22 @@ namespace BlubbFish.Utils
|
|||||||
if (!name.StartsWith("[")) {
|
if (!name.StartsWith("[")) {
|
||||||
name = "[" + name + "]";
|
name = "[" + name + "]";
|
||||||
}
|
}
|
||||||
if (!this.cont.Keys.Contains(name)) {
|
if (!this.inifile.Keys.Contains(name)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
this.cont.Remove(name);
|
this.inifile.Remove(name);
|
||||||
this.Changed();
|
this.Changed();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
protected virtual void Dispose(Boolean disposing) {
|
||||||
|
if (disposing) {
|
||||||
|
this.k.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose() {
|
||||||
|
Dispose(true);
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+57
-26
@@ -1,17 +1,44 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
namespace BlubbFish.Utils
|
namespace BlubbFish.Utils
|
||||||
{
|
{
|
||||||
abstract public class OwnObject
|
abstract public class OwnObject
|
||||||
{
|
{
|
||||||
private List<Tuple<DateTime, String, String, LogLevel>> loglist = new List<Tuple<DateTime, String, String, LogLevel>>();
|
public struct LogObject {
|
||||||
|
public LogObject(DateTime date, String location, String message, LogLevel level) {
|
||||||
|
this.Date = date;
|
||||||
|
this.Location = location;
|
||||||
|
this.Message = message;
|
||||||
|
this.Level = level;
|
||||||
|
}
|
||||||
|
|
||||||
public delegate void LogEvent(String location, String message, LogLevel level, DateTime date);
|
public DateTime Date { get; set; }
|
||||||
public enum LogLevel : int
|
public String Location { get; set; }
|
||||||
{
|
public String Message { get; set; }
|
||||||
|
public LogLevel Level { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Formates a LogMessage to a String
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>Formated String</returns>
|
||||||
|
public override String ToString() {
|
||||||
|
return "[" + this.Date.ToString("R") + "]: " + this.Level.ToString() + " "+ this.Location + ", " + this.Message;
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Formates a LogMessage to a String
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="classNames">Enables the output of the location</param>
|
||||||
|
/// <param name="timeStamps">Enables the output of the date</param>
|
||||||
|
/// <returns>Formated String</returns>
|
||||||
|
public String ToString(Boolean classNames, Boolean timeStamps) {
|
||||||
|
return (timeStamps ? "[" + this.Date.ToString("R") + "]: " + this.Level.ToString() + " " : "") + (classNames ? this.Location + ", " : "") + this.Message;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<LogObject> loglist = new List<LogObject>();
|
||||||
|
|
||||||
|
public delegate void LogEvent(Object sender, LogEventArgs e);
|
||||||
|
public enum LogLevel : Int32 {
|
||||||
Debug = 1,
|
Debug = 1,
|
||||||
Notice = 2,
|
Notice = 2,
|
||||||
Info = 4,
|
Info = 4,
|
||||||
@@ -29,51 +56,55 @@ namespace BlubbFish.Utils
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the Complete Log
|
/// Get the Complete Log
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public List<String> GetLog(LogLevel level, Boolean classNames, Boolean timeStamps)
|
public List<String> GetLog(LogLevel level, Boolean classNames, Boolean timeStamps) {
|
||||||
{
|
|
||||||
List<String> ret = new List<String>();
|
List<String> ret = new List<String>();
|
||||||
foreach (Tuple<DateTime, String, String, LogLevel> t in this.loglist) {
|
foreach (LogObject t in this.loglist) {
|
||||||
if (t.Item4 >= level) {
|
if (t.Level >= level) {
|
||||||
ret.Add(LogToString(t.Item2, t.Item3, t.Item4, t.Item1, classNames, timeStamps));
|
ret.Add(t.ToString(classNames, timeStamps));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Formates a LogMessage to a String
|
/// Put a message in the log
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static String LogToString(String location, String message, LogLevel level, DateTime date, Boolean classNames, Boolean timeStamps)
|
/// <param name="location">Where the event arrives</param>
|
||||||
{
|
/// <param name="message">The logmessage itselfs</param>
|
||||||
return (timeStamps ? "[" + date.ToString("R") + "]: " + level.ToString() + " " : "") + (classNames ? location + ", " : "") + message;
|
/// <param name="level">Level of the message</param>
|
||||||
}
|
|
||||||
|
|
||||||
protected void AddLog(String location, String message, LogLevel level)
|
protected void AddLog(String location, String message, LogLevel level)
|
||||||
{
|
{
|
||||||
this.AddLog(location, message, level, DateTime.Now);
|
this.AddLog(location, message, level, DateTime.Now);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Put a message in the log
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="location">Where the event arrives</param>
|
||||||
|
/// <param name="message">The logmessage itselfs</param>
|
||||||
|
/// <param name="level">Level of the message</param>
|
||||||
|
/// <param name="date">Date of the message</param>
|
||||||
protected void AddLog(String location, String message, LogLevel level, DateTime date)
|
protected void AddLog(String location, String message, LogLevel level, DateTime date)
|
||||||
{
|
{
|
||||||
|
LogEventArgs e = new LogEventArgs(location, message, level, date);
|
||||||
if (EventDebug != null && level >= LogLevel.Debug) {
|
if (EventDebug != null && level >= LogLevel.Debug) {
|
||||||
EventDebug(location, message, level, date);
|
EventDebug(this, e);
|
||||||
}
|
}
|
||||||
if (EventNotice != null && level >= LogLevel.Notice) {
|
if (EventNotice != null && level >= LogLevel.Notice) {
|
||||||
EventNotice(location, message, level, date);
|
EventNotice(this, e);
|
||||||
}
|
}
|
||||||
if (EventInfo != null && level >= LogLevel.Info) {
|
if (EventInfo != null && level >= LogLevel.Info) {
|
||||||
EventInfo(location, message, level, date);
|
EventInfo(this, e);
|
||||||
}
|
}
|
||||||
if (EventWarn != null && level >= LogLevel.Warn) {
|
if (EventWarn != null && level >= LogLevel.Warn) {
|
||||||
EventWarn(location, message, level, date);
|
EventWarn(this, e);
|
||||||
}
|
}
|
||||||
if (EventError != null && level >= LogLevel.Error) {
|
if (EventError != null && level >= LogLevel.Error) {
|
||||||
EventError(location, message, level, date);
|
EventError(this, e);
|
||||||
}
|
}
|
||||||
if (EventLog != null) {
|
EventLog?.Invoke(this, e);
|
||||||
EventLog(location, message, level, date);
|
|
||||||
}
|
this.loglist.Add(new LogObject(date, location, message, level));
|
||||||
this.loglist.Add(new Tuple<DateTime, String, String, LogLevel>(date, location, message, level));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-7
@@ -4,21 +4,21 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace BlubbFish.Utils
|
namespace BlubbFish.Utils {
|
||||||
{
|
public abstract class OwnView {
|
||||||
public abstract class OwnView
|
|
||||||
{
|
protected OwnView() { }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Called if the Oberver (Model) updates its View
|
/// Called if the Oberver (Model) updates its View
|
||||||
/// </summary>
|
/// </summary>
|
||||||
abstract public void Update();
|
public abstract void Update();
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Called if view is viewed
|
/// Called if view is viewed
|
||||||
/// </summary>
|
/// </summary>
|
||||||
abstract protected void Init();
|
//protected abstract void Init();
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Called if Form is Disposed
|
/// Called if Form is Disposed
|
||||||
/// </summary>
|
/// </summary>
|
||||||
abstract public void Dispose();
|
public abstract void Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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 - 16.04.2017")]
|
[assembly: AssemblyCopyright("Copyright © 2014 - 07.05.2018")]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
@@ -32,5 +32,5 @@ 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.0.2.3")]
|
[assembly: AssemblyVersion("1.0.7.0")]
|
||||||
[assembly: AssemblyFileVersion("1.0.2.3")]
|
[assembly: AssemblyFileVersion("1.0.7.0")]
|
||||||
|
|||||||
+192
@@ -0,0 +1,192 @@
|
|||||||
|
|
||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using System.Net;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Xml;
|
||||||
|
|
||||||
|
namespace BlubbFish.Utils {
|
||||||
|
public class Updater : OwnObject {
|
||||||
|
private static Updater instances;
|
||||||
|
private String url;
|
||||||
|
private VersionInfo[] versions;
|
||||||
|
private Thread t;
|
||||||
|
|
||||||
|
public struct VersionInfo {
|
||||||
|
public VersionInfo(Type type) {
|
||||||
|
this.Name = type.Assembly.GetName().Name;
|
||||||
|
this.Version = type.Assembly.GetName().Version.ToString();
|
||||||
|
this.Filename = type.Assembly.ManifestModule.Name;
|
||||||
|
this.GUID = ((GuidAttribute)type.Assembly.GetCustomAttribute(typeof(GuidAttribute))).Value;
|
||||||
|
this.HasUpdate = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String Name { get; private set; }
|
||||||
|
public String Version { get; private set; }
|
||||||
|
public String Filename { get; private set; }
|
||||||
|
public String GUID { get; private set; }
|
||||||
|
public Boolean HasUpdate { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public delegate void UpdateStatus(Object sender, UpdaterEventArgs e);
|
||||||
|
public delegate void UpdateFail(Object sender, UpdaterFailEventArgs e);
|
||||||
|
|
||||||
|
public event UpdateStatus UpdateResult;
|
||||||
|
public event UpdateFail ErrorRaised;
|
||||||
|
|
||||||
|
private Updater() { }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get Instance of Updater
|
||||||
|
/// </summary>
|
||||||
|
public static Updater Instance {
|
||||||
|
get {
|
||||||
|
if(instances == null) {
|
||||||
|
instances = new Updater();
|
||||||
|
}
|
||||||
|
return instances;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Waits for the Result of the Updater thread.
|
||||||
|
/// </summary>
|
||||||
|
public void WaitForExit(Boolean exceuteUpdate = true) {
|
||||||
|
while (this.t.ThreadState == ThreadState.Running) { }
|
||||||
|
if(exceuteUpdate) {
|
||||||
|
if(File.Exists("update.bat")) {
|
||||||
|
System.Diagnostics.Process.Start("update.bat");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Set Path to check for Updates
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="url">HTTP URI</param>
|
||||||
|
public void SetUpdateInfo(String url, VersionInfo[] versions) {
|
||||||
|
this.url = url;
|
||||||
|
this.versions = versions;
|
||||||
|
FileStream file = new FileStream("version.xml",FileMode.Create);
|
||||||
|
XmlTextWriter xml = new XmlTextWriter(file, Encoding.UTF8);
|
||||||
|
xml.WriteStartDocument();
|
||||||
|
xml.WriteWhitespace("\n");
|
||||||
|
xml.WriteStartElement("filelist");
|
||||||
|
xml.WriteWhitespace("\n");
|
||||||
|
foreach (VersionInfo version in versions) {
|
||||||
|
xml.WriteWhitespace("\t");
|
||||||
|
xml.WriteStartElement("file");
|
||||||
|
xml.WriteAttributeString("Version", version.Version);
|
||||||
|
xml.WriteAttributeString("Filename", version.Filename);
|
||||||
|
xml.WriteAttributeString("GUID", version.GUID);
|
||||||
|
xml.WriteString(version.Name);
|
||||||
|
xml.WriteEndElement();
|
||||||
|
xml.WriteWhitespace("\n");
|
||||||
|
}
|
||||||
|
xml.WriteEndElement();
|
||||||
|
xml.Flush();
|
||||||
|
file.Flush();
|
||||||
|
file.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Check for Updates
|
||||||
|
/// </summary>
|
||||||
|
/// <exception cref="ArgumentException"></exception>
|
||||||
|
public void Check() {
|
||||||
|
if(this.url == "") {
|
||||||
|
throw new ArgumentException("Zuerst eine URL setzen!");
|
||||||
|
}
|
||||||
|
if(this.versions.Length == 0) {
|
||||||
|
throw new ArgumentException("Zuerst Dateien registrieren!");
|
||||||
|
}
|
||||||
|
if(this.UpdateResult == null) {
|
||||||
|
throw new ArgumentNullException("Zuerst das Update Event anhängen.");
|
||||||
|
}
|
||||||
|
this.t = new Thread(this.Runner);
|
||||||
|
this.t.Start();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Runner() {
|
||||||
|
Thread.Sleep(1000);
|
||||||
|
try {
|
||||||
|
Stream stream = WebRequest.Create(this.url + "version.xml").GetResponse().GetResponseStream();
|
||||||
|
String content = new StreamReader(stream).ReadToEnd();
|
||||||
|
Boolean update = false;
|
||||||
|
XmlDocument doc = new XmlDocument();
|
||||||
|
doc.LoadXml(content);
|
||||||
|
foreach (XmlNode node in doc.DocumentElement.ChildNodes) {
|
||||||
|
String guid = node.Attributes["GUID"].Value;
|
||||||
|
String version = node.Attributes["Version"].Value;
|
||||||
|
for(Int32 i=0;i<this.versions.Length;i++) {
|
||||||
|
if (this.versions[i].GUID == guid && this.versions[i].Version != version) {
|
||||||
|
this.versions[i].HasUpdate = true;
|
||||||
|
update = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (update) {
|
||||||
|
this.UpdateResult(this, new UpdaterEventArgs(true, "Update verfügbar"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
this.ErrorRaised?.Invoke(this, new UpdaterFailEventArgs(e));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.UpdateResult(this, new UpdaterEventArgs(false, "Kein Update verfügbar"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Update the file
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="afterExit">Updates the Programm after it has been closed</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public Boolean Update(Boolean afterExit = true) {
|
||||||
|
try {
|
||||||
|
if (afterExit) {
|
||||||
|
this.UpdateAfter();
|
||||||
|
} else {
|
||||||
|
this.UpdateNow();
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
this.ErrorRaised?.Invoke(this, new UpdaterFailEventArgs(e));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdateAfter() {
|
||||||
|
this.UpdateNow(true);
|
||||||
|
StreamWriter update = new StreamWriter("update.bat", false);
|
||||||
|
update.WriteLine("echo off");
|
||||||
|
update.WriteLine("echo \"Warte 10s\"");
|
||||||
|
update.WriteLine("ping 127.0.0.1 -n 10");
|
||||||
|
update.WriteLine("echo \"Kopiere Dateien....\"");
|
||||||
|
foreach (VersionInfo file in this.versions) {
|
||||||
|
if (file.HasUpdate) {
|
||||||
|
update.WriteLine("echo \"Kopiere " + file.Filename + "\"");
|
||||||
|
update.WriteLine("del " + file.Filename);
|
||||||
|
update.WriteLine("move " + file.Filename + "_ " + file.Filename);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
update.WriteLine("start cmd /C ping 127.0.0.1 -n 10 & del update.bat");
|
||||||
|
update.Flush();
|
||||||
|
update.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdateNow(Boolean forAfter = false) {
|
||||||
|
foreach (VersionInfo file in this.versions) {
|
||||||
|
if (file.HasUpdate) {
|
||||||
|
Stream stream = WebRequest.Create(this.url + file.Filename).GetResponse().GetResponseStream();
|
||||||
|
FileStream target = new FileStream(file.Filename + (forAfter ? "_" : ""), FileMode.Create);
|
||||||
|
stream.CopyTo(target);
|
||||||
|
target.Flush();
|
||||||
|
target.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+5
-2
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
@@ -9,8 +9,9 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>BlubbFish.Utils</RootNamespace>
|
<RootNamespace>BlubbFish.Utils</RootNamespace>
|
||||||
<AssemblyName>Utils</AssemblyName>
|
<AssemblyName>Utils</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
@@ -41,6 +42,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="CmdArgs.cs" />
|
<Compile Include="CmdArgs.cs" />
|
||||||
|
<Compile Include="EventArgsHelper.cs" />
|
||||||
<Compile Include="FileLogger.cs" />
|
<Compile Include="FileLogger.cs" />
|
||||||
<Compile Include="FileMutex.cs" />
|
<Compile Include="FileMutex.cs" />
|
||||||
<Compile Include="InIReader.cs" />
|
<Compile Include="InIReader.cs" />
|
||||||
@@ -49,6 +51,7 @@
|
|||||||
<Compile Include="OwnObject.cs" />
|
<Compile Include="OwnObject.cs" />
|
||||||
<Compile Include="OwnView.cs" />
|
<Compile Include="OwnView.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
<Compile Include="Updater.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user