From ef7493a09a9a13a92ab6ef05c7b8955787b399c6 Mon Sep 17 00:00:00 2001
From: Kuro <kuroservamp@hotmail.com>
Date: Wed, 5 Mar 2025 23:36:41 +0100
Subject: [PATCH] =?UTF-8?q?erweitertes=20lesen=20der=20config=20dateien.?=
 =?UTF-8?q?=20kleinere=20fixes=20f=C3=BCr=20syntax=20errors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProgrammList/ConfigManager/ConfigManager.cs |  2 +-
 ProgrammList/Program.cs                     |  7 ++++---
 ProgrammList/list_creation/ListPrograms.cs  | 11 +++--------
 ProgrammList/sql/SqlBaseAbstract.cs         |  2 +-
 ProgrammList/sql/Sqlite.cs                  |  9 +++------
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/ProgrammList/ConfigManager/ConfigManager.cs b/ProgrammList/ConfigManager/ConfigManager.cs
index 2cef4d8..f8a9fa4 100644
--- a/ProgrammList/ConfigManager/ConfigManager.cs
+++ b/ProgrammList/ConfigManager/ConfigManager.cs
@@ -1,7 +1,7 @@
 using System.Configuration;
 
 namespace ProgrammList.ConfigManager {
-    internal class ConfigManager {
+    public class ConfigManager {
         public static string GetSetting(string key) {
             return ConfigurationManager.AppSettings[key];
         }
diff --git a/ProgrammList/Program.cs b/ProgrammList/Program.cs
index b2b580f..e936474 100644
--- a/ProgrammList/Program.cs
+++ b/ProgrammList/Program.cs
@@ -1,10 +1,11 @@
-using ProgrammList.ListPrograms;
+using ProgrammList.ConfigManager;
+using ProgrammList.ListPrograms;
 
 class Program {
     public static void Main(string[] args) {
 
-
-        ListPrograms list = new ListPrograms();
+        string dbType = ConfigManager.GetSetting("DB_Type");
+        ListPrograms list = new ListPrograms(dbType);
 
         Console.WriteLine("Deleting old data");
         list.DeleteOldData();
diff --git a/ProgrammList/list_creation/ListPrograms.cs b/ProgrammList/list_creation/ListPrograms.cs
index 0b4ea22..b17d861 100644
--- a/ProgrammList/list_creation/ListPrograms.cs
+++ b/ProgrammList/list_creation/ListPrograms.cs
@@ -1,5 +1,4 @@
-using Microsoft.IdentityModel.Tokens;
-using Microsoft.Win32;
+using Microsoft.Win32;
 using ProgrammList.sql;
 using System.Net;
 
@@ -8,7 +7,7 @@ namespace ProgrammList.ListPrograms {
 
         string prgm_path = Directory.GetCurrentDirectory() + "\\";
         string[] keyvaluenames = { "DisplayName", "DisplayVersion", "InstallDate" };
-        private SqlBase sql;
+        private SqlBase sql = null;
 
         internal ListPrograms(string sqlType) {
             if (sqlType == null) {
@@ -18,7 +17,6 @@ namespace ProgrammList.ListPrograms {
                 Console.WriteLine("MSSQL");
                 Console.WriteLine("SQLITE");
                 throw new ArgumentNullException();
-                System.Environment.Exit(13);
             }
 
             if (sqlType.Equals("MYSQL", StringComparison.OrdinalIgnoreCase) || sqlType.Equals("MARIADB", StringComparison.OrdinalIgnoreCase)) {
@@ -28,10 +26,7 @@ namespace ProgrammList.ListPrograms {
                 sql = new Mssql();
             }
             else if (sqlType.Equals("SQLITE", StringComparison.OrdinalIgnoreCase)) {
-                string filename = ConfigManager.GetSetting("Filename");
-                if (!filename.IsNullOrEmpty()) {
-                    sql = new Sqlite(prgm_path, filename);
-                }
+                sql = new Sqlite(prgm_path);
             }
         }
 
diff --git a/ProgrammList/sql/SqlBaseAbstract.cs b/ProgrammList/sql/SqlBaseAbstract.cs
index 10b57b2..1c5b570 100644
--- a/ProgrammList/sql/SqlBaseAbstract.cs
+++ b/ProgrammList/sql/SqlBaseAbstract.cs
@@ -20,7 +20,7 @@ namespace ProgrammList.sql {
             else if (sqlcon != null) {
                 sqlcon.Close();
             }
-            else if (sqlitecon != null {
+            else if (sqlitecon != null) {
                 sqlitecon.Close();
             }
         }
diff --git a/ProgrammList/sql/Sqlite.cs b/ProgrammList/sql/Sqlite.cs
index 2323817..539d24f 100644
--- a/ProgrammList/sql/Sqlite.cs
+++ b/ProgrammList/sql/Sqlite.cs
@@ -1,16 +1,13 @@
 using Microsoft.Data.Sqlite;
+using System.Configuration;
 
 namespace ProgrammList.sql {
     public class Sqlite : SqlBaseAbstract {
 
         string filename;
 
-        public Sqlite(string prm_path, string file) {
-
-            string prgm_path = prm_path + filename;
-            filename = file;
-
-            sqlitecon = new SqliteConnection("Data Source=" + prm_path + filename);
+        public Sqlite(string prm_path) {
+            sqlitecon = new SqliteConnection("Data Source=" + prm_path + ConfigurationManager.AppSettings["filename"]);
             sqlitecon.Open();
         }