[NF] Inireader vereinfachungen

CmdArgs.cs

@@ -12,7 +12,7 @@ namespace BlubbFish.Utils
       Touple
     }
     #region Classes
-    public class VaildArguments
+    public struct VaildArguments
     {
       public VaildArguments(ArgLength length, Boolean required)
       {
@@ -28,7 +28,7 @@ namespace BlubbFish.Utils
       public ArgLength Length { get; private set; }
       public Boolean Required { get; private set; }
     }
-    private class ArgTouple
+    private struct ArgTouple
     {
       public ArgTouple(String type, String data)
       {
@@ -38,6 +38,7 @@ namespace BlubbFish.Utils
       public ArgTouple(String type)
       {
         this.Type = type;
+        this.Data = "";
       }
       public String Type { get; private set; }
       public String Data { get; private set; }

EventArgsHelper.cs

@@ -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; }
+  }
+}

FileMutex.cs

@@ -5,7 +5,7 @@ using System.Text;
 
 namespace BlubbFish.Utils
 {
-  public class FileMutex
+  public class FileMutex : IDisposable
   {
     private static FileMutex instance;
     private String filename;
@@ -47,9 +47,25 @@ namespace BlubbFish.Utils
 
     public Boolean Delete()
     {
-      this.file.Close();
+      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);
+    }
   }
 }

InIReader.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace BlubbFish.Utils
 {
-  public class InIReader
+  public class InIReader : IDisposable
   {
     private Dictionary<String, Dictionary<String, String>> cont;
     private FileSystemWatcher k = new FileSystemWatcher(Directory.GetCurrentDirectory(), "*.ini");
@@ -52,7 +52,7 @@ namespace BlubbFish.Utils
       Dictionary<String, String> sub = new Dictionary<String, String>();
       String cap = "";
       foreach (String line in buf) {
-        Match match = Regex.Match(line, @"^\[[a-zA-Z0-9\-_ ]+\]\w*$", RegexOptions.IgnoreCase);
+        Match match = Regex.Match(line, @"^\[[a-zA-ZäöüÄÖÜ0-9\-_ ]+\]\w*$", RegexOptions.IgnoreCase);
         if (match.Success) {
           if (sub.Count != 0 && cap != "") {
             this.cont.Add(cap, sub);
@@ -74,7 +74,17 @@ namespace BlubbFish.Utils
 
     public List<String> GetSections()
     {
-      return this.cont.Keys.ToList<String>();
+      return this.cont.Keys.ToList();
+    }
+
+    public Dictionary<String, String> GetSection(String section) {
+      if(this.cont.Keys.Contains(section)) {
+        return this.cont[section];
+      }
+      if(this.cont.Keys.Contains("["+section+"]")) {
+        return this.cont["[" + section + "]"];
+      }
+      return new Dictionary<String, String>();
     }
 
     public String GetValue(String section, String key)
@@ -171,5 +181,15 @@ namespace BlubbFish.Utils
       this.Changed();
       return false;
     }
+    protected virtual void Dispose(Boolean disposing) {
+      if (disposing) {
+        this.k.Dispose();
+      }
+    }
+
+    public void Dispose() {
+      Dispose(true);
+      GC.SuppressFinalize(this);
+    }
   }
 }

OwnObject.cs

@@ -1,17 +1,44 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace BlubbFish.Utils
 {
   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,
       Notice = 2,
       Info = 4,
@@ -29,51 +56,55 @@ namespace BlubbFish.Utils
     /// <summary>
     /// Get the Complete Log
     /// </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>();
-      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;
     }
 
     /// <summary>
-    /// Formates a LogMessage to a String
+    /// Put a message in the log
     /// </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)
     {
       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)
     {
+      LogEventArgs e = new LogEventArgs(location, message, level, date);
       if (EventDebug != null && level >= LogLevel.Debug) {
-        EventDebug(location, message, level, date);
+        EventDebug(this, e);
       }
       if (EventNotice != null && level >= LogLevel.Notice) {
-        EventNotice(location, message, level, date);
+        EventNotice(this, e);
       }
       if (EventInfo != null && level >= LogLevel.Info) {
-        EventInfo(location, message, level, date);
+        EventInfo(this, e);
       }
       if (EventWarn != null && level >= LogLevel.Warn) {
-        EventWarn(location, message, level, date);
+        EventWarn(this, e);
       }
       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));
     }
   }
 }

OwnView.cs

@@ -4,21 +4,21 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BlubbFish.Utils
+namespace BlubbFish.Utils {
-{
+  public abstract class OwnView {
-  public abstract class OwnView
+
-  {
+    protected OwnView() { }
     /// <summary>
     /// Called if the Oberver (Model) updates its View
     /// </summary>
-    abstract public void Update();
+    public abstract void Update();
     /// <summary>
     /// Called if view is viewed
     /// </summary>
-    abstract protected void Init();
+    //protected abstract void Init();
     /// <summary>
     /// Called if Form is Disposed
     /// </summary>
-    abstract public void Dispose();
+    public abstract void Dispose();
   }
 }

Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Utils")]
-[assembly: AssemblyCopyright("Copyright ©  2014 - 16.04.2017")]
+[assembly: AssemblyCopyright("Copyright ©  2014 - 24.09.2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.3")]
+[assembly: AssemblyVersion("1.0.5.1")]
-[assembly: AssemblyFileVersion("1.0.2.3")]
+[assembly: AssemblyFileVersion("1.0.5.1")]

Updater.cs

@@ -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();
+        }
+      }
+    }
+  }
+}

Utils.csproj

@@ -41,6 +41,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CmdArgs.cs" />
+    <Compile Include="EventArgsHelper.cs" />
     <Compile Include="FileLogger.cs" />
     <Compile Include="FileMutex.cs" />
     <Compile Include="InIReader.cs" />
@@ -49,6 +50,7 @@
     <Compile Include="OwnObject.cs" />
     <Compile Include="OwnView.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Updater.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.