Changelog.md

@@ -1,188 +0,0 @@
-# Changelog
-
-## 1.6.2 - 2022-01-30 - ProgrammLogger improved
-### New Features
-* ProgrammLogger can now have a path while init, so not need to move the file
-* Make it possible that two instances can use the same logfile
-* IniReader GetValue can now have a default that returns if no setting is found
-### Bugfixes
-### Changes
-* Codingstyles
-
-## 1.6.1 - 2022-01-20 - ProgrammLogger Fixed
-### New Features
-### Bugfixes
-* Unhandled exception. System.IO.IOException: The file '/var/log/zwaybot/debug.log' already exists.
-### Changes
-
-## 1.6.0 - 2022-01-09 - HttpEndpoint added
-### New Features
-* Add HttpEndpoint
-### Bugfixes
-### Changes
-* Change Readme that its link to the normal repo
-* Codingstyles
-* Fixing history
-
-## 1.5.0 - 2021-04-10 - Add GetEvent so you can call events by string; Add OwnSingeton class
-### New Features
-* More allowed Chars for Chapters in inifile
-* Add Contribution, Licence and readme
-* Adding netcore
-* Add changelog
-* Filedhelper to helpter
-* CmdArgs improvements
-* Make netcore to default
-* Add OwnSingleton
-### Bugfixes
-* WriteLine in Programmlogger sometimes make nonesense
-* Writeline event are wrong
-### Changes
-* Remove the binary files
-* Move all Classes to subfolder
-* Codingstyles
-
-## 1.4.0 - 2018-11-27 - Add Helper to Utils
-### New Features
-* Add Helper
-### Bugfixes
-### Changes
-
-## 1.1.3 - 2018-10-02 - Improve CmdArgs
-### New Features
-* CmdArgs now throw extensions if there is something wrong
-### Bugfixes
-### Changes
-
-## 1.1.2 - 2018-09-11 - Tiny Codingstyles
-### New Features
-### Bugfixes
-### Changes
-* Codingstyles
-
-## 1.1.1 - 2018-05-29 - ProgrammLogger neets to cleanup
-### New Features
-* Delete the Mess behind
-### Bugfixes
-### Changes
-
-## 1.1.0 - 2018-05-15 - ProgrammLogger
-### New Features
-* Add Programmlogger
-### Bugfixes
-### Changes
-* Codingstyles
-
-## 1.0.7.0 - 2018-05-08 - Yet another IniReader improvemnt round again
-### New Features
-### Bugfixes
-### Changes
-* Move searchpath to its own function
-
-## 1.0.6.0 - 2017-12-22 - Yet another IniReader improvemnt round
-### New Features
-* Posibillity to add complete sections to an ini file
-### Bugfixes
-### Changes
-
-## 1.0.5.2 - 2017-09-26 - And Improve IniReader again
-### New Features
-* IniReader returns the Sections with or without Brackets now
-### Bugfixes
-### Changes
-
-## 1.0.5.1 - 2017-09-24 - Improve IniReader again
-### New Features
-### Bugfixes
-* IniReader now supports umlaute
-* IniReader matches with Brackets and without
-### Changes
-
-## 1.0.5.0 - 2017-08-09 - Improve IniReader
-### New Features
-* IniReader can now return a whole segemt
-### Bugfixes
-### Changes
-
-## 1.0.4.1 - 2017-08-08 - Cleanup OwnView
-### New Features
-### Bugfixes
-### Changes
-* remove Init from OwnView
-
-## 1.0.4.0 - 2017-04-30 - More Updater
-### New Features
-* continue Development of Updater
-### Bugfixes
-### Changes
-
-## 1.0.3.2 - 2017-04-26 - Next Updater
-### New Features
-* continue Development of Updater
-### Bugfixes
-### Changes
-
-## 1.0.3.1 - 2017-04-25 - EventArgsHelper
-### New Features
-* Add EventArgsHelper
-### Bugfixes
-### Changes
-* Codingstyles
-* Moves LogEventArgs to EventArgsHelper
-* Moves UpdaterEventArgs to EventArgsHelper
-
-## 1.0.2.6 - 2017-04-24 - Better Updater
-### New Features
-* Add Updater
-* Add Disposable Interface
-* Using LogEventArgs now for Logging
-* Make UpdaterEventArgs as Child of EventArgs
-* Updater now using Ownobject as Parent
-* Add VersionsInfo to Updater
-* Updater spawns a Background Task to Check for Updates
-### Bugfixes
-### Changes
-
-## 1.0.2.5 - 2017-04-19 - Logging in OwnObject
-### New Features
-* Add Logging to OwnObject
-### Bugfixes
-* Avoid nullpointer exception in FileMutex
-### Changes
-* Codingstyles
-
-## 1.0.2.3 - 2017-04-16 - OwnModel better
-### New Features
-* Add Remove observer on OwnModel
-### Bugfixes
-### Changes
-* Codingstyles
-
-## 1.0.2.2 - 2017-03-09 - Make it nice
-### New Features
-### Bugfixes
-### Changes
-* Codingstyles
-
-## 1.0.2.1 - 2017-03-09 - Filemutex
-### New Features
-* Add Filemutex
-### Bugfixes
-* Filelogger backet on wrong pos
-### Changes
-
-## 1.0.0.1 - 2016-12-03 - Filelogger improvements
-### New Features
-* Check Directory and if not exist add it
-* Now logs with timestamp
-* Can select logdir
-* Add Abstract dispose to OwnController
-### Bugfixes
-### Changes
-
-## 1.0.0.0 - 2015-11-16 - Init
-### New Features
-* Add CmdArgs, FileLogger, IniReader, OwnController, OwnModel, OwnObject, OwnView, 
-### Bugfixes
-### Changes
-

