21 Commits
Author SHA1 Message Date
BlubbFish dcd26b83aa [WP] Update functionality 2017-04-25 20:44:17 +00:00
BlubbFish 740b9152b5 Automatic Cronjob Checkin: 20170424-235538 2017-04-24 21:55:40 +00:00
BlubbFish fca2575ab6 [WP] Refactoring so its in common to C# 2017-04-23 21:07:41 +00:00
BlubbFish 0fe8437e0d [WP] Refactoring so its in common to C# 2017-04-21 21:55:26 +00:00
BlubbFish a7ce209510 [NF] First try to create an Autoupdater 2017-04-20 15:15:11 +00:00
BlubbFish 75dd6e8e5e [NF] First try to create an Autoupdater 2017-04-20 15:09:37 +00:00
BlubbFish 80a3d4ae8f Last Release 2017-04-18 22:06:10 +00:00
BlubbFish 362f120efd Add LogObject 2017-04-18 22:05:35 +00:00
BlubbFish beabdc513c Automatic Cronjob Checkin: 20170418-142622 2017-04-18 12:27:11 +00:00
BlubbFish 66843e9b50 [NF] Errorlog now implemented #8 2017-04-17 00:04:43 +00:00
BlubbFish ef252b354a Enchanchement #2, #3 and #4 fixed 2017-04-16 20:55:53 +00:00
BlubbFish 70d2a8084b Development Checkin, should not break 2017-04-16 00:21:20 +00:00
BlubbFish a523e62a48 Change a lot of typos and violations against C# defination 2017-03-09 22:32:42 +00:00
BlubbFish ca97ec2106 Neue Version mit Mutex 2017-03-09 19:58:12 +00:00
BlubbFish e347e00827 Bugfix in Datum 2017-02-21 09:02:57 +00:00
BlubbFish fa346725bc Kleine Änderungen an Own-Controller 2016-12-03 10:37:48 +00:00
BlubbFish acf90704a8 [NF] now it's easier to specifiy a directory for logging 2016-06-08 11:25:47 +00:00
BlubbFish 845b733326 First Version Ever that runs a little bit 2016-01-26 14:20:42 +00:00
BlubbFish 1823bb05a1 Init of TimeKeeper 2016-01-20 17:21:55 +00:00
BlubbFish 3988395c0a ebbits tisch demo 2015-11-27 12:19:02 +00:00
BlubbFish bcfb499bd0 Automatic Cronjob Checkin: 20151116-221252 2015-11-16 21:12:51 +00:00
13 changed files with 806 additions and 507 deletions
+55 -70
View File
@@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
namespace BlubbFish.Utils namespace BlubbFish.Utils
{ {
@@ -13,9 +12,9 @@ namespace BlubbFish.Utils
Touple Touple
} }
#region Classes #region Classes
public class VaildArguments public struct VaildArguments
{ {
public VaildArguments(ArgLength length, bool required) public VaildArguments(ArgLength length, Boolean required)
{ {
this.Required = required; this.Required = required;
this.Length = length; this.Length = length;
@@ -27,34 +26,36 @@ namespace BlubbFish.Utils
} }
public ArgLength Length { get; private set; } public ArgLength Length { get; private set; }
public bool 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)
{ {
this.type = type; this.Type = type;
this.data = data; this.Data = data;
} }
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; }
internal void setData(string data) internal void SetData(String data)
{ {
if (data != "") if (data != "") {
this.data = data; this.Data = data;
}
} }
} }
#endregion #endregion
private string[] args; private String[] args;
private List<ArgTouple> argList; private List<ArgTouple> argList;
private Dictionary<string, VaildArguments> argsPosible = new Dictionary<string, VaildArguments>(); private Dictionary<String, VaildArguments> argsPosible = new Dictionary<String, VaildArguments>();
private static CmdArgs instances = null; private static CmdArgs instances = null;
private bool isSetArguments = false; private Boolean isSetArguments = false;
private CmdArgs() private CmdArgs()
{ {
@@ -64,25 +65,25 @@ namespace BlubbFish.Utils
/// Gibt eine Instanz der Klasse zurück /// Gibt eine Instanz der Klasse zurück
/// </summary> /// </summary>
/// <returns>Klasse</returns> /// <returns>Klasse</returns>
public static CmdArgs getInstance() public static CmdArgs Instance
{
if (instances == null)
{ {
get {
if (instances == null) {
instances = new CmdArgs(); instances = new CmdArgs();
} }
return instances; return instances;
} }
}
/// <summary> /// <summary>
/// Übernimmt die Argumente für die Klasse /// Übernimmt die Argumente für die Klasse
/// </summary> /// </summary>
/// <param name="arguments">Mögliche Komandozeilenargumente</param> /// <param name="arguments">Mögliche Komandozeilenargumente</param>
/// <param name="args">Tatsächliche Komandozeilenargumente</param> /// <param name="args">Tatsächliche Komandozeilenargumente</param>
public void setArguments(Dictionary<string, VaildArguments> arguments, string[] args) public void SetArguments(Dictionary<String, VaildArguments> arguments, String[] args)
{ {
this.args = args; this.args = args;
if (!this.isSetArguments) if (!this.isSetArguments) {
{
this.isSetArguments = true; this.isSetArguments = true;
this.argsPosible = arguments; this.argsPosible = arguments;
this.Init(); this.Init();
@@ -92,19 +93,13 @@ namespace BlubbFish.Utils
private void Init() private void Init()
{ {
this.argList = new List<ArgTouple>(); this.argList = new List<ArgTouple>();
for (int i = 0; i < this.args.Length; i++) for (Int32 i = 0; i < this.args.Length; i++) {
{ if (this.argsPosible.Keys.Contains(this.args[i])) {
if (this.argsPosible.Keys.Contains(args[i])) ArgTouple arg = new ArgTouple(this.args[i]);
{ if (this.argsPosible[this.args[i]].Length == ArgLength.Touple) {
ArgTouple arg = new ArgTouple(args[i]); if (this.args.Length > i + 1) {
if (argsPosible[args[i]].Length == ArgLength.Touple) arg.SetData(this.args[++i]);
{ } else {
if (args.Length > i + 1)
{
arg.setData(args[++i]);
}
else
{
throw new ArgumentException(); throw new ArgumentException();
} }
} }
@@ -117,7 +112,7 @@ namespace BlubbFish.Utils
/// Menge der angegebenen Komandozeilen-Argumente /// Menge der angegebenen Komandozeilen-Argumente
/// </summary> /// </summary>
/// <returns>Menge</returns> /// <returns>Menge</returns>
public int GetArgsLength() public Int32 GetArgsLength()
{ {
return this.argList.Count; return this.argList.Count;
} }
@@ -127,13 +122,13 @@ namespace BlubbFish.Utils
/// </summary> /// </summary>
/// <param name="name">Name des Arguments</param> /// <param name="name">Name des Arguments</param>
/// <returns>true wenn angegeben</returns> /// <returns>true wenn angegeben</returns>
public bool HasArgumentType(string name) public Boolean HasArgumentType(String name)
{ {
foreach (ArgTouple t in this.argList) foreach (ArgTouple t in this.argList) {
{ if (t.Type == name) {
if (t.type == name)
return true; return true;
} }
}
return false; return false;
} }
@@ -142,57 +137,47 @@ namespace BlubbFish.Utils
/// </summary> /// </summary>
/// <param name="name">Name des Arguments</param> /// <param name="name">Name des Arguments</param>
/// <returns>Inhalt des Arguments oder ArgumentNullException</returns> /// <returns>Inhalt des Arguments oder ArgumentNullException</returns>
public string GetArgumentData(string name) public String GetArgumentData(String name)
{
foreach (ArgTouple t in this.argList)
{
if (t.type == name && t.data != null)
return t.data;
else
{ {
foreach (ArgTouple t in this.argList) {
if (t.Type == name && t.Data != null) {
return t.Data;
} else {
throw new ArgumentNullException(); throw new ArgumentNullException();
} }
} }
return null; return null;
} }
public bool HasAllRequiredArguments() public Boolean HasAllRequiredArguments()
{
foreach (KeyValuePair<string, VaildArguments> item in this.argsPosible)
{
if (item.Value.Required && !this.HasArgumentType(item.Key))
{ {
foreach (KeyValuePair<String, VaildArguments> item in this.argsPosible) {
if (item.Value.Required && !this.HasArgumentType(item.Key)) {
return false; return false;
} }
} }
return true; return true;
} }
public string getUsageList(string name) public String GetUsageList(String name)
{
string ret = "Usage: "+name+" Parameter\nParameter:\n";
string req ="";
string opt = "";
foreach (KeyValuePair<string, VaildArguments> item in this.argsPosible)
{
if (item.Value.Required)
{ {
String ret = "Usage: " + name + " Parameter\nParameter:\n";
String req = "";
String opt = "";
foreach (KeyValuePair<String, VaildArguments> item in this.argsPosible) {
if (item.Value.Required) {
req += item.Key + " " + ((item.Value.Length == ArgLength.Touple) ? " [data]\n" : "\n"); req += item.Key + " " + ((item.Value.Length == ArgLength.Touple) ? " [data]\n" : "\n");
} }
} }
if (req != "") if (req != "") {
{
ret += "Benötigte Parameter:\n" + req; ret += "Benötigte Parameter:\n" + req;
} }
foreach (KeyValuePair<string, VaildArguments> item in this.argsPosible) foreach (KeyValuePair<String, VaildArguments> item in this.argsPosible) {
{ if (!item.Value.Required) {
if (!item.Value.Required)
{
opt += item.Key + " " + ((item.Value.Length == ArgLength.Touple) ? " [data]\n" : "\n"); opt += item.Key + " " + ((item.Value.Length == ArgLength.Touple) ? " [data]\n" : "\n");
} }
} }
if (opt != "") if (opt != "") {
{
ret += "Optionale Parameter:\n" + opt; ret += "Optionale Parameter:\n" + opt;
} }
return ret; return ret;
+35
View File
@@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
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; }
}
}
+35 -15
View File
@@ -3,45 +3,65 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.IO; using System.IO;
using System.Reflection;
namespace BlubbFish.Utils namespace BlubbFish.Utils
{ {
public class FileLogger public class FileLogger
{ {
private static Dictionary<string, FileLogger> instances = new Dictionary<string, FileLogger>(); private static Dictionary<String, FileLogger> instances = new Dictionary<String, FileLogger>();
private static String logDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar;
private StreamWriter file; private StreamWriter file;
private FileLogger(string filename, bool append) private FileLogger(String filename, Boolean append)
{
if (!File.Exists(filename))
{
string folder = Path.GetDirectoryName(Path.GetFullPath(filename));
if (!Directory.Exists(folder))
{ {
filename = logDir + filename;
if (!File.Exists(filename)) {
String folder = Path.GetDirectoryName(Path.GetFullPath(filename));
if (!Directory.Exists(folder)) {
Directory.CreateDirectory(folder); Directory.CreateDirectory(folder);
} }
} }
this.file = new StreamWriter(filename, append, Encoding.UTF8); this.file = new StreamWriter(filename, append, Encoding.UTF8) {
this.file.AutoFlush = true; AutoFlush = true
};
} }
public static FileLogger getInstance(string filename, bool append) public static FileLogger GetInstance(String filename, Boolean append)
{
if (!instances.Keys.Contains(filename))
{ {
if (!instances.Keys.Contains(filename)) {
instances.Add(filename, new FileLogger(filename, append)); instances.Add(filename, new FileLogger(filename, append));
} }
return instances[filename]; return instances[filename];
} }
public void setArray(string[] text) public static void SetLogDir(String v)
{ {
this.file.Write(String.Join(file.NewLine, text) + file.NewLine); v = v.Replace("..", "");
v = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar + v;
if (Directory.Exists(v)) {
logDir = v;
} else {
Directory.CreateDirectory(v);
logDir = v;
}
if (logDir.Substring(logDir.Length - 1) != Path.DirectorySeparatorChar.ToString()) {
logDir = logDir + Path.DirectorySeparatorChar;
}
}
public void SetArray(String[] text)
{
this.file.Write(String.Join(this.file.NewLine, text) + this.file.NewLine);
this.file.Flush(); this.file.Flush();
} }
public void setLine(string text) public void SetLine(String text)
{ {
this.file.WriteLine(text); this.file.WriteLine(text);
this.file.Flush(); this.file.Flush();
} }
public void SetLine(String text, DateTime d)
{
this.SetLine(d.ToString("[yyyy-MM-dd HH:mm:ss.ffff] ") + text);
}
} }
} }
+71
View File
@@ -0,0 +1,71 @@
using System;
using System.IO;
using System.Security.Cryptography;
using System.Text;
namespace BlubbFish.Utils
{
public class FileMutex : IDisposable
{
private static FileMutex instance;
private String filename;
private StreamWriter file;
private FileMutex() { }
public static FileMutex Instance
{
get {
if (instance == null) {
instance = new FileMutex();
}
return instance;
}
}
public void SetName(String name)
{
String path = AppDomain.CurrentDomain.BaseDirectory;
this.filename = path + String.Join(String.Empty, Array.ConvertAll(new SHA512Managed().ComputeHash(Encoding.UTF8.GetBytes(name)), b => b.ToString("X2"))) + ".lock.txt";
}
public Boolean Create()
{
if (File.Exists(this.filename)) {
return false;
}
this.file = new StreamWriter(this.filename);
InitFile();
return File.Exists(this.filename) && this.file != null;
}
private void InitFile()
{
this.file.Write("Created: " + DateTime.Now.ToUniversalTime() + "\n");
this.file.Flush();
}
public Boolean Delete()
{
if(this.file != null) {
this.file.Close();
}
File.Delete(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);
}
}
}
+76 -89
View File
@@ -8,145 +8,126 @@ using System.Threading.Tasks;
namespace BlubbFish.Utils namespace BlubbFish.Utils
{ {
public class InIReader public class InIReader : IDisposable
{ {
private Dictionary<string, Dictionary<string, string>> cont; private Dictionary<String, Dictionary<String, String>> cont;
private FileSystemWatcher k = new FileSystemWatcher(Directory.GetCurrentDirectory(), "*.ini"); private FileSystemWatcher k = new FileSystemWatcher(Directory.GetCurrentDirectory(), "*.ini");
private string filename; private String filename;
private static Dictionary<string, InIReader> instances = new Dictionary<string, InIReader>(); private static Dictionary<String, InIReader> instances = new Dictionary<String, InIReader>();
private InIReader(string filename) private InIReader(String filename)
{ {
this.filename = filename; this.filename = filename;
k.Changed += new FileSystemEventHandler(this.readAgain); this.k.Changed += new FileSystemEventHandler(this.ReadAgain);
loadFile(); LoadFile();
} }
public static InIReader getInstance(string filename) public static InIReader GetInstance(String filename)
{
if (!instances.Keys.Contains(filename))
{ {
if (!instances.Keys.Contains(filename)) {
instances.Add(filename, new InIReader(filename)); instances.Add(filename, new InIReader(filename));
} }
return instances[filename]; return instances[filename];
} }
private void readAgain(object sender, EventArgs e) private void ReadAgain(Object sender, EventArgs e)
{ {
this.loadFile(); this.LoadFile();
} }
private void loadFile() private void LoadFile()
{ {
this.cont = new Dictionary<string, Dictionary<string, string>>(); this.cont = 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 = "";
while (fline != null) while (fline != null) {
{
fline = file.ReadLine(); fline = file.ReadLine();
if (fline != null && fline.Length > 0 && fline.Substring(0,1) != ";") if (fline != null && fline.Length > 0 && fline.Substring(0, 1) != ";") {
buf.Add(fline); buf.Add(fline);
} }
}
file.Close(); file.Close();
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-Z0-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.cont.Add(cap, sub);
} }
cap = line; cap = line;
sub = new Dictionary<string, string>(); sub = new Dictionary<String, String>();
} } else {
else if (line != "" && cap != "") {
{ String key = line.Substring(0, line.IndexOf('='));
if (line != "" && cap != "") String value = line.Substring(line.IndexOf('=') + 1);
{
string key = line.Substring(0, line.IndexOf('='));
string value = line.Substring(line.IndexOf('=') + 1);
sub.Add(key, value); sub.Add(key, value);
} }
} }
} }
if (sub.Count != 0 && cap != "") if (sub.Count != 0 && cap != "") {
{
this.cont.Add(cap, sub); this.cont.Add(cap, sub);
} }
} }
public List<String> getSections() public List<String> GetSections()
{ {
return cont.Keys.ToList<String>(); return this.cont.Keys.ToList<String>();
} }
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 (cont.Keys.Contains(section)) if (this.cont.Keys.Contains(section)) {
{ if (this.cont[section].Keys.Contains(key)) {
if (cont[section].Keys.Contains(key)) return this.cont[section][key];
{
return cont[section][key];
} }
} }
return null; return null;
} }
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 (cont.Keys.Contains(section)) if (this.cont.Keys.Contains(section)) {
{ if (this.cont[section].Keys.Contains(key)) {
if (cont[section].Keys.Contains(key)) this.cont[section][key] = value;
{ } else {
cont[section][key] = value; this.cont[section].Add(key, value);
} }
else } else {
{ Dictionary<String, String> sub = new Dictionary<String, String> {
cont[section].Add(key, value); { key, value }
};
this.cont.Add(section, sub);
} }
} this.Changed();
else
{
Dictionary<string, string> sub = new Dictionary<string, string>();
sub.Add(key, value);
cont.Add(section, sub);
}
this.changed();
} }
private void changed() private void Changed()
{ {
k.Changed -= null; this.k.Changed -= null;
saveSettings(); SaveSettings();
loadFile(); LoadFile();
k.Changed += new FileSystemEventHandler(this.readAgain); this.k.Changed += new FileSystemEventHandler(this.ReadAgain);
} }
private void saveSettings() private void SaveSettings()
{ {
StreamWriter file = new StreamWriter(this.filename); StreamWriter file = new StreamWriter(this.filename);
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.cont) {
{
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);
} }
file.WriteLine(); file.WriteLine();
@@ -160,18 +141,16 @@ namespace BlubbFish.Utils
/// </summary> /// </summary>
/// <param name="name">Sektionsname</param> /// <param name="name">Sektionsname</param>
/// <returns>true if added, false if error</returns> /// <returns>true if added, false if error</returns>
public bool addSection(string name) public Boolean AddSection(String name)
{
if (!name.StartsWith("["))
{ {
if (!name.StartsWith("[")) {
name = "[" + name + "]"; name = "[" + name + "]";
} }
if (this.cont.Keys.Contains(name)) if (this.cont.Keys.Contains(name)) {
{
return false; return false;
} }
this.cont.Add(name, new Dictionary<string, string>()); this.cont.Add(name, new Dictionary<String, String>());
this.changed(); this.Changed();
return true; return true;
} }
@@ -180,19 +159,27 @@ namespace BlubbFish.Utils
/// </summary> /// </summary>
/// <param name="name">Sektionsname</param> /// <param name="name">Sektionsname</param>
/// <returns>true if removed, false if error</returns> /// <returns>true if removed, false if error</returns>
public bool removeSection(string name) public Boolean RemoveSection(String name)
{
if (!name.StartsWith("["))
{ {
if (!name.StartsWith("[")) {
name = "[" + name + "]"; name = "[" + name + "]";
} }
if (!this.cont.Keys.Contains(name)) if (!this.cont.Keys.Contains(name)) {
{
return false; return false;
} }
this.cont.Remove(name); this.cont.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);
}
} }
} }
+4 -3
View File
@@ -12,10 +12,11 @@ namespace BlubbFish.Utils
/// <summary> /// <summary>
/// Führt den Controller aus. /// Führt den Controller aus.
/// </summary> /// </summary>
public void execute() public void Execute()
{ {
this.init(); this.Init();
} }
abstract protected void init(); abstract protected void Init();
abstract public void Dispose();
} }
} }
+11 -8
View File
@@ -12,8 +12,7 @@ namespace BlubbFish.Utils
private List<OwnView> observer = new List<OwnView>(); private List<OwnView> observer = new List<OwnView>();
public static T Instance public static T Instance
{ {
get get {
{
return _instance.Value; return _instance.Value;
} }
} }
@@ -22,15 +21,19 @@ namespace BlubbFish.Utils
return Activator.CreateInstance(typeof(T), true) as T; return Activator.CreateInstance(typeof(T), true) as T;
} }
public void setObserver(OwnView tray) public void SetObserver(OwnView view)
{ {
this.observer.Add(tray); this.observer.Add(view);
tray.update(); view.Update();
} }
protected void update()
public void RemoveObserver(OwnView view) {
this.observer.Remove(view);
}
protected void Update()
{ {
this.observer.ForEach(delegate(OwnView tray) { tray.update(); }); this.observer.ForEach(delegate (OwnView view) { view.Update(); });
} }
abstract protected void init(); abstract protected void Init();
} }
} }
+80 -40
View File
@@ -3,12 +3,44 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
namespace BlubbFish.Utils { namespace BlubbFish.Utils
abstract public class OwnObject { {
private List<Tuple<DateTime, string, string, LogLevel>> loglist = new List<Tuple<DateTime, string, string, LogLevel>>(); abstract public class OwnObject
{
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,
@@ -16,57 +48,65 @@ namespace BlubbFish.Utils {
Error = 16 Error = 16
} }
public event LogEvent eventDebug; public event LogEvent EventDebug;
public event LogEvent eventNotice; public event LogEvent EventNotice;
public event LogEvent eventInfo; public event LogEvent EventInfo;
public event LogEvent eventWarn; public event LogEvent EventWarn;
public event LogEvent eventError; public event LogEvent EventError;
public event LogEvent EventLog; public event LogEvent EventLog;
/// <summary> /// <summary>
/// Get the Complete Log /// Get the Complete Log
/// </summary> /// </summary>
public List<string> getLog(LogLevel level, bool classNames, bool 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, bool classNames, bool timeStamps) { /// <param name="location">Where the event arrives</param>
return (timeStamps ? "[" + date.ToString("R") + "]: "+level.ToString()+" " : "") + (classNames ? location + ", " : "") + message; /// <param name="message">The logmessage itselfs</param>
/// <param name="level">Level of the message</param>
protected void AddLog(String location, String message, LogLevel level)
{
this.AddLog(location, message, level, DateTime.Now);
} }
protected void addLog(string location, string message, LogLevel level) { /// <summary>
this.addLog(location, message, level, DateTime.Now); /// 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)
{
LogEventArgs e = new LogEventArgs(location, message, level, date);
if (EventDebug != null && level >= LogLevel.Debug) {
EventDebug(this, e);
} }
if (EventNotice != null && level >= LogLevel.Notice) {
EventNotice(this, e);
}
if (EventInfo != null && level >= LogLevel.Info) {
EventInfo(this, e);
}
if (EventWarn != null && level >= LogLevel.Warn) {
EventWarn(this, e);
}
if (EventError != null && level >= LogLevel.Error) {
EventError(this, e);
}
EventLog?.Invoke(this, e);
protected void addLog(string location, string message, LogLevel level, DateTime date) { this.loglist.Add(new LogObject(date, location, message, level));
if(eventDebug != null && level >= LogLevel.Debug) {
eventDebug(location, message, level, date);
}
if(eventNotice != null && level >= LogLevel.Notice) {
eventNotice(location, message, level, date);
}
if(eventInfo != null && level >= LogLevel.Info) {
eventInfo(location, message, level, date);
}
if(eventWarn != null && level >= LogLevel.Warn) {
eventWarn(location, message, level, date);
}
if(eventError != null && level >= LogLevel.Error) {
eventError(location, message, level, date);
}
if(EventLog != null) {
EventLog(location, message, level, date);
}
this.loglist.Add(new Tuple<DateTime, string, string, LogLevel>(date, location, message, level));
} }
} }
} }
+9 -7
View File
@@ -4,21 +4,23 @@ 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() {
this.Init();
}
/// <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();
} }
} }
+3 -3
View File
@@ -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")] [assembly: AssemblyCopyright("Copyright © 2014 - 24.04.2017")]
[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.0.0")] [assembly: AssemblyVersion("1.0.3.1")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.3.1")]
+152
View File
@@ -0,0 +1,152 @@
using System;
using System.Collections.Generic;
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() {
while (this.t.ThreadState == ThreadState.Running) { }
}
/// <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(1);
try {
Stream stream = WebRequest.Create(this.url + "version.xml").GetResponse().GetResponseStream();
String content = new StreamReader(stream).ReadToEnd();
List<VersionInfo> updates = new List<VersionInfo>();
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;
}
}
}
if (updates.Count > 0) {
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 {
} catch(Exception e) {
this.ErrorRaised?.Invoke(this, new UpdaterFailEventArgs(e));
return false;
}
return true;
}
}
}
+3
View File
@@ -41,13 +41,16 @@
</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="InIReader.cs" /> <Compile Include="InIReader.cs" />
<Compile Include="OwnController.cs" /> <Compile Include="OwnController.cs" />
<Compile Include="OwnModel.cs" /> <Compile Include="OwnModel.cs" />
<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.