Skip to content

Commit

Permalink
Fix error on audio with multiple covers
Browse files Browse the repository at this point in the history
  • Loading branch information
emako committed Dec 14, 2024
1 parent 7239ae5 commit 31075e4
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
// Copyright © 2024 ema
//
// This file is part of QuickLook program.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

using System;
using System.Collections.Generic;

#pragma warning disable IDE0130 // Namespace does not match folder structure

namespace QuickLook.Plugin.VideoViewer;

#pragma warning restore IDE0130 // Namespace does not match folder structure

internal static class StringExtension
{
/// <summary>
/// Splits a ReadOnlySpan<char> into an array of strings using the specified separator.
/// </summary>
/// <param name="input">The input ReadOnlySpan<char> to split.</param>
/// <param name="separator">The ReadOnlySpan<char> separator to use for splitting.</param>
/// <returns>An array of strings that are the result of splitting the input span.</returns>
/// <remarks>
/// - If the separator is not found, the entire input span will be returned as a single element.
/// - If the input is empty, the method will return an empty array.
/// - This method avoids allocating intermediate substrings during processing.
/// </remarks>
public static string[] Split(this string input, string separator)
{
if (input == null)
{
return [input];
}

ReadOnlySpan<char> @in = input.AsSpan();
ReadOnlySpan<char> sep = separator.AsSpan();

List<string> result = [];
int start = 0;

// Continue splitting until no separator is found
while (true)
{
// Find the next occurrence of the separator
int index = @in.Slice(start).IndexOf(sep);
if (index == -1)
{
// No more separators; add the remaining substring
result.Add(@in.Slice(start).ToString());
break;
}

// Add the substring before the separator to the result list
result.Add(@in.Slice(start, index).ToString());

// Move the start position past the separator
start += index + sep.Length;
}

return [.. result];
}
}
19 changes: 13 additions & 6 deletions QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ViewerPanel.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,19 @@ private void UpdateMeta(string path, MediaInfo.MediaInfo info)
metaArtists.Text = artist;
metaAlbum.Text = album;

var cs = info.Get(StreamKind.General, 0, "Cover_Data");
if (!string.IsNullOrEmpty(cs))
using (var ms = new MemoryStream(Convert.FromBase64String(cs)))
{
CoverArt = BitmapFrame.Create(ms, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
}
var coverData = info.Get(StreamKind.General, 0, "Cover_Data");
if (!string.IsNullOrEmpty(coverData))
{
var coverBytes = Convert.FromBase64String
(
coverData.Length % 4 == 0 // MediaInfo may will return multiple covers
? coverData
: coverData.Split(" / ")[0] // Get the first cover only
);
using var ms = new MemoryStream(coverBytes);

CoverArt = BitmapFrame.Create(ms, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
}
}
catch (Exception)
{
Expand Down
3 changes: 3 additions & 0 deletions QuickLook/QuickLook.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@
<PackageReference Include="Lib.Harmony" Version="2.2.2">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 31075e4

Please sign in to comment.