Logging

src/Grr.App/Grr.App.csproj

@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
     <PackageReference Include="System.IO.Abstractions" Version="17.2.1" />
     <PackageReference Include="TextCopy" Version="6.1.0" />
   </ItemGroup>

src/GrrUi.App/GrrUi.App.csproj

@@ -11,6 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
     <PackageReference Include="Terminal.Gui" Version="1.7.2" />
     <PackageReference Include="TextCopy" Version="6.1.0" />
   </ItemGroup>

src/RepoM.Api/Common/HardcodededMiniHumanizer.cs

@@ -7,7 +7,9 @@ public class HardcodededMiniHumanizer : IHumanizer
     private readonly IClock _clock;
 
     public HardcodededMiniHumanizer()
-        : this(new SystemClock()) { }
+        : this(new SystemClock())
+    {
+    }
 
     public HardcodededMiniHumanizer(IClock clock)
     {

src/RepoM.Api/Git/DefaultRepositoryIgnoreStore.cs

@@ -5,7 +5,6 @@ namespace RepoM.Api.Git;
 using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
-using RepoM.Api.Common;
 using RepoM.Api.IO;
 
 public class DefaultRepositoryIgnoreStore : FileRepositoryStore, IRepositoryIgnoreStore
@@ -20,8 +19,8 @@ public DefaultRepositoryIgnoreStore(
         IFileSystem fileSystem)
         : base(fileSystem)
     {
-        AppDataPathProvider = appDataPathProvider ?? throw new ArgumentNullException(nameof(appDataPathProvider));
-        _fullFilename = Path.Combine(AppDataPathProvider.GetAppDataPath(), "Repositories.ignore");
+        _ = appDataPathProvider ?? throw new ArgumentNullException(nameof(appDataPathProvider));
+        _fullFilename = Path.Combine(appDataPathProvider.GetAppDataPath(), "Repositories.ignore");
     }
 
     public override string GetFileName()
@@ -71,7 +70,7 @@ private List<string> Ignores
                     return _ignores;
                 }
 
-                _ignores = Get()?.ToList() ?? new List<string>();
+                _ignores = Get().ToList();
                 UpdateRules();
             }
 
@@ -83,6 +82,4 @@ private void UpdateRules()
     {
         _rules = Ignores.Select(i => new IgnoreRule(i));
     }
-
-    public IAppDataPathProvider AppDataPathProvider { get; }
 }

src/RepoM.Api/Git/DefaultRepositoryMonitor.cs

@@ -51,10 +51,8 @@ public DefaultRepositoryMonitor(
         _repositoryObservers = new Dictionary<string, IRepositoryObserver>();
         _repositoryIgnoreStore = repositoryIgnoreStore;
         _fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
-
-        _storeFlushTimer = new Timer(RepositoryStoreFlushTimerCallback, null, Timeout.Infinite, Timeout.Infinite);
-
         _autoFetchHandler = autoFetchHandler ?? throw new ArgumentNullException(nameof(autoFetchHandler));
+        _storeFlushTimer = new Timer(RepositoryStoreFlushTimerCallback, null, Timeout.Infinite, Timeout.Infinite);
     }
 
     public Task ScanForLocalRepositoriesAsync()

src/RepoM.Api/Git/DefaultRepositoryReader.cs

@@ -4,15 +4,18 @@ namespace RepoM.Api.Git;
 using System.IO;
 using System.Linq;
 using LibGit2Sharp;
+using Microsoft.Extensions.Logging;
 using RepoM.Api.IO.ModuleBasedRepositoryActionProvider;
 
 public class DefaultRepositoryReader : IRepositoryReader
 {
     private readonly IRepositoryTagsFactory _resolver;
+    private readonly ILogger _logger;
 
-    public DefaultRepositoryReader(IRepositoryTagsFactory resolver)
+    public DefaultRepositoryReader(IRepositoryTagsFactory resolver, ILogger logger)
     {
-        _resolver = resolver;
+        _resolver = resolver ?? throw new ArgumentNullException(nameof(resolver));
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
     }
 
     public Git.Repository? ReadRepository(string path)
@@ -26,6 +29,7 @@ public DefaultRepositoryReader(IRepositoryTagsFactory resolver)
         var repoPath = LibGit2Sharp.Repository.Discover(path);
         if (string.IsNullOrEmpty(repoPath))
         {
+            _logger.LogWarning("Could not Discover git repo in path {path}", path);
             return null;
             // return Api.Git.Repository.Empty;
         }
@@ -35,6 +39,11 @@ public DefaultRepositoryReader(IRepositoryTagsFactory resolver)
         {
             result.Tags = _resolver.GetTags(result).ToArray();
         }
+        else
+        {
+            _logger.LogWarning("Could not read git repo in path {path}", repoPath);
+        }
+
         return result;
     }
 
