From 0902ce8b4fdd0c2681441b2cd64b79333803426f Mon Sep 17 00:00:00 2001 From: Lior Banai Date: Fri, 4 Aug 2023 14:30:12 +0300 Subject: [PATCH] set version to 5.0.0.0 --- .editorconfig | 299 ++++++++++++++++++ .../Analogy.LogViewer.GitHistory.csproj | 7 +- .../{Data Types => DataTypes}/Enums.cs | 2 +- .../GitActions/GitFetchAction.cs | 4 +- .../GitRepositoryLoader.cs | 22 +- .../IAnalogy/GitHistoryDataProviderFactory.cs | 2 +- .../GitHistoryDataProviderSettings.cs | 3 +- .../IAnalogy/GitHistoryPrimaryFactory.cs | 4 +- .../Managers/LogManager.cs | 138 -------- .../Managers/UserSettingsManager.cs | 6 +- 10 files changed, 326 insertions(+), 161 deletions(-) create mode 100644 .editorconfig rename Analogy.LogViewer.GitHistory/{Data Types => DataTypes}/Enums.cs (82%) delete mode 100644 Analogy.LogViewer.GitHistory/Managers/LogManager.cs diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..fa05938 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,299 @@ +# Remove the line below if you want to inherit .editorconfig settings from higher directories +root = true + +# C# files +[*.cs] + +#### Core EditorConfig Options #### + +# Indentation and spacing +indent_size = 4 +indent_style = space +tab_width = 4 + +# New line preferences +end_of_line = crlf +insert_final_newline = false + +#### .NET Coding Conventions #### + +# Organize usings +dotnet_separate_import_directive_groups = false +dotnet_sort_system_directives_first = false +file_header_template = unset + +# this. and Me. preferences +dotnet_style_qualification_for_event = false +dotnet_style_qualification_for_field = false +dotnet_style_qualification_for_method = false +dotnet_style_qualification_for_property = false + +# Language keywords vs BCL types preferences +dotnet_style_predefined_type_for_locals_parameters_members = true +dotnet_style_predefined_type_for_member_access = true + +# Parentheses preferences +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_operators = never_if_unnecessary +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity + +# Modifier preferences +dotnet_style_require_accessibility_modifiers = for_non_interface_members + +# Expression-level preferences +dotnet_style_coalesce_expression = true +dotnet_style_collection_initializer = true +dotnet_style_explicit_tuple_names = true +dotnet_style_namespace_match_folder = true +dotnet_style_null_propagation = true +dotnet_style_object_initializer = true +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_prefer_auto_properties = true +dotnet_style_prefer_compound_assignment = true +dotnet_style_prefer_conditional_expression_over_assignment = true +dotnet_style_prefer_conditional_expression_over_return = true +dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed +dotnet_style_prefer_inferred_anonymous_type_member_names = true +dotnet_style_prefer_inferred_tuple_names = true +dotnet_style_prefer_is_null_check_over_reference_equality_method = true +dotnet_style_prefer_simplified_boolean_expressions = true +dotnet_style_prefer_simplified_interpolation = true + +# Field preferences +dotnet_style_readonly_field = true + +# Parameter preferences +dotnet_code_quality_unused_parameters = all + +# Suppression preferences +dotnet_remove_unnecessary_suppression_exclusions = none + +# New line preferences +dotnet_style_allow_multiple_blank_lines_experimental = true +dotnet_style_allow_statement_immediately_after_block_experimental = true + +#### C# Coding Conventions #### + +# var preferences +csharp_style_var_elsewhere = false +csharp_style_var_for_built_in_types = false +csharp_style_var_when_type_is_apparent = false + +# Expression-bodied members +csharp_style_expression_bodied_accessors = true:silent +csharp_style_expression_bodied_constructors = false:silent +csharp_style_expression_bodied_indexers = true:silent +csharp_style_expression_bodied_lambdas = true:silent +csharp_style_expression_bodied_local_functions = false:silent +csharp_style_expression_bodied_methods = false:silent +csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_properties = true:silent + +# Pattern matching preferences +csharp_style_pattern_matching_over_as_with_null_check = true +csharp_style_pattern_matching_over_is_with_cast_check = true +csharp_style_prefer_extended_property_pattern = true +csharp_style_prefer_not_pattern = true +csharp_style_prefer_pattern_matching = true +csharp_style_prefer_switch_expression = true + +# Null-checking preferences +csharp_style_conditional_delegate_call = true + +# Modifier preferences +csharp_prefer_static_local_function = true +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async +csharp_style_prefer_readonly_struct = true +csharp_style_prefer_readonly_struct_member = true + +# Code-block preferences +csharp_prefer_braces = true:silent +csharp_prefer_simple_using_statement = true:suggestion +csharp_style_namespace_declarations = block_scoped:silent +csharp_style_prefer_method_group_conversion = true:silent +csharp_style_prefer_top_level_statements = true:silent + +# Expression-level preferences +csharp_prefer_simple_default_expression = true +csharp_style_deconstructed_variable_declaration = true +csharp_style_implicit_object_creation_when_type_is_apparent = true +csharp_style_inlined_variable_declaration = true +csharp_style_prefer_index_operator = true +csharp_style_prefer_local_over_anonymous_function = true +csharp_style_prefer_null_check_over_type_check = true +csharp_style_prefer_range_operator = true +csharp_style_prefer_tuple_swap = true +csharp_style_prefer_utf8_string_literals = true +csharp_style_throw_expression = true +csharp_style_unused_value_assignment_preference = discard_variable +csharp_style_unused_value_expression_statement_preference = discard_variable + +# 'using' directive preferences +csharp_using_directive_placement = outside_namespace:silent + +# New line preferences +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true +csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true +csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true +csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent + +#### C# Formatting Rules #### + +# New line preferences +csharp_new_line_before_catch = true +csharp_new_line_before_else = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = all +csharp_new_line_between_query_expression_clauses = true + +# Indentation preferences +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = true +csharp_indent_labels = one_less_than_current +csharp_indent_switch_labels = true + +# Space preferences +csharp_space_after_cast = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_semicolon_in_for_statement = true +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false + +# Wrapping preferences +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = true + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.property_should_be_pascal_case.severity = error +dotnet_naming_rule.property_should_be_pascal_case.symbols = property +dotnet_naming_rule.property_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.property.applicable_kinds = property +dotnet_naming_symbols.property.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.property.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case +dotnet_diagnostic.SA1101.severity = silent +dotnet_diagnostic.SA1513.severity = silent +dotnet_diagnostic.SA1600.severity = suggestion +dotnet_diagnostic.SA1508.severity = error +dotnet_diagnostic.SA1128.severity = silent +dotnet_diagnostic.SA1516.severity = silent +dotnet_diagnostic.SA1201.severity = silent +dotnet_diagnostic.MA0004.severity = silent +dotnet_diagnostic.SA1117.severity = silent +dotnet_diagnostic.MA0015.severity = silent +dotnet_diagnostic.MA0026.severity = suggestion +dotnet_diagnostic.SA1202.severity = suggestion +dotnet_diagnostic.SA1116.severity = silent +dotnet_diagnostic.MA0051.severity = silent +dotnet_diagnostic.SA1633.severity = silent +dotnet_diagnostic.SA1005.severity = silent +csharp_style_prefer_primary_constructors = true:suggestion +dotnet_diagnostic.SA1518.severity = error +dotnet_diagnostic.SA1001.severity = error +dotnet_diagnostic.SA1507.severity = error +dotnet_diagnostic.SA1505.severity = error +dotnet_diagnostic.SA1400.severity = error +dotnet_diagnostic.SA1503.severity = error +dotnet_diagnostic.SA1515.severity = error +dotnet_diagnostic.SA1514.severity = error +dotnet_diagnostic.SA1413.severity = error +dotnet_diagnostic.SA1008.severity = error +dotnet_diagnostic.SA1121.severity = error +dotnet_diagnostic.SA1212.severity = error +dotnet_diagnostic.SA1313.severity = error +dotnet_diagnostic.CA1805.severity = error +dotnet_diagnostic.MA0134.severity = error +dotnet_diagnostic.SA1408.severity = error +dotnet_diagnostic.SA1210.severity = error +dotnet_diagnostic.SA1122.severity = suggestion +dotnet_diagnostic.SA1108.severity = silent +dotnet_diagnostic.SA1012.severity = error +dotnet_diagnostic.SA1500.severity = error + +[*.{cs,vb}] +dotnet_style_operator_placement_when_wrapping = beginning_of_line +tab_width = 4 +indent_size = 4 +end_of_line = crlf +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_qualification_for_field = false:silent +dotnet_style_qualification_for_property = false:silent +dotnet_style_qualification_for_method = false:silent +dotnet_style_qualification_for_event = false:silent +dotnet_diagnostic.CA1854.severity = error +dotnet_diagnostic.CA1707.severity = error +dotnet_diagnostic.CA2208.severity = error +dotnet_style_predefined_type_for_locals_parameters_members = true:silent +dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent +dotnet_code_quality_unused_parameters = all:suggestion +dotnet_diagnostic.CA2200.severity = error +dotnet_diagnostic.CA1012.severity = error \ No newline at end of file diff --git a/Analogy.LogViewer.GitHistory/Analogy.LogViewer.GitHistory.csproj b/Analogy.LogViewer.GitHistory/Analogy.LogViewer.GitHistory.csproj index 89344cb..2d4e8b7 100644 --- a/Analogy.LogViewer.GitHistory/Analogy.LogViewer.GitHistory.csproj +++ b/Analogy.LogViewer.GitHistory/Analogy.LogViewer.GitHistory.csproj @@ -19,7 +19,8 @@ Aligh with latest API Analogy.GitHistoryBanner.png true - 3.8.3 + 5.0.0.0 + Analogy.LogViewer enable latest @@ -28,8 +29,8 @@ - - + + all diff --git a/Analogy.LogViewer.GitHistory/Data Types/Enums.cs b/Analogy.LogViewer.GitHistory/DataTypes/Enums.cs similarity index 82% rename from Analogy.LogViewer.GitHistory/Data Types/Enums.cs rename to Analogy.LogViewer.GitHistory/DataTypes/Enums.cs index cf03287..349b551 100644 --- a/Analogy.LogViewer.GitHistory/Data Types/Enums.cs +++ b/Analogy.LogViewer.GitHistory/DataTypes/Enums.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace Analogy.LogViewer.GitHistory.Data_Types +namespace Analogy.LogViewer.GitHistory.DataTypes { public enum GitOperationType { diff --git a/Analogy.LogViewer.GitHistory/GitActions/GitFetchAction.cs b/Analogy.LogViewer.GitHistory/GitActions/GitFetchAction.cs index 3e12c33..fda8c4c 100644 --- a/Analogy.LogViewer.GitHistory/GitActions/GitFetchAction.cs +++ b/Analogy.LogViewer.GitHistory/GitActions/GitFetchAction.cs @@ -18,8 +18,8 @@ public class GitFetchAction : IAnalogyCustomAction f.ShowDialog(Application.OpenForms[0]); }; public Guid Id { get; set; } = new Guid("FD8E1ED1-20DA-4783-87EC-9FAC66422CC1"); - public Image LargeImage { get; set; } = null; - public Image SmallImage { get; set; } = null; + public Image LargeImage { get; set; } + public Image SmallImage { get; set; } public string Title { get; set; } = "Git Fetch"; public AnalogyCustomActionType Type { get; } = AnalogyCustomActionType.BelongsToProvider; diff --git a/Analogy.LogViewer.GitHistory/GitRepositoryLoader.cs b/Analogy.LogViewer.GitHistory/GitRepositoryLoader.cs index 9c4f169..6fbbd54 100644 --- a/Analogy.LogViewer.GitHistory/GitRepositoryLoader.cs +++ b/Analogy.LogViewer.GitHistory/GitRepositoryLoader.cs @@ -1,30 +1,31 @@ using Analogy.Interfaces; -using Analogy.LogViewer.GitHistory.Managers; using LibGit2Sharp; using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Threading.Tasks; -using Analogy.LogViewer.GitHistory.Data_Types; +using Analogy.LogViewer.GitHistory.DataTypes; +using Analogy.LogViewer.Template.Managers; +using Microsoft.Extensions.Logging; namespace Analogy.LogViewer.GitHistory { public class GitRepositoryLoader : Template.OnlineDataProvider { public override Guid Id { get; set; } = new Guid("3CD8B586-5AB0-4C84-A1F8-0F093F846A5D"); - public override Image? ConnectedLargeImage { get; set; } = null; - public override Image? ConnectedSmallImage { get; set; } = null; - public override Image? DisconnectedLargeImage { get; set; } = null; - public override Image? DisconnectedSmallImage { get; set; } = null; + public override Image? ConnectedLargeImage { get; set; } + public override Image? ConnectedSmallImage { get; set; } + public override Image? DisconnectedLargeImage { get; set; } + public override Image? DisconnectedSmallImage { get; set; } public override string OptionalTitle { get; set; } public override Task CanStartReceiving() => Task.FromResult(true); - public override IAnalogyOfflineDataProvider FileOperationsHandler { get; set; } = null; + public override IAnalogyOfflineDataProvider FileOperationsHandler { get; set; } private RepositorySetting RepositorySetting { get; } private GitOperationType Operation { get; } - public override bool UseCustomColors { get; set; } = false; + public override bool UseCustomColors { get; set; } public override IEnumerable<(string originalHeader, string replacementHeader)> GetReplacementHeaders() => new List<(string originalHeader, string replacementHeader)> { ("Source", "Branch"), ("Module", "Local Path") }; @@ -37,9 +38,8 @@ public GitRepositoryLoader(RepositorySetting rs, GitOperationType operation) OptionalTitle = RepositorySetting.RepositoryPath; } - public override Task InitializeDataProvider(IAnalogyLogger logger) + public override Task InitializeDataProvider(ILogger logger) { - LogManager.Instance.SetLogger(logger); return base.InitializeDataProvider(logger); } @@ -66,7 +66,7 @@ public override Task StartReceiving() } catch (Exception e) { - LogManager.Instance.LogError($@"Error reading {RepositorySetting.RepositoryPath}: {e}", nameof(StartReceiving)); + LogManager.Instance.LogError(e,$@"Error reading {RepositorySetting.RepositoryPath}: {e}", nameof(StartReceiving)); AnalogyLogMessage m = new AnalogyLogMessage { Date = DateTime.Now, diff --git a/Analogy.LogViewer.GitHistory/IAnalogy/GitHistoryDataProviderFactory.cs b/Analogy.LogViewer.GitHistory/IAnalogy/GitHistoryDataProviderFactory.cs index 60040b6..f6818d9 100644 --- a/Analogy.LogViewer.GitHistory/IAnalogy/GitHistoryDataProviderFactory.cs +++ b/Analogy.LogViewer.GitHistory/IAnalogy/GitHistoryDataProviderFactory.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Analogy.LogViewer.GitHistory.Data_Types; +using Analogy.LogViewer.GitHistory.DataTypes; namespace Analogy.LogViewer.GitHistory.IAnalogy { diff --git a/Analogy.LogViewer.GitHistory/IAnalogy/GitHistoryDataProviderSettings.cs b/Analogy.LogViewer.GitHistory/IAnalogy/GitHistoryDataProviderSettings.cs index 4165a20..290a08a 100644 --- a/Analogy.LogViewer.GitHistory/IAnalogy/GitHistoryDataProviderSettings.cs +++ b/Analogy.LogViewer.GitHistory/IAnalogy/GitHistoryDataProviderSettings.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using Analogy.Interfaces; using Analogy.LogViewer.GitHistory.Managers; +using Microsoft.Extensions.Logging; namespace Analogy.LogViewer.GitHistory.IAnalogy { @@ -17,7 +18,7 @@ public class GitHistoryDataProviderSettings : Template.TemplateUserSettingsFacto public override Guid FactoryId { get; set; } = GitHistoryPrimaryFactory.Id; public override Guid Id { get; set; } = new Guid("AEE6AA94-A0B6-4313-8C65-D81943B542DB"); - public override void CreateUserControl(IAnalogyLogger logger) + public override void CreateUserControl(ILogger logger) { DataProviderSettings = new GitRepositoriesSettings(); } diff --git a/Analogy.LogViewer.GitHistory/IAnalogy/GitHistoryPrimaryFactory.cs b/Analogy.LogViewer.GitHistory/IAnalogy/GitHistoryPrimaryFactory.cs index 7f0cf8c..a390f80 100644 --- a/Analogy.LogViewer.GitHistory/IAnalogy/GitHistoryPrimaryFactory.cs +++ b/Analogy.LogViewer.GitHistory/IAnalogy/GitHistoryPrimaryFactory.cs @@ -16,8 +16,8 @@ public class GitHistoryPrimaryFactory : Template.PrimaryFactory public override IEnumerable ChangeLog { get; set; } = new List { - new AnalogyChangeLog("[Git provider] Add list of tags #140",AnalogChangeLogType.Improvement, "Lior Banai",new DateTime(2023, 01, 21)), - new AnalogyChangeLog("Initial version",AnalogChangeLogType.None, "Lior Banai",new DateTime(2020, 04, 02)) + new AnalogyChangeLog("[Git provider] Add list of tags #140",AnalogChangeLogType.Improvement, "Lior Banai",new DateTime(2023, 01, 21), ""), + new AnalogyChangeLog("Initial version",AnalogChangeLogType.None, "Lior Banai",new DateTime(2020, 04, 02), "") }; public override IEnumerable Contributors { get; set; } = new List { "Lior Banai" }; public override string About { get; set; } = "Analogy Git History"; diff --git a/Analogy.LogViewer.GitHistory/Managers/LogManager.cs b/Analogy.LogViewer.GitHistory/Managers/LogManager.cs deleted file mode 100644 index 61ff398..0000000 --- a/Analogy.LogViewer.GitHistory/Managers/LogManager.cs +++ /dev/null @@ -1,138 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Analogy.Interfaces; -using Microsoft.Extensions.Logging; - -namespace Analogy.LogViewer.GitHistory.Managers -{ - public class LogManager : IAnalogyLogger - { - private static Lazy _instance = new Lazy(() => new LogManager()); - - private IAnalogyLogger? Logger { get; set; } - public static LogManager Instance { get; } = _instance.Value; - private List<(AnalogyLogLevel level, string source, string message, string memberName, int lineNumber, string filePath)> PendingMessages { get; set; } - public LogManager() - { - PendingMessages = new List<(AnalogyLogLevel level, string source, string message, string memberName, int lineNumber, string filePath)>(); - } - - public void SetLogger(IAnalogyLogger logger) - { - Logger = logger; - foreach ((AnalogyLogLevel level, string source, string message, string memberName, int lineNumber, string filePath) in PendingMessages) - { - switch (level) - { - - - case AnalogyLogLevel.Debug: - logger.LogDebug(message, source, memberName, lineNumber, filePath); - break; - - case AnalogyLogLevel.Warning: - logger.LogWarning(message, source, memberName, lineNumber, filePath); - break; - case AnalogyLogLevel.Error: - logger.LogError(message, source, memberName, lineNumber, filePath); - break; - case AnalogyLogLevel.Critical: - logger.LogCritical(message, source, memberName, lineNumber, filePath); - break; - default: - logger.LogInformation(message, source, memberName, lineNumber, filePath); - break; - } - } - } - - public void LogInformation(string message, string source, string memberName = "", int lineNumber = 0, string filePath = "") - { - if (Logger == null) - { - PendingMessages.Add((AnalogyLogLevel.Information, source, message, memberName, lineNumber, filePath)); - } - else - { - Logger.LogInformation(message, source, memberName, lineNumber, filePath); - } - } - - public void LogWarning(string message, string source, string memberName = "", int lineNumber = 0, string filePath = "") - { - if (Logger == null) - { - PendingMessages.Add((AnalogyLogLevel.Warning, source, message, memberName, lineNumber, filePath)); - } - else - { - Logger.LogWarning(message, source, memberName, lineNumber, filePath); - } - } - - public void LogDebug(string message, string source, string memberName = "", int lineNumber = 0, string filePath = "") - { - if (Logger == null) - { - PendingMessages.Add((AnalogyLogLevel.Debug, source, message, memberName, lineNumber, filePath)); - } - else - { - Logger.LogDebug(message, source, memberName, lineNumber, filePath); - } - } - - public void LogError(string message, string source, string memberName = "", int lineNumber = 0, string filePath = "") - { - if (Logger == null) - { - PendingMessages.Add((AnalogyLogLevel.Error, source, message, memberName, lineNumber, filePath)); - } - else - { - Logger.LogError(message, source, memberName, lineNumber, filePath); - } - } - - public void LogCritical(string message, string source, string memberName = "", int lineNumber = 0, string filePath = "") - { - if (Logger == null) - { - PendingMessages.Add((AnalogyLogLevel.Critical, source, message, memberName, lineNumber, filePath)); - } - else - { - Logger.LogCritical(message, source, memberName, lineNumber, filePath); - } - } - - public void LogException(string message, Exception ex, string source, string memberName = "", int lineNumber = 0, - string filePath = "") - { - if (Logger == null) - { - PendingMessages.Add((AnalogyLogLevel.Error, source, $"Error: {message.Length }Exception: {ex}", memberName, lineNumber, filePath)); - } - else - { - Logger.LogException(message, ex, source, memberName, lineNumber, filePath); - } - } - - public void Log(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func formatter) - { - Logger?.Log(logLevel,eventId,state,exception,formatter); - } - - public bool IsEnabled(LogLevel logLevel) - { - return Logger?.IsEnabled(logLevel) ?? false; - } - - public IDisposable? BeginScope(TState state) where TState : notnull - { - return Logger?.BeginScope(state); - } - } -} diff --git a/Analogy.LogViewer.GitHistory/Managers/UserSettingsManager.cs b/Analogy.LogViewer.GitHistory/Managers/UserSettingsManager.cs index 781df27..f0c874b 100644 --- a/Analogy.LogViewer.GitHistory/Managers/UserSettingsManager.cs +++ b/Analogy.LogViewer.GitHistory/Managers/UserSettingsManager.cs @@ -1,4 +1,6 @@ -using Newtonsoft.Json; +using Analogy.LogViewer.Template.Managers; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; using System; using System.IO; @@ -24,7 +26,7 @@ public UserSettingsManager() } catch (Exception ex) { - LogManager.Instance.LogCritical($"Unable to read file {RepositoriesSettingFile}: {ex}",""); + LogManager.Instance.LogCritical(ex, $"Unable to read file {RepositoriesSettingFile}: {ex}",""); } } }