[NF] Cleaning up

[NF] Create Debian Package

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 = "";
@@ -55,7 +94,7 @@ namespace BlubbFish.Utils
         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,55 +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();
+      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.cont.Keys.Contains(section)) {
+      if(this.inifile.Keys.Contains(section)) {
-        return this.cont[section];
+        return this.inifile[section];
       }
-      if(this.cont.Keys.Contains("["+section+"]")) {
+      if(this.inifile.Keys.Contains("["+section+"]")) {
-        return this.cont["[" + 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();
     }
@@ -135,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);
@@ -156,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;
     }
@@ -174,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;
     }

Properties/AssemblyInfo.cs

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

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>