windows/QuickLook
1
0
Fork 0
mirror of https://github.com/QL-Win/QuickLook.git synced 2025-09-27 21:01:36 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactor cover art extraction logic to fix #1759

Browse Source
This commit is contained in:
ema
2025-09-21 00:52:07 +08:00
parent e1c53b8691
commit 297e7ef092
2 changed files with 85 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
QuickLook.Plugin/QuickLook.Plugin.VideoViewer/AudioTrack/CoverDataExtractor.cs Normal file
View File

@@ -0,0 +1,82 @@
using QuickLook.Common.ExtensionMethods;
using QuickLook.Plugin.VideoViewer.Extensions;
using System;
using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Windows.Media.Imaging;
namespace QuickLook.Plugin.VideoViewer.AudioTrack;
internal static class CoverDataExtractor
{
/// <summary>
/// Extracts cover image data from a Base64 string.
/// </summary>
/// <param name="base64strings">A Base64-encoded string (may contain multiple covers separated by " / ").</param>
/// <returns>Byte array of the cover image, or null if extraction fails.</returns>
public static byte[] Extract(string base64strings)
{
try
{
var coverData = base64strings.Trim();
if (!string.IsNullOrEmpty(coverData))
{
// MediaInfo may return multiple covers in one string.
// In that case, only take the first one.
var coverBytes = Convert.FromBase64String
(
coverData.Contains(' ')
? coverData.Split(" / ")[0]
: coverData
);
return coverBytes;
}
}
catch (Exception e)
{
Debug.WriteLine(e);
}
return null;
}
/// <summary>
/// Extracts a <see cref="BitmapSource"/> from cover image bytes.
/// </summary>
/// <param name="coverBytes">Cover image as a byte array.</param>
/// <returns><see cref="BitmapSource"/> if successful; otherwise, null.</returns>
public static BitmapSource Extract(byte[] coverBytes)
{
using var ms = new MemoryStream(coverBytes);
try
{
// First try decoding with WPF's built-in decoder.
var coverArt = BitmapFrame.Create(ms, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
return coverArt;
}
catch
{
// Fallback:
// https://github.com/QL-Win/QuickLook/issues/1759
// Use System.Drawing's Bitmap decoder, which is more forgiving with common JPEG files
// and tends not to throw WINCODEC_ERR_STREAMREAD like WPF often does.
try
{
using var bmp = new Bitmap(ms);
var coverArt = bmp.ToBitmapSource();
return coverArt;
}
catch (Exception e)
{
Debug.WriteLine(e);
}
}
return null;
}
}

23
QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ViewerPanel.xaml.cs
View File

@@ -22,7 +22,6 @@ using QuickLook.Common.Annotations;
using QuickLook.Common.Helpers;
using QuickLook.Common.Plugin;
using QuickLook.Plugin.VideoViewer.AudioTrack;
using QuickLook.Plugin.VideoViewer.Extensions;
using QuickLook.Plugin.VideoViewer.LyricTrack;
using System;
using System.ComponentModel;
@@ -286,25 +285,9 @@ public partial class ViewerPanel : UserControl, IDisposable, INotifyPropertyChan
metaAlbum.Text = album;
// Extract cover art
try
{
var coverData = info.Get(StreamKind.General, 0, "Cover_Data").Trim();
if (!string.IsNullOrEmpty(coverData))
{
var coverBytes = Convert.FromBase64String
(
coverData.Contains(' ') // MediaInfo may will return multiple covers
? coverData.Split(" / ")[0] // Get the first cover only
: coverData
);
using var ms = new MemoryStream(coverBytes);
CoverArt = BitmapFrame.Create(ms, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
}
}
catch (Exception e)
{
Debug.WriteLine(e);
}
var coverData = info.Get(StreamKind.General, 0, "Cover_Data");
var coverBytes = CoverDataExtractor.Extract(coverData);
CoverArt = CoverDataExtractor.Extract(coverBytes);
}
catch (Exception e)
{