[NF] Kleine Verbesserung im INIReader

EventArgsHelper.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 
 namespace BlubbFish.Utils {
   public class UpdaterEventArgs : EventArgs {

InIReader.cs

@@ -10,7 +10,7 @@ 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 String filename;
 
@@ -38,7 +38,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 +52,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,13 +68,31 @@ namespace BlubbFish.Utils
         }
       }
       if (sub.Count != 0 && cap != "") {
-        this.cont.Add(cap, sub);
+        this.inifile.Add(cap, sub);
       }
     }
 
-    public List<String> GetSections()
+    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;
+      }
+    }
+
+    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>();
     }
 
     public String GetValue(String section, String key)
@@ -82,9 +100,9 @@ namespace BlubbFish.Utils
       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;
@@ -96,17 +114,17 @@ namespace BlubbFish.Utils
       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 +143,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 +164,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 +182,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
 {

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 - 25.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.3.2")]
+[assembly: AssemblyVersion("1.0.5.2")]
-[assembly: AssemblyFileVersion("1.0.3.2")]
+[assembly: AssemblyFileVersion("1.0.5.2")]

Updater.cs

@@ -1,6 +1,5 @@
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Reflection;
@@ -55,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) {
       while (this.t.ThreadState == ThreadState.Running) { }
+      if(exceuteUpdate) {
+        if(File.Exists("update.bat")) {
+          System.Diagnostics.Process.Start("update.bat");
+        }
+      }
     }
 
     /// <summary>
@@ -107,7 +111,7 @@ namespace BlubbFish.Utils {
     }
 
     private void Runner() {
-      Thread.Sleep(1);
+      Thread.Sleep(1000);
       try {
         Stream stream = WebRequest.Create(this.url + "version.xml").GetResponse().GetResponseStream();
         String content = new StreamReader(stream).ReadToEnd();
@@ -156,6 +160,21 @@ namespace BlubbFish.Utils {
 
     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) {