@@ -51,14 +60,14 @@ public DefaultRepositoryReader(IRepositoryTagsFactory resolver)
             }
             catch (LockedFileException)
             {
+                _logger.LogWarning("LockedFileException {path}", repoPath);
+
                 if (currentTry >= maxRetries)
                 {
                     throw;
                 }
-                else
-                {
-                    System.Threading.Thread.Sleep(500);
-                }
+
+                System.Threading.Thread.Sleep(500);
             }
 
             currentTry++;
@@ -67,7 +76,7 @@ public DefaultRepositoryReader(IRepositoryTagsFactory resolver)
         return repository;
     }
 
-    private static Git.Repository? ReadRepositoryInternal(string repoPath)
+    private Git.Repository? ReadRepositoryInternal(string repoPath)
     {
         try
         {
@@ -78,7 +87,7 @@ public DefaultRepositoryReader(IRepositoryTagsFactory resolver)
 
             HeadDetails headDetails = GetHeadDetails(repo);
 
-            var repository = new Git.Repository()
+            var repository = new Git.Repository
                 {
                     Name = workingDirectory.Name,
                     Path = workingDirectory.FullName,
@@ -114,8 +123,9 @@ public DefaultRepositoryReader(IRepositoryTagsFactory resolver)
 
             return repository;
         }
-        catch (Exception)
+        catch (Exception e)
         {
+            _logger.LogError(e, "Could not read (LibGit2Sharp) repo in {path}.", repoPath);
             return null;
             // return Api.Git.Repository.Empty;
         }

src/RepoM.Api/Git/DefaultRepositoryStore.cs

@@ -3,7 +3,6 @@ namespace RepoM.Api.Git;
 using System;
 using System.IO;
 using System.IO.Abstractions;
-using RepoM.Api.Common;
 using RepoM.Api.IO;
 
 public class DefaultRepositoryStore : FileRepositoryStore

src/RepoM.Api/Git/FileRepositoryStore.cs

@@ -4,15 +4,14 @@ namespace RepoM.Api.Git;
 using System.Collections.Generic;
 using System.IO.Abstractions;
 using System.Linq;
-using RepoM.Api.Common;
 
 public abstract class FileRepositoryStore : IRepositoryStore
 {
-    private protected readonly IFileSystem FileSystem;
+    private readonly IFileSystem _fileSystem;
 
     protected FileRepositoryStore(IFileSystem fileSystem)
     {
-        FileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+        _fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
     }
 
     public abstract string GetFileName();
@@ -24,11 +23,11 @@ public IEnumerable<string> Get(string file)
             return Array.Empty<string>();
         }
 
-        if (FileSystem.File.Exists(file))
+        if (_fileSystem.File.Exists(file))
         {
             try
             {
-                return FileSystem.File.ReadAllLines(file);
+                return _fileSystem.File.ReadAllLines(file);
             }
             catch (Exception)
             {
@@ -53,22 +52,23 @@ public void Set(IEnumerable<string> paths)
         }
 
         var file = GetFileName();
-        var path = FileSystem.Directory.GetParent(file).FullName;
+        var path = _fileSystem.Directory.GetParent(file).FullName;
 
-        if (!FileSystem.Directory.Exists(path))
+        if (!_fileSystem.Directory.Exists(path))
         {
-            FileSystem.Directory.CreateDirectory(path);
+            _fileSystem.Directory.CreateDirectory(path);
         }
 
         try
         {
-            FileSystem.File.WriteAllLines(GetFileName(), paths.ToArray());
+            _fileSystem.File.WriteAllLines(GetFileName(), paths.ToArray());
         }
         catch (Exception)
         {
             // swallow for now.
         }
     }
 
+    // todo remove
     public bool UseFilePersistence { get; set; } = true;
 }

src/RepoM.Api/Git/Remote.cs

@@ -3,7 +3,6 @@ namespace RepoM.Api.Git;
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Xml.Linq;
 
 [DebuggerDisplay("{Key}/{Name}")]
 public class Remote

src/RepoM.Api/Git/Repository.cs

@@ -34,8 +34,8 @@ public override bool Equals(object obj)
 
     private static string? Normalize(string path)
     {
-        // yeah not that beautiful but we have to add a blackslash
-        // or slash (depending on the OS) and on Mono, I dont have Path.PathSeparator.
+        // yeah not that beautiful but we have to add a backslash
+        // or slash (depending on the OS) and on Mono, I don't have Path.PathSeparator.
         // so we add a random char with Path.Combine() and remove it again
         path = System.IO.Path.Combine(path, "_");
         path = path.Substring(0, path.Length - 1);

src/RepoM.Api/IO/DefaultAppDataPathProvider.cs

@@ -4,14 +4,21 @@ namespace RepoM.Api.IO;
 using System.IO;
 
 public class DefaultAppDataPathProvider : IAppDataPathProvider
-{
+{ 
     private static readonly string _applicationDataRepoM = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RepoM");
 
+    private DefaultAppDataPathProvider()
+    {
+    }
+
+    public static DefaultAppDataPathProvider Instance { get; } = new();
+
     public string GetAppDataPath() 
     {
         return _applicationDataRepoM ;
     }
 
+    [Obsolete("Not used.")]
     public string GetAppResourcesPath()
     {
         return Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);