From dbb31b6d456f077f8f8a1d8c39446b3671c2d6c8 Mon Sep 17 00:00:00 2001 From: jibedoubleve Date: Wed, 20 Dec 2023 17:08:45 +0100 Subject: [PATCH] (#399) Refactoring of the code --- src/Lanceur.Core/Decorators/EntityDecorator.cs | 2 +- .../Managers/{IThumbnailFixer.cs => IFavIconManager.cs} | 2 +- src/Lanceur.Infra.Win32/Thumbnails/ThumbnailManager.cs | 8 ++++---- .../Managers/{ThumbnailFixer.cs => FavIconManager.cs} | 6 +++--- src/Lanceur/Bootstrapper.cs | 4 ++-- .../Utils/Builders/KeywordsViewModelBuilder.cs | 6 +++--- .../Lanceur.Tests/ViewModels/KeywordViewModelShould.cs | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) rename src/Lanceur.Core/Managers/{IThumbnailFixer.cs => IFavIconManager.cs} (91%) rename src/Lanceur.Infra/Managers/{ThumbnailFixer.cs => FavIconManager.cs} (90%) diff --git a/src/Lanceur.Core/Decorators/EntityDecorator.cs b/src/Lanceur.Core/Decorators/EntityDecorator.cs index e693689b..35b3399d 100644 --- a/src/Lanceur.Core/Decorators/EntityDecorator.cs +++ b/src/Lanceur.Core/Decorators/EntityDecorator.cs @@ -31,7 +31,7 @@ private EntityDecorator(TEntity entity) public static IEnumerable> FromEnumerable(IEnumerable results) => results.Select(x => new EntityDecorator(x)); /// - /// Mark the contained as updated in the database + /// Mark the contained as to be updated in the database /// public void Soil() => IsDirty = true; diff --git a/src/Lanceur.Core/Managers/IThumbnailFixer.cs b/src/Lanceur.Core/Managers/IFavIconManager.cs similarity index 91% rename from src/Lanceur.Core/Managers/IThumbnailFixer.cs rename to src/Lanceur.Core/Managers/IFavIconManager.cs index fc65e381..f23ac499 100644 --- a/src/Lanceur.Core/Managers/IThumbnailFixer.cs +++ b/src/Lanceur.Core/Managers/IFavIconManager.cs @@ -2,7 +2,7 @@ namespace Lanceur.Core.Managers { - public interface IThumbnailFixer + public interface IFavIconManager { #region Methods diff --git a/src/Lanceur.Infra.Win32/Thumbnails/ThumbnailManager.cs b/src/Lanceur.Infra.Win32/Thumbnails/ThumbnailManager.cs index 637873cd..e20f84ad 100644 --- a/src/Lanceur.Infra.Win32/Thumbnails/ThumbnailManager.cs +++ b/src/Lanceur.Infra.Win32/Thumbnails/ThumbnailManager.cs @@ -17,7 +17,7 @@ public class ThumbnailManager : IThumbnailManager private readonly IDbRepository _dbRepository; private readonly IPackagedAppSearchService _searchService; private readonly IAppLogger _log; - private readonly IThumbnailFixer _thumbnailFixer; + private readonly IFavIconManager _favIconManager; #endregion Fields @@ -25,11 +25,11 @@ public class ThumbnailManager : IThumbnailManager public ThumbnailManager( IAppLoggerFactory loggerFactory, - IThumbnailFixer thumbnailFixer, + IFavIconManager favIconManager, IDbRepository dbRepository, IPackagedAppSearchService searchService) { - _thumbnailFixer = thumbnailFixer; + _favIconManager = favIconManager; _dbRepository = dbRepository; _searchService = searchService; _log = loggerFactory.GetLogger(); @@ -125,7 +125,7 @@ void RefreshCurrentThumbnail(EntityDecorator query) alias.Icon = webIcon; alias.Thumbnail = favicon; - _ = _thumbnailFixer.RetrieveFaviconAsync(alias.FileName); // Fire & forget favicon retrieving + _ = _favIconManager.RetrieveFaviconAsync(alias.FileName); // Fire & forget favicon retrieving _log.Trace($"Retrieved favicon for alias '{alias.Name}'. Favicon '{alias.FileName}'"); } } diff --git a/src/Lanceur.Infra/Managers/ThumbnailFixer.cs b/src/Lanceur.Infra/Managers/FavIconManager.cs similarity index 90% rename from src/Lanceur.Infra/Managers/ThumbnailFixer.cs rename to src/Lanceur.Infra/Managers/FavIconManager.cs index ce3b05d2..cbaf9ee1 100644 --- a/src/Lanceur.Infra/Managers/ThumbnailFixer.cs +++ b/src/Lanceur.Infra/Managers/FavIconManager.cs @@ -7,7 +7,7 @@ namespace Lanceur.Infra.Managers { - public class ThumbnailFixer : IThumbnailFixer + public class FavIconManager : IFavIconManager { #region Fields @@ -24,14 +24,14 @@ public class ThumbnailFixer : IThumbnailFixer #region Constructors - public ThumbnailFixer(IPackagedAppSearchService searchService, IFavIconDownloader favIconDownloader, IAppLoggerFactory appLoggerFactory) + public FavIconManager(IPackagedAppSearchService searchService, IFavIconDownloader favIconDownloader, IAppLoggerFactory appLoggerFactory) { ArgumentNullException.ThrowIfNull(searchService); ArgumentNullException.ThrowIfNull(favIconDownloader); ArgumentNullException.ThrowIfNull(appLoggerFactory); _favIconDownloader = favIconDownloader; - _log = appLoggerFactory.GetLogger(); + _log = appLoggerFactory.GetLogger(); } #endregion Constructors diff --git a/src/Lanceur/Bootstrapper.cs b/src/Lanceur/Bootstrapper.cs index cfcd9761..db273c1c 100644 --- a/src/Lanceur/Bootstrapper.cs +++ b/src/Lanceur/Bootstrapper.cs @@ -106,11 +106,11 @@ private static void RegisterServices() l.Register(() => new WindowsClipboardService()); l.RegisterLazySingleton(() => new MacroManager(Assembly.GetExecutingAssembly())); l.Register(() => new PluginManager(Get())); - l.Register(() => new ThumbnailManager(Get(), Get(), Get(), Get())); + l.Register(() => new ThumbnailManager(Get(), Get(), Get(), Get())); l.Register(() => new PackagedAppManager()); l.Register(() => new PackagedAppSearchService()); l.Register(()=> new FavIconDownloader()); - l.Register(() => new ThumbnailFixer(Get(), Get(), Get())); + l.Register(() => new FavIconManager(Get(), Get(), Get())); // Formatters l.Register(() => new DefaultStringFormatter()); diff --git a/src/Tests/Lanceur.Tests/Utils/Builders/KeywordsViewModelBuilder.cs b/src/Tests/Lanceur.Tests/Utils/Builders/KeywordsViewModelBuilder.cs index 328792be..fa18c286 100644 --- a/src/Tests/Lanceur.Tests/Utils/Builders/KeywordsViewModelBuilder.cs +++ b/src/Tests/Lanceur.Tests/Utils/Builders/KeywordsViewModelBuilder.cs @@ -17,7 +17,7 @@ internal class KeywordsViewModelBuilder private IDbRepository _dbRepository; private IAppLoggerFactory _loggerFactory; - private IThumbnailFixer _thumbnailFixer; + private IFavIconManager _favIconManager; private TestSchedulerProvider _schedulerProvider; #endregion Fields @@ -36,9 +36,9 @@ public KeywordsViewModel Build() ); } - public KeywordsViewModelBuilder With(IThumbnailFixer thumbnailFixer) + public KeywordsViewModelBuilder With(IFavIconManager favIconManager) { - _thumbnailFixer = thumbnailFixer; + _favIconManager = favIconManager; return this; } diff --git a/src/Tests/Lanceur.Tests/ViewModels/KeywordViewModelShould.cs b/src/Tests/Lanceur.Tests/ViewModels/KeywordViewModelShould.cs index fe49d360..3a861cc6 100644 --- a/src/Tests/Lanceur.Tests/ViewModels/KeywordViewModelShould.cs +++ b/src/Tests/Lanceur.Tests/ViewModels/KeywordViewModelShould.cs @@ -48,7 +48,7 @@ public void AbleToAddMultipleTimesAlias() dbRepository.CheckNamesExist(Arg.Any()) .Returns(new ExistingNameResponse(Array.Empty())); - var packageValidator = Substitute.For(); + var packageValidator = Substitute.For(); var vm = new KeywordsViewModelBuilder() .With(scheduler) @@ -100,7 +100,7 @@ public void AbleToRemoveSynonym() var conversionService = new AutoMapperConverter(new Mapper(cfg)); var dbRepository = new SQLiteRepository(connectionMgr, logger, conversionService); - var packageValidator = Substitute.For(); + var packageValidator = Substitute.For(); var vm = new KeywordsViewModelBuilder() .With(scheduler) .With(logger)