diff --git a/ProgrammList.sln b/ProgrammList.sln
index afd4833..e2d8bd0 100644
--- a/ProgrammList.sln
+++ b/ProgrammList.sln
@@ -15,8 +15,8 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {06D431CD-A938-4DFD-8D77-4C612FDAD914}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {06D431CD-A938-4DFD-8D77-4C612FDAD914}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {06D431CD-A938-4DFD-8D77-4C612FDAD914}.Debug|Any CPU.ActiveCfg = Release|x64
+ {06D431CD-A938-4DFD-8D77-4C612FDAD914}.Debug|Any CPU.Build.0 = Release|x64
{06D431CD-A938-4DFD-8D77-4C612FDAD914}.Debug|x64.ActiveCfg = Debug|x64
{06D431CD-A938-4DFD-8D77-4C612FDAD914}.Debug|x64.Build.0 = Debug|x64
{06D431CD-A938-4DFD-8D77-4C612FDAD914}.PrgmList|Any CPU.ActiveCfg = PrgmList|Any CPU
diff --git a/ProgrammList/ConfigManager/ConfigManager.cs b/ProgrammList/ConfigManager/ConfigManager.cs
index 63c663a..68de8fe 100644
--- a/ProgrammList/ConfigManager/ConfigManager.cs
+++ b/ProgrammList/ConfigManager/ConfigManager.cs
@@ -6,7 +6,6 @@ namespace ProgrammList.ConfigManager {
public static string GetSetting(string key) {
try {
if (!File.Exists(Directory.GetCurrentDirectory() + "\\app.conf")) {
- Console.WriteLine("app.conf does not exist, using defaults");
return "";
}
ExeConfigurationFileMap configMap = new ExeConfigurationFileMap();
@@ -15,7 +14,6 @@ namespace ProgrammList.ConfigManager {
return config.AppSettings.Settings[key].Value;
}
catch (Exception e) {
- Console.WriteLine("Error on Key \"" + key + "\": Key not set");
System.Environment.Exit(13);
}
return "13";
@@ -24,14 +22,12 @@ namespace ProgrammList.ConfigManager {
public static void SetSetting(string key, string value) {
try {
ExeConfigurationFileMap configMap = new ExeConfigurationFileMap();
- Console.WriteLine("Loading " + Directory.GetCurrentDirectory() + "\\app.conf");
configMap.ExeConfigFilename = Directory.GetCurrentDirectory() + "\\app.conf";
Configuration config = ConfigurationManager.OpenMappedExeConfiguration(configMap, ConfigurationUserLevel.None);
config.AppSettings.Settings["key"].Value = value;
}
catch (Exception e) {
- Console.WriteLine("Error on Key " + key + ": " + e.ToString());
- Console.WriteLine(e.ToString());
+ // Exception
}
}
}
diff --git a/ProgrammList/Program.cs b/ProgrammList/Program.cs
index 7cd86f1..bfd190a 100644
--- a/ProgrammList/Program.cs
+++ b/ProgrammList/Program.cs
@@ -7,13 +7,10 @@ class Program {
string dbType = PrmListConfigManager.GetSetting("DB_Type");
ListPrograms list = new ListPrograms(dbType);
- Console.WriteLine("Deleting old data");
list.DeleteOldData();
string keyname1 = "Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstal";
- Console.WriteLine("Searching for 32 bit");
list.createList(keyname1, "x86");
string keyname2 = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall";
- Console.WriteLine("Searching for 64 bit");
list.createList(keyname2, "x64");
}
diff --git a/ProgrammList/ProgrammList.csproj b/ProgrammList/ProgrammList.csproj
index d57e020..5c93407 100644
--- a/ProgrammList/ProgrammList.csproj
+++ b/ProgrammList/ProgrammList.csproj
@@ -7,8 +7,13 @@
enable
AnyCPU;x64
Debug;Release;PrgmList
+ icons\back-end.ico
+
+
+
+
@@ -16,5 +21,11 @@
+
+
+ bin\Release\net6.0\Microsoft.Data.Sqlite.dll
+
+
+
diff --git a/ProgrammList/list_creation/ListPrograms.cs b/ProgrammList/list_creation/ListPrograms.cs
index 95485c9..52acd16 100644
--- a/ProgrammList/list_creation/ListPrograms.cs
+++ b/ProgrammList/list_creation/ListPrograms.cs
@@ -13,11 +13,6 @@ namespace ProgrammList.ListPrograms {
internal ListPrograms(string sqlType, params string[] filename) {
if (sqlType == null) {
- Console.WriteLine("SQL Database not defined in app.conf, allowed types:");
- Console.WriteLine("MYSQL");
- Console.WriteLine("MARIADB");
- Console.WriteLine("MSSQL");
- Console.WriteLine("SQLITE");
throw new ArgumentNullException();
}
@@ -28,7 +23,6 @@ namespace ProgrammList.ListPrograms {
string user = PrmListConfigManager.GetSetting("user");
string pw = PrmListConfigManager.GetSetting("pw");
sql = new Mysql(server, database, user, pw);
- sqlname = "MySQL/MariaDB";
}
else if (sqlType.Equals("MSSQL", StringComparison.OrdinalIgnoreCase)) {
string server = PrmListConfigManager.GetSetting("server");
@@ -36,19 +30,14 @@ namespace ProgrammList.ListPrograms {
string user = PrmListConfigManager.GetSetting("user");
string pw = PrmListConfigManager.GetSetting("pw");
sql = new Mssql(server, user, pw, database);
- sqlname = "MSSQL";
}
else if (sqlType.Equals("SQLITE", StringComparison.OrdinalIgnoreCase) && filename != null) {
sql = new Sqlite(prgm_path, filename[0]);
- sqlname = "SQLITE";
}
else {
// Default sqlite im gleichen ordner
- sql = new Sqlite(prgm_path, "sqllite.db");
- sqlname = "fallback default SQLITE";
+ sql = new Sqlite(Directory.GetCurrentDirectory() + "\\sqllite.db");
}
-
- Console.WriteLine();
}
internal void DeleteOldData() {
diff --git a/ProgrammList/sql/Sqlite.cs b/ProgrammList/sql/Sqlite.cs
index c4e193b..a838b54 100644
--- a/ProgrammList/sql/Sqlite.cs
+++ b/ProgrammList/sql/Sqlite.cs
@@ -31,14 +31,11 @@ namespace ProgrammList.sql {
public Sqlite(string prm_path) {
string setting = ConfigManager.PrmListConfigManager.GetSetting("filename");
if (setting != null && setting != "") {
- Console.WriteLine("using db filename " + setting);
sqlitecon = new SqliteConnection("Data Source=" + prm_path + setting);
}
else {
- Console.WriteLine("reverting to default db, sqlite filename sqlite.db");
sqlitecon = new SqliteConnection("Data Source=" + prm_path + "sqlite.db");
}
- sqlitecon.Open();
}
public bool GetSingleLine(string pcid, string program, string version) {
@@ -89,7 +86,6 @@ namespace ProgrammList.sql {
string sqlCommand = "INSERT INTO list(" + cols + ")" + "VALUES(" + result + ")";
SqliteConnection con;
var command = new SqliteCommand(sqlCommand, sqlitecon, transaction);
- Console.WriteLine(sqlCommand);
command.ExecuteNonQuery();
transaction.Commit();
Close();
@@ -97,13 +93,10 @@ namespace ProgrammList.sql {
public void InsertOrUpdateData(Dictionary value) {
if (GetSingleLine(value.GetValueOrDefault("PCID"), value.GetValueOrDefault("DisplayName"), value.GetValueOrDefault("DisplayVersion"))) {
-
- Console.WriteLine("Update");
UpdateData(value);
}
else {
- Console.WriteLine("Insert");
InsertData(value);
}
}
@@ -144,7 +137,6 @@ namespace ProgrammList.sql {
}
}
- Console.WriteLine(command.CommandText);
command.ExecuteNonQuery();
transaction.Commit();
Close();