Removed log4net and hardcoded list of extensions

EricStG · Dec 21, 2020 · 6f0cae8 · 6f0cae8
1 parent 1339e22
commit 6f0cae8
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 110 deletions.
diff --git a/Listatateur/Crawler/Crawler.cs b/Listatateur/Crawler/Crawler.cs
@@ -1,4 +1,4 @@
-using log4net;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -7,17 +7,24 @@ namespace Crawler
 {
     public class Crawler
     {
-        private static ILog logger = LogManager.GetLogger(typeof(Crawler));
+        public Crawler(ILogger<Crawler> logger)
+        {
+            _logger = logger;
+        }
+
+        private readonly ILogger<Crawler> _logger;
+
+        private static readonly HashSet<string> _extensions = new HashSet<string>(new[] { ".mp3", ".aac", ".ogg" }, StringComparer.OrdinalIgnoreCase); // TODO: make this configurable?
 
-        private static MediaFile ProcessFile(string filename)
+        private MediaFile ProcessFile(string filename)
         {
             try
             {
-                if (Properties.Settings.Default.Extensions.Contains(Path.GetExtension(filename)))
+                if (_extensions.Contains(Path.GetExtension(filename)))
                 {
                     using (var file = TagLib.File.Create(filename, TagLib.ReadStyle.Average))
                     {
-                        return new MediaFile()
+                        return new MediaFile
                         {
                             Filename = filename,
                             Title = file.Tag.Title,
@@ -34,18 +41,18 @@ private static MediaFile ProcessFile(string filename)
                 }
                 else
                 {
-                    logger.DebugFormat("File '{0}' does not match any of the configured extensions. Skipping.", filename);
+                    _logger.LogDebug("File '{Filename}' does not match any of the configured extensions. Skipping.", filename);
                     return null;
                 }
             }
             catch (Exception ex)
             {
-                logger.WarnFormat("Could not read tag for file '{0}': {1}", filename, ex);
+                _logger.LogWarning(ex, "Could not read tag for file '{Filename}'", filename);
                 return null;
             }
         }
 
-        private static IEnumerable<MediaFile> ProcessFolder(string folder, bool recursive)
+        private IEnumerable<MediaFile> ProcessFolder(string folder, bool recursive)
         {
             SearchOption options;
             if (recursive)
@@ -66,7 +73,7 @@ private static IEnumerable<MediaFile> ProcessFolder(string folder, bool recursiv
             }
         }
 
-        public static IEnumerable<MediaFile> ProcessPaths(IEnumerable<string> paths, bool recursive)
+        public IEnumerable<MediaFile> ProcessPaths(IEnumerable<string> paths, bool recursive)
         {            
             foreach(var path in paths)
             {

diff --git a/Listatateur/Crawler/Crawler.csproj b/Listatateur/Crawler/Crawler.csproj
@@ -5,23 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="taglib-sharp-netstandard2.0" Version="2.1.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Settings.Designer.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
 </Project>
diff --git a/Listatateur/Crawler/Settings.Designer.cs b/Listatateur/Crawler/Settings.Designer.cs
diff --git a/Listatateur/Crawler/Settings.settings b/Listatateur/Crawler/Settings.settings
diff --git a/Listatateur/Crawler/app.config b/Listatateur/Crawler/app.config
diff --git a/Listatateur/Listatateur-Console/Listatateur-Console.csproj b/Listatateur/Listatateur-Console/Listatateur-Console.csproj
@@ -3,8 +3,17 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <OutputType>Exe</OutputType>
+    <PublishSingleFile>true</PublishSingleFile>
+    <SelfContained>true</SelfContained>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <PublishTrimmed>true</PublishTrimmed>
+    <PublishReadyToRun>true</PublishReadyToRun>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Crawler\Crawler.csproj" />
   </ItemGroup>

diff --git a/Listatateur/Listatateur-Console/Program.cs b/Listatateur/Listatateur-Console/Program.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.IO;
 
@@ -10,17 +11,33 @@ class Program
 
         static void Main(string[] args)
         {
+            using var loggerFactory = LoggerFactory.Create(builder =>
+            {
+                builder
+                    .SetMinimumLevel(LogLevel.Trace)
+                    .AddConsole();
+
+            });
+
+            var files = CrawlFiles(args, loggerFactory);
+            ExportFiles(files);
+        }
+
+        private static IEnumerable<Crawler.MediaFile> CrawlFiles(string[] args, ILoggerFactory loggerFactory)
+        {
+            var crawler = new Crawler.Crawler(loggerFactory.CreateLogger<Crawler.Crawler>());
+
             IEnumerable<Crawler.MediaFile> files;
             if (args.Length > 0)
-            { 
-                files = Crawler.Crawler.ProcessPaths(args, true);
+            {
+                files = crawler.ProcessPaths(args, true);
             }
             else
             {
-                files = Crawler.Crawler.ProcessPaths(new string[] { Environment.CurrentDirectory }, true);
+                files = crawler.ProcessPaths(new string[] { Environment.CurrentDirectory }, true);
             }
 
-            ExportFiles(files);
+            return files;
         }
 
         static void ExportFiles(IEnumerable<Crawler.MediaFile> files)