README.md

@@ -1,4 +1,2 @@
 # BlubbFish.Utils (Utils)
 Library containing helpfull utils
-
-Maybe you find this Repo on Github. This is a mirror from [here](https://git.blubbfish.net/vs_utils/Utils).

Utils/FileLogger.cs

@@ -43,7 +43,7 @@ namespace BlubbFish.Utils
         _ = Directory.CreateDirectory(v);
         logDir = v;
       }
-      if (logDir[^1..] != Path.DirectorySeparatorChar.ToString()) {
+      if (logDir.Substring(logDir.Length - 1) != Path.DirectorySeparatorChar.ToString()) {
         logDir += Path.DirectorySeparatorChar;
       }
     }

Utils/Helper.cs

@@ -49,12 +49,10 @@ namespace BlubbFish.Utils {
       FieldInfo field = o.GetType().GetField(name);
       return field.IsPublic ? field.GetValue(o) : null;
     }
-
     public static Object GetField(this Type o, String name) {
       FieldInfo field = o.GetField(name);
       return field.IsPublic ? field.GetValue(o) : null;
     }
-
     public static T GetEvent<T>(this Object o, String name) {
       FieldInfo field = o.GetType().GetField(name, BindingFlags.Instance | BindingFlags.NonPublic);
       return (T)field?.GetValue(o);

Utils/HttpEndpoint.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-
-namespace BlubbFish.Utils {
-  public class HttpEndpoint {
-    private readonly HttpClient client = new HttpClient();
-    private readonly String server = "";
-
-    public enum RequestMethod {
-      GET,
-      POST,
-      PUT
-    }
-
-    public HttpEndpoint(String server, String auth = null) {
-      this.server = server;
-      if(auth != null) {
-        this.client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(auth);
-      }
-    }
-
-    public HttpEndpoint(String server, (String scheme, String parameter) auth) {
-      this.server = server;
-      this.client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(auth.scheme, auth.parameter);
-    }
-
-    public async Task<String> RequestString(String address, String json = "", Boolean withoutput = true, RequestMethod method = RequestMethod.GET) {
-      String ret = null;
-      try {
-        HttpResponseMessage response = null;
-        if(method == RequestMethod.POST || method == RequestMethod.PUT) {
-          HttpContent content = new StringContent(json);
-          content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
-          //content.Headers.Add("Content-Type", "application/json");
-          if(method == RequestMethod.POST) {
-            response = await this.client.PostAsync(this.server + address, content);
-          } else if(method == RequestMethod.PUT) {
-            response = await this.client.PutAsync(this.server + address, content);
-          }
-          content.Dispose();
-        } else if(method == RequestMethod.GET) {
-          response = await this.client.GetAsync(this.server + address);
-        }
-        if(!response.IsSuccessStatusCode) {
-          throw new Exception(response.StatusCode + ": " + response.ReasonPhrase);
-        }
-        if(withoutput && response != null) {
-          ret = await response.Content.ReadAsStringAsync();
-        }
-      } catch(Exception e) {
-        throw new WebException(String.Format("Error while opening resource: \"{0}\" Method {1} Data {2} Fehler {3}", this.server + address, method, json, e.Message));
-      }
-      return ret;
-    }
-  }
-}

Utils/InIReader.cs

@@ -31,7 +31,8 @@ namespace BlubbFish.Utils {
       return false;
     }
 
-    private InIReader(String filename) {
+    private InIReader(String filename)
+    {
       foreach (String path in search_path) {
         if (File.Exists(path + Path.DirectorySeparatorChar + filename)) {
           this.filename = path + Path.DirectorySeparatorChar + filename;
@@ -59,7 +60,8 @@ namespace BlubbFish.Utils {
     /// </summary>
     /// <param name="filename">Dateiname</param>
     /// <returns></returns>
-    public static InIReader GetInstance(String filename) {
+    public static InIReader GetInstance(String filename)
+    {
       if (!instances.Keys.Contains(filename)) {
         instances.Add(filename, new InIReader(filename));
       }
@@ -68,7 +70,8 @@ namespace BlubbFish.Utils {
 
     private void ReadAgain(Object sender, EventArgs e) => this.LoadFile();
 
-    private void LoadFile() {
+    private void LoadFile()
+    {
       this.inifile = new Dictionary<String, Dictionary<String, String>>();
       StreamReader file = new StreamReader(this.filename);
       List<String> buf = new List<String>();
@@ -93,7 +96,7 @@ namespace BlubbFish.Utils {
         } else {
           if (line != "" && cap != "") {
             String key = line.Substring(0, line.IndexOf('='));
-            String value = line[(line.IndexOf('=') + 1)..];
+            String value = line.Substring(line.IndexOf('=') + 1);
             sub.Add(key, value);
           }
         }
@@ -149,11 +152,12 @@ namespace BlubbFish.Utils {
     /// <param name="section">Name der Sektion</param>
     /// <param name="key">Name des Wertes</param>
     /// <returns></returns>
-    public String GetValue(String section, String key, String @default = null) {
+    public String GetValue(String section, String key)
+    {
       if (!section.StartsWith("[")) {
         section = "[" + section + "]";
       }
-      return this.inifile.Keys.Contains(section) && this.inifile[section].Keys.Contains(key) ? this.inifile[section][key] : @default;
+      return this.inifile.Keys.Contains(section) && this.inifile[section].Keys.Contains(key) ? this.inifile[section][key] : null;
     }
 
     /// <summary>

Utils/ProgramLogger.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Runtime.InteropServices;
 using System.Text;
 
 namespace BlubbFish.Utils {
@@ -10,8 +9,8 @@ namespace BlubbFish.Utils {
     private ConsoleWriter errout;
     private String loggerfile;
 
-    public ProgramLogger(String path = null) {
+    public ProgramLogger() {
-      this.loggerfile = path ?? Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar + "output.log";
+      this.loggerfile = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar + "output.log";
       this.Init(this.loggerfile);
       this.AttachToFw();
       this.SetOutputs();
@@ -27,7 +26,7 @@ namespace BlubbFish.Utils {
         Console.Error.WriteLine("Cannot write to " + file);
         throw new ArgumentException("Cannot write to " + file);
       }
-      this.fw = new FileWriter(FileWriter.GetFileSteam(file, false));
+      this.fw = new FileWriter(file);
       this.stdout = new ConsoleWriter(Console.Out, ConsoleWriterEventArgs.ConsoleType.Info);
       this.errout = new ConsoleWriter(Console.Error, ConsoleWriterEventArgs.ConsoleType.Error);
     }
@@ -54,37 +53,15 @@ namespace BlubbFish.Utils {
       this.DisattachToFw();
       this.fw.Close();
       if(new FileInfo(this.loggerfile).Length > 0) {
-        if(File.Exists(file)) {
-          this.FileCopy(this.loggerfile, file);
-          File.Delete(this.loggerfile);
-        } else {
         File.Move(this.loggerfile, file);
-        }
       } else {
         File.Delete(this.loggerfile);
       }
       this.loggerfile = file;
-      this.fw = new FileWriter(FileWriter.GetFileSteam(this.loggerfile, true));
+      this.fw = new FileWriter(this.loggerfile);
       this.AttachToFw();
     }
 
-    public void Dispose() {
-      this.DisattachToFw();
-      this.fw.Dispose();
-    }
-
-    private void FileCopy(String source, String target) {
-      using FileStream fread = new FileStream(source, FileMode.Open);
-      using FileStream fwrite = new FileStream(target, FileMode.Create);
-      using TextReader reader = new StreamReader(fread);
-      using TextWriter writer = new StreamWriter(fwrite);
-
-      writer.Write(reader.ReadToEnd());
-      writer.Flush();
-      writer.Close();
-      reader.Close();
-    }
-
     private void DisattachToFw() {
       this.stdout.WriteEvent -= this.fw.Write;
       this.stdout.WriteLineEvent -= this.fw.WriteLine;
@@ -101,11 +78,9 @@ namespace BlubbFish.Utils {
 
   internal class FileWriter : StreamWriter {
     private Boolean newline = true;
-    public FileWriter(FileStream fs) : base(fs) {
+    public FileWriter(String path) : base(path) {
     }
 
-    public static FileStream GetFileSteam(String path, Boolean append) => File.Open(path, append ? FileMode.Append : FileMode.Create, FileAccess.Write, RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? FileShare.Write : FileShare.ReadWrite);
-
     public override Encoding Encoding => Encoding.UTF8;
     public override Boolean AutoFlush { get => true; set => base.AutoFlush = value; }
 

Utils/Utils.csproj

@@ -8,39 +8,18 @@
     <Company>BlubbFish</Company>
     <Authors>BlubbFish</Authors>
     <PackageId>Utils.BlubbFish</PackageId>
-    <Copyright>Copyright © BlubbFish 2014 - 30.01.2022</Copyright>
+    <Copyright>Copyright © BlubbFish 2014 - 10.04.2021</Copyright>
-    <Version>1.6.2</Version>
+    <AssemblyVersion>1.5.0</AssemblyVersion>
+    <FileVersion>1.5.0</FileVersion>
     <NeutralLanguage>de-DE</NeutralLanguage>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>http://git.blubbfish.net/vs_utils/Utils</PackageProjectUrl>
     <RepositoryUrl>http://git.blubbfish.net/vs_utils/Utils.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+    <Version>1.5.0</Version>
     <PackageReleaseNotes>
-      1.6.2 - 2022-01-30 - ProgrammLogger improved
+	1.5.0 Add GetEvent so you can call events by string; Add OwnSingeton class
-      1.6.1 - 2022-01-20 - ProgrammLogger Fixed
+	1.4.0 Add Helper to Utils
-      1.6.0 - 2022-01-09 - HttpEndpoint added
-      1.5.0 - 2021-04-10 - Add GetEvent so you can call events by string; Add OwnSingeton class
-      1.4.0 - 2018-11-27 - Add Helper to Utils
-      1.1.3 - 2018-10-02 - Improve CmdArgs
-      1.1.2 - 2018-09-11 - Tiny Codingstyles
-      1.1.1 - 2018-05-29 - ProgrammLogger neets to cleanup
-      1.1.0 - 2018-05-15 - ProgrammLogger
-      1.0.7.0 - 2018-05-08 - Yet another IniReader improvemnt round again
-      1.0.6.0 - 2017-12-22 - Yet another IniReader improvemnt round
-      1.0.5.2 - 2017-09-26 - And Improve IniReader again
-      1.0.5.1 - 2017-09-24 - Improve IniReader again
-      1.0.5.0 - 2017-08-09 - Improve IniReader
-      1.0.4.1 - 2017-08-08 - Cleanup OwnView
-      1.0.4.0 - 2017-04-30 - More Updater
-      1.0.3.2 - 2017-04-26 - Next Updater
-      1.0.3.1 - 2017-04-25 - EventArgsHelper
-      1.0.2.6 - 2017-04-24 - Better Updater
-      1.0.2.5 - 2017-04-19 - Logging in OwnObject
-      1.0.2.3 - 2017-04-16 - OwnModel better
-      1.0.2.2 - 2017-03-09 - Make it nice
-      1.0.2.1 - 2017-03-09 - Filemutex
-      1.0.0.1 - 2016-12-03 - Filelogger improvements
-      1.0.0.0 - 2015-11-16 - Init
 	</PackageReleaseNotes>
   </PropertyGroup>