andreitdr/SethDiscordBot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed from TextType to LogLevel

Browse Source
This commit is contained in:
Wizzy69
2023-05-28 17:37:19 +03:00
parent f16c139362
commit 77f1bef862
13 changed files with 45 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PluginManager/Others/ArchiveManager.cs
View File

@@ -58,7 +58,7 @@ namespace PluginManager.Others
}
catch (Exception ex)
{
Config.Logger.Log(ex.Message, "Archive Manager", TextType.ERROR); // Write the error to a file
Config.Logger.Log(ex.Message, "Archive Manager", LogLevel.ERROR); // Write the error to a file
await Task.Delay(100);
return await ReadFromPakAsync(FileName, archFile);
}
@@ -79,7 +79,7 @@ namespace PluginManager.Others
Directory.CreateDirectory(folder);
using (var archive = ZipFile.OpenRead(zip))
{
if (type == UnzipProgressType.PercentageFromNumberOfFiles)
if (type == UnzipProgressType.PERCENTAGE_FROM_NUMBER_OF_FILES)
{
var totalZIPFiles = archive.Entries.Count();
var currentZIPFile = 0;
@@ -95,7 +95,7 @@ namespace PluginManager.Others
}
catch (Exception ex)
{
Config.Logger.Log($"Failed to extract {entry.Name}. Exception: {ex.Message}", "Archive Manager", TextType.ERROR);
Config.Logger.Log($"Failed to extract {entry.Name}. Exception: {ex.Message}", "Archive Manager", LogLevel.ERROR);
}
currentZIPFile++;
@@ -104,7 +104,7 @@ namespace PluginManager.Others
progress.Report((float)currentZIPFile / totalZIPFiles * 100);
}
}
else if (type == UnzipProgressType.PercentageFromTotalSize)
else if (type == UnzipProgressType.PERCENTAGE_FROM_TOTAL_SIZE)
{
ulong zipSize = 0;
@@ -127,7 +127,7 @@ namespace PluginManager.Others
}
catch (Exception ex)
{
Config.Logger.Log($"Failed to extract {entry.Name}. Exception: {ex.Message}", "Archive Manager", TextType.ERROR);
Config.Logger.Log($"Failed to extract {entry.Name}. Exception: {ex.Message}", "Archive Manager", LogLevel.ERROR);
}
await Task.Delay(10);

27
PluginManager/Others/Enums.cs
View File

@@ -11,23 +11,10 @@ public enum OperatingSystem
UNKNOWN
}
/// <summary>
/// A list with all errors
/// </summary>
public enum Error
{
UNKNOWN_ERROR,
GUILD_NOT_FOUND,
STREAM_NOT_FOUND,
INVALID_USER,
INVALID_CHANNEL,
INVALID_PERMISSIONS
}
/// <summary>
/// The output log type
/// </summary>
public enum OutputLogLevel
public enum LogLevel
{
NONE,
INFO,
@@ -38,8 +25,8 @@ public enum OutputLogLevel
public enum UnzipProgressType
{
PercentageFromNumberOfFiles,
PercentageFromTotalSize
PERCENTAGE_FROM_NUMBER_OF_FILES,
PERCENTAGE_FROM_TOTAL_SIZE
}
public enum SaveType
@@ -48,11 +35,3 @@ public enum SaveType
BACKUP
}
public enum TextType
{
NORMAL,
ERROR,
WARNING,
SUCCESS
}

8
PluginManager/Others/Logger/DBLogger.cs
View File

@@ -16,7 +16,7 @@ namespace PluginManager.Others.Logger
public IReadOnlyList<LogMessage> Logs => LogHistory;
public IReadOnlyList<LogMessage> Errors => ErrorHistory;
public delegate void LogHandler(string message, TextType logType);
public delegate void LogHandler(string message, LogLevel logType);
public event LogHandler LogEvent;
private string _logFolder;
@@ -28,20 +28,20 @@ namespace PluginManager.Others.Logger
_errFolder = Config.Data["ErrorFolder"];
}
public void Log(string message, string sender = "unknown", TextType type = TextType.NORMAL) => Log(new LogMessage(message, type, sender));
public void Log(string message, string sender = "unknown", LogLevel type = LogLevel.INFO) => Log(new LogMessage(message, type, sender));
public void Log(LogMessage message)
{
if(LogEvent is not null)
LogEvent?.Invoke(message.Message, message.Type);
if (message.Type != TextType.ERROR)
if (message.Type != LogLevel.NONE)
LogHistory.Add(message);
else
ErrorHistory.Add(message);
}
public void Log(string message, object sender, TextType type = TextType.NORMAL) => Log(message, sender.GetType().Name, type);
public void Log(string message, object sender, LogLevel type = LogLevel.NONE) => Log(message, sender.GetType().Name, type);
public async void SaveToFile()
{

12
PluginManager/Others/Logger/LogMessage.cs
View File

@@ -9,17 +9,17 @@ namespace PluginManager.Others.Logger
public class LogMessage
{
public string Message { get; set; }
public TextType Type { get; set; }
public LogLevel Type { get; set; }
public string Time { get; set; }
public string Sender { get; set; }
public LogMessage(string message, TextType type)
public LogMessage(string message, LogLevel type)
{
Message = message;
Type = type;
Time = DateTime.Now.ToString("HH:mm:ss");
}
public LogMessage(string message, TextType type, string sender) : this(message, type)
public LogMessage(string message, LogLevel type, string sender) : this(message, type)
{
Sender = sender;
}
@@ -31,15 +31,15 @@ namespace PluginManager.Others.Logger
public static explicit operator LogMessage(string message)
{
return new LogMessage(message, TextType.NORMAL);
return new LogMessage(message, LogLevel.INFO);
}
public static explicit operator LogMessage((string message, TextType type) tuple)
public static explicit operator LogMessage((string message, LogLevel type) tuple)
{
return new LogMessage(tuple.message, tuple.type);
}
public static explicit operator LogMessage((string message, TextType type, string sender) tuple)
public static explicit operator LogMessage((string message, LogLevel type, string sender) tuple)
{
return new LogMessage(tuple.message, tuple.type, tuple.sender);
}