diff --git a/.vs/LogWriter.git/v17/.suo b/.vs/LogWriter.git/v17/.suo
index 5a91728..58b8426 100644
Binary files a/.vs/LogWriter.git/v17/.suo and b/.vs/LogWriter.git/v17/.suo differ
diff --git a/LogWriter/LogWriter.cs b/LogWriter/LogWriter.cs
index d40e8f8..4cebab2 100644
--- a/LogWriter/LogWriter.cs
+++ b/LogWriter/LogWriter.cs
@@ -433,11 +433,26 @@ namespace Eugen.ESystem.IO
{
try
{
- if (String.IsNullOrEmpty(path) || String.IsNullOrEmpty(filename))
+ if (String.IsNullOrEmpty(path))
{
return false;
}
+ if (String.IsNullOrEmpty(filename))
+ {
+ DateTime time = DateTime.Now;
+ filename = String.Concat("log_", time.ToString().Remove(time.ToString().IndexOf(" ")), ".log");
+ if (!File.Exists(String.Concat(Path, "\\", filename)))
+ {
+ return false;
+ }
+ }
+
+ if (!filename.EndsWith(".log"))
+ {
+ filename = String.Concat(filename, ".log");
+ }
+
if (!File.Exists(path + "\\" + filename))
{
return true;
@@ -445,7 +460,7 @@ namespace Eugen.ESystem.IO
else
{
File.Delete(path + "\\" + filename);
- return true;
+ //return true;
}
if (File.Exists(path + "\\" + filename))
diff --git a/LogWriter/bin/Debug/de/helogwri.resources.dll b/LogWriter/bin/Debug/de/helogwri.resources.dll
index 6129b0a..105b006 100644
Binary files a/LogWriter/bin/Debug/de/helogwri.resources.dll and b/LogWriter/bin/Debug/de/helogwri.resources.dll differ
diff --git a/LogWriter/bin/Debug/en/helogwri.resources.dll b/LogWriter/bin/Debug/en/helogwri.resources.dll
index f1fa85e..bbbc76d 100644
Binary files a/LogWriter/bin/Debug/en/helogwri.resources.dll and b/LogWriter/bin/Debug/en/helogwri.resources.dll differ
diff --git a/LogWriter/bin/Debug/helogwri.dll b/LogWriter/bin/Debug/helogwri.dll
index cd848b8..224417f 100644
Binary files a/LogWriter/bin/Debug/helogwri.dll and b/LogWriter/bin/Debug/helogwri.dll differ
diff --git a/LogWriter/bin/Debug/helogwri.pdb b/LogWriter/bin/Debug/helogwri.pdb
index 53bf2a8..e598a0a 100644
Binary files a/LogWriter/bin/Debug/helogwri.pdb and b/LogWriter/bin/Debug/helogwri.pdb differ
diff --git a/LogWriter/obj/Debug/de/helogwri.resources.dll b/LogWriter/obj/Debug/de/helogwri.resources.dll
index 6129b0a..105b006 100644
Binary files a/LogWriter/obj/Debug/de/helogwri.resources.dll and b/LogWriter/obj/Debug/de/helogwri.resources.dll differ
diff --git a/LogWriter/obj/Debug/en/helogwri.resources.dll b/LogWriter/obj/Debug/en/helogwri.resources.dll
index f1fa85e..bbbc76d 100644
Binary files a/LogWriter/obj/Debug/en/helogwri.resources.dll and b/LogWriter/obj/Debug/en/helogwri.resources.dll differ
diff --git a/LogWriter/obj/Debug/helogwri.dll b/LogWriter/obj/Debug/helogwri.dll
index cd848b8..224417f 100644
Binary files a/LogWriter/obj/Debug/helogwri.dll and b/LogWriter/obj/Debug/helogwri.dll differ
diff --git a/LogWriter/obj/Debug/helogwri.pdb b/LogWriter/obj/Debug/helogwri.pdb
index 53bf2a8..e598a0a 100644
Binary files a/LogWriter/obj/Debug/helogwri.pdb and b/LogWriter/obj/Debug/helogwri.pdb differ
diff --git a/Test_LogWriter/Form1.cs b/Test_LogWriter/Form1.cs
index 190aa4a..d46307c 100644
--- a/Test_LogWriter/Form1.cs
+++ b/Test_LogWriter/Form1.cs
@@ -1,184 +1,187 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Eugen.ESystem.IO;
-
-namespace Test_LogWriter
-{
- public partial class Form1 : Form
- {
- #region Version und Copyright
- // Version und Copyright
- string programName = Path.GetFileNameWithoutExtension(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase); //Den Programmnamen auslesen
- string programVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
- static object[] attributes = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
- string copyright = GenerateCopyright();
- string icon = Application.StartupPath + "\\Info.bmp";
-
- //Assembly Datum und Zeit
- static DateTime value = AssemblyDateTime();
- string date = value.ToShortDateString();
- string time = value.ToLongTimeString();
-
- private static DateTime AssemblyDateTime()
- {
- var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
- var buildDateTime = new DateTime(2000, 1, 1).Add(new TimeSpan(TimeSpan.TicksPerDay * version.Build + TimeSpan.TicksPerSecond * 2 * version.Revision));
- //Tage seit dem 1. Januar 2000 und Sekunden seit Mitternacht, (multiplizier mit 2 ergibt das Original)
- return buildDateTime;
- }
-
- private static string CurrentYear()
- {
- DateTime dtn = DateTime.Now;
- return dtn.Year.ToString();
- }
-
- private static string StartYear()
- {
- string startYear = "";
- if (((AssemblyCopyrightAttribute)attributes[0]).Copyright.Contains("Copyright © "))
- {
- startYear = ((AssemblyCopyrightAttribute)attributes[0]).Copyright.Replace("Copyright © ", "");
- while (startYear.StartsWith(" "))
- {
- startYear = startYear.Remove(0, 1);
- }
-
- if (startYear.Contains("-"))
- {
- startYear = startYear.Remove(startYear.IndexOf("-"));
- }
- else
- {
- startYear = startYear.Remove(startYear.IndexOf(" "));
- }
- return startYear;
- }
- else
- {
- DateTime dtn = DateTime.Now;
- return dtn.Year.ToString();
- }
- }
-
- private static string GenerateCopyright()
- {
- string startYear = StartYear();
- string currentYear = CurrentYear();
-
- if (startYear == currentYear)
- {
- return ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
- }
- else
- {
- string temp = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
- string start = temp.Remove(temp.IndexOf(startYear) - 1);
- string end = (temp.Remove(0, temp.IndexOf(" by")));
-
- return String.Concat(start, " ", startYear, "-", currentYear, end);
- }
- }
- #endregion
-
- #region Programm-Info
- ///
- /// Contains the name of the program file
- ///
- public static string ProgramName { set; get; }
-
- ///
- /// Contains the version of the program file
- ///
- public static string ProgramVersion { set; get; }
-
- ///
- /// Contains the copyright notice
- ///
- public static string Copyright { set; get; }
-
- private void SetProgramInfo()
- {
- //Name, Version und Copyright setzen
- ProgramName = programName;
- ProgramVersion = programVersion;
- Copyright = copyright;
- }
- #endregion
-
- public Form1()
- {
- SetProgramInfo();
- InitializeComponent();
- }
-
- private void Form1_Load(object sender, EventArgs e)
- {
- labelProgramInfo.Text = String.Concat(ProgramName, "\r\n", ProgramVersion, "\r\n", Copyright); // Zeigt die Programm-Information an
-
- labelDLLInfo.Text = String.Concat(LogWriter.DllName, "\r\n", LogWriter.DllVersion, "\r\n", LogWriter.Copyright); // Zeigt die DLL-Information an
- }
-
- private void buttonRunProgram_Click(object sender, EventArgs e)
- {
- //Variante 1 - Logdateiname ist automatisch 'log_dd-mm-yy.log'
- var logWriter1 = new LogWriter(@"C:\TMP\");
- logWriter1.WriteMessage("Das ist Test 1");
- labelResult.Text = String.Concat("Die Log-Datei C:\\TMP\\log_", DateTime.Now.Date.ToString().Remove(10), ".log wurde geschrieben.");
-
- //Variante 2 - Logdateiname wird angegeben, z.B. 'my_logfile2.log'
- var logWriter2 = new LogWriter(@"C:\TMP\", "my_logfile2.log");
- logWriter2.WriteMessage("Das ist Test 2");
- labelResult.Text = String.Concat(labelResult.Text, "\nDie Log-Datei C:\\TMP\\my_logfile2.log wurde geschrieben");
-
- //Variante 3 - Logdateiname wird angegeben und Header wird geschrieben
- string header = "--------------------\n Das ist der Header\n--------------------";
- var logWriter3 = new LogWriter(@"C:\TMP\", "my_logfile3");
- logWriter3.WriteMessage(header, LogWriter.Time.NoWrite);
- logWriter3.WriteMessage("Das ist Test 3");
- labelResult.Text = String.Concat(labelResult.Text, "\nDie Log-Datei C:\\TMP\\my_logfile3.log wurde geschrieben");
- }
-
- private void buttonShowLog1_Click(object sender, EventArgs e)
- {
- string textFileName = String.Concat("C:\\TMP\\log_", DateTime.Now.Date.ToString().Remove(10), ".log");
-
- //Wenn die Datei nicht angezeigt werden kann, dann eine Fehlermeldung ausgeben
- if (!ShowTextFile.Show(textFileName))
- {
- MessageBox.Show("Entweder die Datei existiert nicht oder der Editor konnte nicht geöffnet werden!");
- }
- }
-
- private void buttonShowLog2_Click(object sender, EventArgs e)
- {
- string textFileName = "C:\\TMP\\my_logfile2.log";
-
- //Wenn die Datei nicht angezeigt werden kann, dann eine Fehlermeldung ausgeben
- if (!ShowTextFile.Show(textFileName))
- {
- MessageBox.Show("Entweder die Datei existiert nicht oder der Editor konnte nicht geöffnet werden!");
- }
- }
-
- private void buttonShowLog3_Click(object sender, EventArgs e)
- {
- string textFileName = "C:\\TMP\\my_logfile3.log";
-
- //Wenn die Datei nicht angezeigt werden kann, dann eine Fehlermeldung ausgeben
- if (!ShowTextFile.Show(textFileName))
- {
- MessageBox.Show("Entweder die Datei existiert nicht oder der Editor konnte nicht geöffnet werden!");
- }
- }
- }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Eugen.ESystem.IO;
+
+namespace Test_LogWriter
+{
+ public partial class Form1 : Form
+ {
+ #region Version und Copyright
+ // Version und Copyright
+ string programName = Path.GetFileNameWithoutExtension(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase); //Den Programmnamen auslesen
+ string programVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+ static object[] attributes = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
+ string copyright = GenerateCopyright();
+ string icon = Application.StartupPath + "\\Info.bmp";
+
+ //Assembly Datum und Zeit
+ static DateTime value = AssemblyDateTime();
+ string date = value.ToShortDateString();
+ string time = value.ToLongTimeString();
+
+ private static DateTime AssemblyDateTime()
+ {
+ var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+ var buildDateTime = new DateTime(2000, 1, 1).Add(new TimeSpan(TimeSpan.TicksPerDay * version.Build + TimeSpan.TicksPerSecond * 2 * version.Revision));
+ //Tage seit dem 1. Januar 2000 und Sekunden seit Mitternacht, (multiplizier mit 2 ergibt das Original)
+ return buildDateTime;
+ }
+
+ private static string CurrentYear()
+ {
+ DateTime dtn = DateTime.Now;
+ return dtn.Year.ToString();
+ }
+
+ private static string StartYear()
+ {
+ string startYear = "";
+ if (((AssemblyCopyrightAttribute)attributes[0]).Copyright.Contains("Copyright © "))
+ {
+ startYear = ((AssemblyCopyrightAttribute)attributes[0]).Copyright.Replace("Copyright © ", "");
+ while (startYear.StartsWith(" "))
+ {
+ startYear = startYear.Remove(0, 1);
+ }
+
+ if (startYear.Contains("-"))
+ {
+ startYear = startYear.Remove(startYear.IndexOf("-"));
+ }
+ else
+ {
+ startYear = startYear.Remove(startYear.IndexOf(" "));
+ }
+ return startYear;
+ }
+ else
+ {
+ DateTime dtn = DateTime.Now;
+ return dtn.Year.ToString();
+ }
+ }
+
+ private static string GenerateCopyright()
+ {
+ string startYear = StartYear();
+ string currentYear = CurrentYear();
+
+ if (startYear == currentYear)
+ {
+ return ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
+ }
+ else
+ {
+ string temp = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
+ string start = temp.Remove(temp.IndexOf(startYear) - 1);
+ string end = (temp.Remove(0, temp.IndexOf(" by")));
+
+ return String.Concat(start, " ", startYear, "-", currentYear, end);
+ }
+ }
+ #endregion
+
+ #region Programm-Info
+ ///
+ /// Contains the name of the program file
+ ///
+ public static string ProgramName { set; get; }
+
+ ///
+ /// Contains the version of the program file
+ ///
+ public static string ProgramVersion { set; get; }
+
+ ///
+ /// Contains the copyright notice
+ ///
+ public static string Copyright { set; get; }
+
+ private void SetProgramInfo()
+ {
+ //Name, Version und Copyright setzen
+ ProgramName = programName;
+ ProgramVersion = programVersion;
+ Copyright = copyright;
+ }
+ #endregion
+
+ public Form1()
+ {
+ SetProgramInfo();
+ InitializeComponent();
+ }
+
+ private void Form1_Load(object sender, EventArgs e)
+ {
+ labelProgramInfo.Text = String.Concat(ProgramName, "\r\n", ProgramVersion, "\r\n", Copyright); // Zeigt die Programm-Information an
+
+ labelDLLInfo.Text = String.Concat(LogWriter.DllName, "\r\n", LogWriter.DllVersion, "\r\n", LogWriter.Copyright); // Zeigt die DLL-Information an
+ }
+
+ private void buttonRunProgram_Click(object sender, EventArgs e)
+ {
+ //Variante 1 - Logdateiname ist automatisch 'log_dd-mm-yy.log'
+ var logWriter1 = new LogWriter(@"C:\TMP\");
+ logWriter1.DeleteLogFile();
+ logWriter1.WriteMessage("Das ist Test 1");
+ labelResult.Text = String.Concat("Die Log-Datei C:\\TMP\\log_", DateTime.Now.Date.ToString().Remove(10), ".log wurde geschrieben.");
+
+ //Variante 2 - Logdateiname wird angegeben, z.B. 'my_logfile2.log'
+ var logWriter2 = new LogWriter(@"C:\TMP\", "my_logfile2.log");
+ logWriter2.DeleteLogFile();
+ logWriter2.WriteMessage("Das ist Test 2");
+ labelResult.Text = String.Concat(labelResult.Text, "\nDie Log-Datei C:\\TMP\\my_logfile2.log wurde geschrieben");
+
+ //Variante 3 - Logdateiname wird angegeben und Header wird geschrieben
+ string header = "--------------------\n Das ist der Header\n--------------------";
+ var logWriter3 = new LogWriter(@"C:\TMP\", "my_logfile3");
+ logWriter3.DeleteLogFile();
+ logWriter3.WriteMessage(header, LogWriter.Time.NoWrite);
+ logWriter3.WriteMessage("Das ist Test 3");
+ labelResult.Text = String.Concat(labelResult.Text, "\nDie Log-Datei C:\\TMP\\my_logfile3.log wurde geschrieben");
+ }
+
+ private void buttonShowLog1_Click(object sender, EventArgs e)
+ {
+ string textFileName = String.Concat("C:\\TMP\\log_", DateTime.Now.Date.ToString().Remove(10), ".log");
+
+ //Wenn die Datei nicht angezeigt werden kann, dann eine Fehlermeldung ausgeben
+ if (!ShowTextFile.Show(textFileName))
+ {
+ MessageBox.Show("Entweder die Datei existiert nicht oder der Editor konnte nicht geöffnet werden!");
+ }
+ }
+
+ private void buttonShowLog2_Click(object sender, EventArgs e)
+ {
+ string textFileName = "C:\\TMP\\my_logfile2.log";
+
+ //Wenn die Datei nicht angezeigt werden kann, dann eine Fehlermeldung ausgeben
+ if (!ShowTextFile.Show(textFileName))
+ {
+ MessageBox.Show("Entweder die Datei existiert nicht oder der Editor konnte nicht geöffnet werden!");
+ }
+ }
+
+ private void buttonShowLog3_Click(object sender, EventArgs e)
+ {
+ string textFileName = "C:\\TMP\\my_logfile3.log";
+
+ //Wenn die Datei nicht angezeigt werden kann, dann eine Fehlermeldung ausgeben
+ if (!ShowTextFile.Show(textFileName))
+ {
+ MessageBox.Show("Entweder die Datei existiert nicht oder der Editor konnte nicht geöffnet werden!");
+ }
+ }
+ }
+}
diff --git a/Test_LogWriter/bin/Debug/Test_LogWriter.exe b/Test_LogWriter/bin/Debug/Test_LogWriter.exe
index 5c9202b..ab47511 100644
Binary files a/Test_LogWriter/bin/Debug/Test_LogWriter.exe and b/Test_LogWriter/bin/Debug/Test_LogWriter.exe differ
diff --git a/Test_LogWriter/bin/Debug/Test_LogWriter.pdb b/Test_LogWriter/bin/Debug/Test_LogWriter.pdb
index 50e3f30..85ef459 100644
Binary files a/Test_LogWriter/bin/Debug/Test_LogWriter.pdb and b/Test_LogWriter/bin/Debug/Test_LogWriter.pdb differ
diff --git a/Test_LogWriter/bin/Debug/de/helogwri.resources.dll b/Test_LogWriter/bin/Debug/de/helogwri.resources.dll
index 4afc52c..105b006 100644
Binary files a/Test_LogWriter/bin/Debug/de/helogwri.resources.dll and b/Test_LogWriter/bin/Debug/de/helogwri.resources.dll differ
diff --git a/Test_LogWriter/bin/Debug/en/helogwri.resources.dll b/Test_LogWriter/bin/Debug/en/helogwri.resources.dll
index f2b2542..bbbc76d 100644
Binary files a/Test_LogWriter/bin/Debug/en/helogwri.resources.dll and b/Test_LogWriter/bin/Debug/en/helogwri.resources.dll differ
diff --git a/Test_LogWriter/bin/Debug/helogwri.dll b/Test_LogWriter/bin/Debug/helogwri.dll
index 9c149f8..224417f 100644
Binary files a/Test_LogWriter/bin/Debug/helogwri.dll and b/Test_LogWriter/bin/Debug/helogwri.dll differ
diff --git a/Test_LogWriter/bin/Debug/helogwri.pdb b/Test_LogWriter/bin/Debug/helogwri.pdb
index a7fbfc7..e598a0a 100644
Binary files a/Test_LogWriter/bin/Debug/helogwri.pdb and b/Test_LogWriter/bin/Debug/helogwri.pdb differ
diff --git a/Test_LogWriter/obj/Debug/Test_LogWriter.csproj.AssemblyReference.cache b/Test_LogWriter/obj/Debug/Test_LogWriter.csproj.AssemblyReference.cache
index 1b81db9..0ba5733 100644
Binary files a/Test_LogWriter/obj/Debug/Test_LogWriter.csproj.AssemblyReference.cache and b/Test_LogWriter/obj/Debug/Test_LogWriter.csproj.AssemblyReference.cache differ
diff --git a/Test_LogWriter/obj/Debug/Test_LogWriter.csproj.FileListAbsolute.txt b/Test_LogWriter/obj/Debug/Test_LogWriter.csproj.FileListAbsolute.txt
index 531d571..103cbed 100644
--- a/Test_LogWriter/obj/Debug/Test_LogWriter.csproj.FileListAbsolute.txt
+++ b/Test_LogWriter/obj/Debug/Test_LogWriter.csproj.FileListAbsolute.txt
@@ -1,7 +1,6 @@
H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\LogWriter.git\Test_LogWriter\bin\Debug\Test_LogWriter.exe.config
H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\LogWriter.git\Test_LogWriter\bin\Debug\Test_LogWriter.exe
H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\LogWriter.git\Test_LogWriter\bin\Debug\Test_LogWriter.pdb
-H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\LogWriter.git\Test_LogWriter\bin\Debug\helogwri.dll
H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\LogWriter.git\Test_LogWriter\bin\Debug\heshowtf.dll
H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\LogWriter.git\Test_LogWriter\bin\Debug\helogwri.pdb
H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\LogWriter.git\Test_LogWriter\bin\Debug\heshowtf.pdb
@@ -16,3 +15,4 @@ H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\LogWriter.git\Test_LogWrit
H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\LogWriter.git\Test_LogWriter\obj\Debug\Test_LogWriter.exe
H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\LogWriter.git\Test_LogWriter\obj\Debug\Test_LogWriter.pdb
H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\LogWriter.git\Test_LogWriter\obj\Debug\Test_LogWriter.csproj.SuggestedBindingRedirects.cache
+H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\LogWriter.git\Test_LogWriter\bin\Debug\helogwri.dll
diff --git a/Test_LogWriter/obj/Debug/Test_LogWriter.exe b/Test_LogWriter/obj/Debug/Test_LogWriter.exe
index 5c9202b..ab47511 100644
Binary files a/Test_LogWriter/obj/Debug/Test_LogWriter.exe and b/Test_LogWriter/obj/Debug/Test_LogWriter.exe differ
diff --git a/Test_LogWriter/obj/Debug/Test_LogWriter.pdb b/Test_LogWriter/obj/Debug/Test_LogWriter.pdb
index 50e3f30..85ef459 100644
Binary files a/Test_LogWriter/obj/Debug/Test_LogWriter.pdb and b/Test_LogWriter/obj/Debug/Test_LogWriter.pdb differ