Merge pull request #17423 from Shadowghost/fix-comicinfo

Skip ComicInfo parsing if none exists

3 files changed, 7 insertions, 8 deletions

diff --git a/MediaBrowser.Providers/Books/ComicBookInfo/ComicBookInfoProvider.cs b/MediaBrowser.Providers/Books/ComicBookInfo/ComicBookInfoProvider.cs
index 787d2ad878..2bd2676ceb 100644
--- a/MediaBrowser.Providers/Books/ComicBookInfo/ComicBookInfoProvider.cs
+++ b/MediaBrowser.Providers/Books/ComicBookInfo/ComicBookInfoProvider.cs
@@ -42,7 +42,7 @@ public class ComicBookInfoProvider : IComicProvider
 
         if (path is null)
         {
-            _logger.LogError("could not load comic: {Path}", info.Path);
+            _logger.LogDebug("could not load comic: {Path}", info.Path);
             return new MetadataResult<Book> { HasMetadata = false };
         }
 
diff --git a/MediaBrowser.Providers/Books/ComicInfo/ExternalComicInfoProvider.cs b/MediaBrowser.Providers/Books/ComicInfo/ExternalComicInfoProvider.cs
index 02cc02b7f3..cfd22a850e 100644
--- a/MediaBrowser.Providers/Books/ComicInfo/ExternalComicInfoProvider.cs
+++ b/MediaBrowser.Providers/Books/ComicInfo/ExternalComicInfoProvider.cs
@@ -38,7 +38,7 @@ public class ExternalComicInfoProvider : IComicProvider
 
         if (comicInfoXml is null)
         {
-            _logger.LogInformation("Could not load ComicInfo metadata for {Path} from XML file.", info.Path);
+            _logger.LogDebug("No external ComicInfo metadata found for {Path}.", info.Path);
             return new MetadataResult<Book> { HasMetadata = false };
         }
 
@@ -67,23 +67,22 @@ public class ExternalComicInfoProvider : IComicProvider
 
     private async Task<XDocument?> LoadXml(ItemInfo info, CancellationToken cancellationToken)
     {
-        var path = GetXmlFilePath(info.Path).FullName;
-
-        if (path is null)
+        var file = GetXmlFilePath(info.Path);
+        if (!file.Exists)
         {
             return null;
         }
 
         try
         {
-            using var reader = XmlReader.Create(path, new XmlReaderSettings { Async = true });
+            using var reader = XmlReader.Create(file.FullName, new XmlReaderSettings { Async = true });
             var comicInfoXml = XDocument.LoadAsync(reader, LoadOptions.None, cancellationToken);
 
             return await comicInfoXml.ConfigureAwait(false);
         }
         catch (Exception e)
         {
-            _logger.LogInformation(e, "Could not load external XML from {Path}. This could mean there is no separate ComicInfo metadata file for this comic or the metadata is bundled within the comic.", path);
+            _logger.LogWarning(e, "Could not load external ComicInfo XML from {Path}.", file.FullName);
             return null;
         }
     }
diff --git a/MediaBrowser.Providers/Books/ComicInfo/InternalComicInfoProvider.cs b/MediaBrowser.Providers/Books/ComicInfo/InternalComicInfoProvider.cs
index 98a6aba7d6..19062452b9 100644
--- a/MediaBrowser.Providers/Books/ComicInfo/InternalComicInfoProvider.cs
+++ b/MediaBrowser.Providers/Books/ComicInfo/InternalComicInfoProvider.cs
@@ -36,7 +36,7 @@ public class InternalComicInfoProvider : IComicProvider
 
         if (comicInfoXml is null)
         {
-            _logger.LogInformation("Could not load ComicInfo metadata for {Path} from XML file. No internal XML in comic archive.", info.Path);
+            _logger.LogDebug("Could not load ComicInfo metadata for {Path} from XML file. No internal XML in comic archive.", info.Path);
             return new MetadataResult<Book> { HasMetadata = false };
         }