Simplify imports and reformat

jwueller · Jan 5, 2024 · ae13b7d · ae13b7d
1 parent 051f03b
commit ae13b7d
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 27 deletions.
diff --git a/JWueller.Jellyfin.OnePace.Tests/ProviderIdsExtensionsTests.cs b/JWueller.Jellyfin.OnePace.Tests/ProviderIdsExtensionsTests.cs
@@ -22,7 +22,10 @@ public void ShouldExtractOnePaceId(string providerId)
     {
         var itemLookupInfo = new ItemLookupInfo
         {
-            ProviderIds = { [Plugin.ProviderName] = providerId }
+            ProviderIds =
+            {
+                [Plugin.ProviderName] = providerId
+            }
         };
 
         Assert.Equal(providerId, itemLookupInfo.GetOnePaceId());
@@ -35,7 +38,10 @@ public void ShouldDiscardLegacyOnePaceId(string providerId)
     {
         var itemLookupInfo = new ItemLookupInfo
         {
-            ProviderIds = { [Plugin.ProviderName] = providerId }
+            ProviderIds =
+            {
+                [Plugin.ProviderName] = providerId
+            }
         };
 
         Assert.Null(itemLookupInfo.GetOnePaceId());

diff --git a/JWueller.Jellyfin.OnePace/ArcIdentifier.cs b/JWueller.Jellyfin.OnePace/ArcIdentifier.cs
@@ -1,4 +1,4 @@
-using System;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -11,7 +11,7 @@ namespace JWueller.Jellyfin.OnePace;
 
 internal static class ArcIdentifier
 {
-    public static async Task<Model.IArc?> IdentifyAsync(
+    public static async Task<IArc?> IdentifyAsync(
         IRepository repository,
         ItemLookupInfo itemLookupInfo,
         CancellationToken cancellationToken)
@@ -40,7 +40,8 @@ internal static class ArcIdentifier
             // match against chapter ranges
             foreach (var arc in arcs.OrderByDescending(arc => arc.MangaChapters?.Length ?? 0))
             {
-                if (!string.IsNullOrEmpty(arc.MangaChapters) && IdentifierUtil.BuildTextRegex(arc.MangaChapters).IsMatch(directoryName))
+                if (!string.IsNullOrEmpty(arc.MangaChapters) &&
+                    IdentifierUtil.BuildTextRegex(arc.MangaChapters).IsMatch(directoryName))
                 {
                     return arc;
                 }
@@ -49,7 +50,8 @@ internal static class ArcIdentifier
             // match against invariant titles
             foreach (var arc in arcs.OrderByDescending(arc => arc.InvariantTitle.Length))
             {
-                if (!string.IsNullOrEmpty(arc.InvariantTitle) && IdentifierUtil.BuildTextRegex(arc.InvariantTitle).IsMatch(directoryName))
+                if (!string.IsNullOrEmpty(arc.InvariantTitle) &&
+                    IdentifierUtil.BuildTextRegex(arc.InvariantTitle).IsMatch(directoryName))
                 {
                     return arc;
                 }
@@ -58,11 +60,7 @@ internal static class ArcIdentifier
             // match against arc ranks
             foreach (var arc in arcs)
             {
-                var pattern =
-                    @"\b0*" +
-                    Regex.Escape(arc.Rank.ToString(System.Globalization.CultureInfo.InvariantCulture)) +
-                    @"\b";
-
+                var pattern = @"\b0*" + Regex.Escape(arc.Rank.ToString(CultureInfo.InvariantCulture)) + @"\b";
                 if (Regex.IsMatch(directoryName, pattern, RegexOptions.IgnoreCase))
                 {
                     return arc;

diff --git a/JWueller.Jellyfin.OnePace/ArcImageProvider.cs b/JWueller.Jellyfin.OnePace/ArcImageProvider.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net.Http;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
@@ -81,8 +82,8 @@ public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, Cancell
         _log.LogInformation(
             "Found {Count} arc image(s) for {Item} --> {Result}",
             result.Count,
-            System.Text.Json.JsonSerializer.Serialize(item),
-            System.Text.Json.JsonSerializer.Serialize(result));
+            JsonSerializer.Serialize(item),
+            JsonSerializer.Serialize(result));
 
         return result;
     }

diff --git a/JWueller.Jellyfin.OnePace/ArcProvider.cs b/JWueller.Jellyfin.OnePace/ArcProvider.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Http;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
@@ -73,8 +74,8 @@ public async Task<MetadataResult<Season>> GetMetadata(SeasonInfo info, Cancellat
 
         _log.LogInformation(
             "Identified Arc {Info} --> {Match}",
-            System.Text.Json.JsonSerializer.Serialize(info),
-            System.Text.Json.JsonSerializer.Serialize(arcMatch));
+            JsonSerializer.Serialize(info),
+            JsonSerializer.Serialize(arcMatch));
 
         return result;
     }

diff --git a/JWueller.Jellyfin.OnePace/EpisodeIdentifier.cs b/JWueller.Jellyfin.OnePace/EpisodeIdentifier.cs
@@ -53,7 +53,8 @@ internal static class EpisodeIdentifier
             // match against chapter ranges
             foreach (var episode in episodes.OrderByDescending(episode => episode.MangaChapters?.Length ?? 0))
             {
-                if (!string.IsNullOrEmpty(episode.MangaChapters) && IdentifierUtil.BuildTextRegex(episode.MangaChapters).IsMatch(fileName))
+                if (!string.IsNullOrEmpty(episode.MangaChapters) &&
+                    IdentifierUtil.BuildTextRegex(episode.MangaChapters).IsMatch(fileName))
                 {
                     return episode;
                 }
@@ -62,7 +63,8 @@ internal static class EpisodeIdentifier
             // match against invariant titles
             foreach (var episode in episodes.OrderByDescending(episode => episode.InvariantTitle.Length))
             {
-                if (!string.IsNullOrEmpty(episode.InvariantTitle) && IdentifierUtil.BuildTextRegex(episode.InvariantTitle).IsMatch(fileName))
+                if (!string.IsNullOrEmpty(episode.InvariantTitle) &&
+                    IdentifierUtil.BuildTextRegex(episode.InvariantTitle).IsMatch(fileName))
                 {
                     return episode;
                 }

diff --git a/JWueller.Jellyfin.OnePace/EpisodeImageProvider.cs b/JWueller.Jellyfin.OnePace/EpisodeImageProvider.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net.Http;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
@@ -81,8 +82,8 @@ public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, Cancell
         _log.LogInformation(
             "Found {Count} episode image(s) for {Item} --> {Result}",
             result.Count,
-            System.Text.Json.JsonSerializer.Serialize(item),
-            System.Text.Json.JsonSerializer.Serialize(result));
+            JsonSerializer.Serialize(item),
+            JsonSerializer.Serialize(result));
 
         return result;
     }

diff --git a/JWueller.Jellyfin.OnePace/EpisodeProvider.cs b/JWueller.Jellyfin.OnePace/EpisodeProvider.cs
@@ -49,7 +49,8 @@ public async Task<MetadataResult<Episode>> GetMetadata(EpisodeInfo info, Cancell
     {
         var result = new MetadataResult<Episode>();
 
-        var episodeMatch = await EpisodeIdentifier.IdentifyAsync(_repository, info, cancellationToken).ConfigureAwait(false);
+        var episodeMatch = await EpisodeIdentifier.IdentifyAsync(_repository, info, cancellationToken)
+            .ConfigureAwait(false);
         if (episodeMatch != null)
         {
             var arc = await _repository.FindArcByIdAsync(episodeMatch.ArcId, cancellationToken).ConfigureAwait(false);

diff --git a/JWueller.Jellyfin.OnePace/Model/IArc.cs b/JWueller.Jellyfin.OnePace/Model/IArc.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace JWueller.Jellyfin.OnePace.Model;
 
 /// <summary>
@@ -28,5 +30,5 @@ public interface IArc
     /// <summary>
     /// Gets the release date of the arc. Null if release date is unknown or the arc is unreleased.
     /// </summary>
-    System.DateTime? ReleaseDate { get; }
+    DateTime? ReleaseDate { get; }
 }
diff --git a/JWueller.Jellyfin.OnePace/SeriesIdentifier.cs b/JWueller.Jellyfin.OnePace/SeriesIdentifier.cs
@@ -1,12 +1,13 @@
 using System.Threading;
 using System.Threading.Tasks;
+using JWueller.Jellyfin.OnePace.Model;
 using MediaBrowser.Controller.Providers;
 
 namespace JWueller.Jellyfin.OnePace;
 
 internal static class SeriesIdentifier
 {
-    public static async Task<Model.ISeries?> IdentifyAsync(
+    public static async Task<ISeries?> IdentifyAsync(
         IRepository repository,
         ItemLookupInfo itemLookupInfo,
         CancellationToken cancellationToken)

diff --git a/JWueller.Jellyfin.OnePace/SeriesImageProvider.cs b/JWueller.Jellyfin.OnePace/SeriesImageProvider.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net.Http;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
@@ -87,8 +88,8 @@ public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, Cancell
         _log.LogInformation(
             "Found {Count} series image(s) for {Item} --> {Result}",
             result.Count,
-            System.Text.Json.JsonSerializer.Serialize(item),
-            System.Text.Json.JsonSerializer.Serialize(result));
+            JsonSerializer.Serialize(item),
+            JsonSerializer.Serialize(result));
 
         return result;
     }

diff --git a/JWueller.Jellyfin.OnePace/SeriesProvider.cs b/JWueller.Jellyfin.OnePace/SeriesProvider.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Http;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
@@ -46,7 +47,8 @@ public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo info, Cancellat
     {
         var result = new MetadataResult<Series>();
 
-        var seriesMatch = await SeriesIdentifier.IdentifyAsync(_repository, info, cancellationToken).ConfigureAwait(false);
+        var seriesMatch = await SeriesIdentifier.IdentifyAsync(_repository, info, cancellationToken)
+            .ConfigureAwait(false);
         if (seriesMatch != null)
         {
             result.HasMetadata = true;
@@ -74,8 +76,8 @@ public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo info, Cancellat
 
         _log.LogInformation(
             "Identified Series {Info} --> {Match}",
-            System.Text.Json.JsonSerializer.Serialize(info),
-            System.Text.Json.JsonSerializer.Serialize(seriesMatch));
+            JsonSerializer.Serialize(info),
+            JsonSerializer.Serialize(seriesMatch));
 
         return result;
     }