[NF] Cleaning up

[NF] Create Debian Package

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

InIReader.cs

@@ -2,27 +2,66 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
-namespace BlubbFish.Utils
+namespace BlubbFish.Utils {
-{
   public class InIReader : IDisposable
   {
-    private Dictionary<String, Dictionary<String, String>> cont;
+    private Dictionary<String, Dictionary<String, String>> inifile;
-    private FileSystemWatcher k = new FileSystemWatcher(Directory.GetCurrentDirectory(), "*.ini");
+    private FileSystemWatcher k;
     private String filename;
+    private static List<String> search_path = new List<String>() {
+      Directory.GetCurrentDirectory()
+    };
 
     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)
     {
-      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);
       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)
     {
       if (!instances.Keys.Contains(filename)) {
@@ -38,7 +77,7 @@ namespace BlubbFish.Utils
 
     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);
       List<String> buf = new List<String>();
       String fline = "";
@@ -52,10 +91,10 @@ 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);
+            this.inifile.Add(cap, sub);
           }
           cap = line;
           sub = new Dictionary<String, String>();
@@ -68,45 +107,97 @@ namespace BlubbFish.Utils
         }
       }
       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)
     {
       if (!section.StartsWith("[")) {
         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;
     }
 
-
+    /// <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)
     {
       if (!section.StartsWith("[")) {
         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 {
-          this.cont[section].Add(key, value);
+          this.inifile[section].Add(key, value);
         }
       } else {
         Dictionary<String, String> sub = new Dictionary<String, String> {
           { key, value }
         };
-        this.cont.Add(section, sub);
+        this.inifile.Add(section, sub);
       }
       this.Changed();
     }
@@ -125,7 +216,7 @@ namespace BlubbFish.Utils
       file.BaseStream.SetLength(0);
       file.BaseStream.Flush();
       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);
         foreach (KeyValuePair<String, String> sub in cap.Value) {
           file.WriteLine(sub.Key + "=" + sub.Value);
@@ -146,10 +237,10 @@ namespace BlubbFish.Utils
       if (!name.StartsWith("[")) {
         name = "[" + name + "]";
       }
-      if (this.cont.Keys.Contains(name)) {
+      if (this.inifile.Keys.Contains(name)) {
         return false;
       }
-      this.cont.Add(name, new Dictionary<String, String>());
+      this.inifile.Add(name, new Dictionary<String, String>());
       this.Changed();
       return true;
     }
@@ -164,10 +255,10 @@ namespace BlubbFish.Utils
       if (!name.StartsWith("[")) {
         name = "[" + name + "]";
       }
-      if (!this.cont.Keys.Contains(name)) {
+      if (!this.inifile.Keys.Contains(name)) {
         return false;
       }
-      this.cont.Remove(name);
+      this.inifile.Remove(name);
       this.Changed();
       return false;
     }

OwnObject.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace BlubbFish.Utils
 {
@@ -37,20 +35,6 @@ namespace BlubbFish.Utils
       }
     }
 
-    public class LogEventArgs : EventArgs {
-      public LogEventArgs(String location, String message, 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 LogLevel Level { get; private set; }
-      public DateTime Date { get; private set; }
-    }
-
     private List<LogObject> loglist = new List<LogObject>();
 
     public delegate void LogEvent(Object sender, LogEventArgs e);

OwnView.cs

@@ -7,9 +7,7 @@ using System.Threading.Tasks;
 namespace BlubbFish.Utils {
   public abstract class OwnView {
 
-    protected OwnView() {
+    protected OwnView() { }
-      this.Init();
-    }
     /// <summary>
     /// Called if the Oberver (Model) updates its View
     /// </summary>
@@ -17,7 +15,7 @@ namespace BlubbFish.Utils {
     /// <summary>
     /// Called if view is viewed
     /// </summary>
-    protected abstract void Init();
+    //protected abstract void Init();
     /// <summary>
     /// Called if Form is Disposed
     /// </summary>

Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Utils")]
-[assembly: AssemblyCopyright("Copyright ©  2014 - 24.04.2017")]
+[assembly: AssemblyCopyright("Copyright ©  2014 - 07.05.2018")]
 [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.6")]
+[assembly: AssemblyVersion("1.0.7.0")]
-[assembly: AssemblyFileVersion("1.0.2.6")]
+[assembly: AssemblyFileVersion("1.0.7.0")]

Updater.cs

@@ -13,40 +13,29 @@ namespace BlubbFish.Utils {
     private static Updater instances;
     private String url;
     private VersionInfo[] versions;
-
+    private Thread t;
-    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 struct VersionInfo {
-      public VersionInfo(String name, String version, String filename, String guid) {
-        this.Name = name;
-        this.Version = version;
-        this.Filename = filename;
-        this.GUID = guid;
-      }
       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() { }
 
@@ -65,8 +54,13 @@ namespace BlubbFish.Utils {
     /// <summary>
     /// Waits for the Result of the Updater thread.
     /// </summary>
-    public void WaitForExit() {
+    public void WaitForExit(Boolean exceuteUpdate = true) {
-      throw new NotImplementedException();
+      while (this.t.ThreadState == ThreadState.Running) { }
+      if(exceuteUpdate) {
+        if(File.Exists("update.bat")) {
+          System.Diagnostics.Process.Start("update.bat");
+        }
+      }
     }
 
     /// <summary>
@@ -104,42 +98,95 @@ namespace BlubbFish.Utils {
     /// <exception cref="ArgumentException"></exception>
     public void Check() {
       if(this.url == "") {
-        throw new ArgumentException("You must set url first.");
+        throw new ArgumentException("Zuerst eine URL setzen!");
       }
       if(this.versions.Length == 0) {
-        throw new ArgumentException("You must set a Version number first.");
+        throw new ArgumentException("Zuerst Dateien registrieren!");
       }
       if(this.UpdateResult == null) {
-        throw new ArgumentNullException("You must attach an event first.");
+        throw new ArgumentNullException("Zuerst das Update Event anhängen.");
       }
-      Thread t = new Thread(this.Runner);
+      this.t = new Thread(this.Runner);
-      t.Start();
+      this.t.Start();
     }
 
     private void Runner() {
       Thread.Sleep(1000);
-      WebRequest request = WebRequest.Create(this.url + "version.xml");
-      WebResponse response = null;
       try {
-         response = request.GetResponse();
+        Stream stream = WebRequest.Create(this.url + "version.xml").GetResponse().GetResponseStream();
-      } catch(WebException e) {
+        String content = new StreamReader(stream).ReadToEnd();
-        this.UpdateResult(this, new UpdaterEventArgs(false, e.Message));
+        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;
         }
-      Stream stream = response.GetResponseStream();
+      } catch (Exception e) {
-      StreamReader reader = new StreamReader(stream);
+        this.ErrorRaised?.Invoke(this, new UpdaterFailEventArgs(e));
-      String content = reader.ReadToEnd();
+        return;
+      }
+      this.UpdateResult(this, new UpdaterEventArgs(false, "Kein Update verfügbar"));
     }
 
     /// <summary>
     /// Update the file
     /// </summary>
-    /// <param name="filename">The filename of the targetfile</param>
-    /// <param name="url">The url of the sourcefile</param>
     /// <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

@@ -1,5 +1,5 @@
 <?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')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BlubbFish.Utils</RootNamespace>
     <AssemblyName>Utils</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,6 +42,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CmdArgs.cs" />
+    <Compile Include="EventArgsHelper.cs" />
     <Compile Include="FileLogger.cs" />
     <Compile Include="FileMutex.cs" />
     <Compile Include="InIReader.cs" />