Improve error messages in Xiami

davidxuang · Dec 13, 2023 · d026083 · d026083
1 parent b9c0f65
commit d026083
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/MusicDecrypto.Library/DecryptoBase.cs b/MusicDecrypto.Library/DecryptoBase.cs
@@ -63,7 +63,7 @@ public async ValueTask<Info> DecryptAsync()
 
     private async ValueTask<Info> GetMetadataAsync(bool firstRun = true)
     {
-        if (_audioType == AudioTypes.Undefined) _audioType = ((ReadOnlySpan<byte>)_buffer.AsSpan()).SniffAudioType();
+        if (_audioType == AudioTypes.Undefined) _audioType = _buffer.AsSpan().SniffAudioType();
         _buffer.Name = "buffer" + _audioType.GetExtension();
         _buffer.ResetPosition();
 

diff --git a/MusicDecrypto.Library/Media/Extensions/MediaExtensions.cs b/MusicDecrypto.Library/Media/Extensions/MediaExtensions.cs
@@ -20,7 +20,7 @@ internal static class MediaExtensions
         _ => throw new InvalidDataException("Undefined music type."),
     };
 
-    internal static AudioTypes SniffAudioType(this ReadOnlySpan<byte> data)
+    internal static AudioTypes SniffAudioType(this Span<byte> data)
     {
         return data switch
         {
@@ -66,7 +66,7 @@ internal static AudioTypes SniffAudioType(this ReadOnlySpan<byte> data)
         _ => throw new InvalidDataException("Undefined image type."),
     };
 
-    internal static ImageTypes SniffImageType(this ReadOnlySpan<byte> data)
+    internal static ImageTypes SniffImageType(this Span<byte> data)
     {
         return data switch
         {

diff --git a/MusicDecrypto.Library/Vendor/NetEase/Decrypto.cs b/MusicDecrypto.Library/Vendor/NetEase/Decrypto.cs
@@ -152,7 +152,7 @@ protected override async ValueTask<bool> ProcessMetadataOverrideAsync(Tag tag)
             }
         }
 
-        var coverType = _coverBuffer is null ? ImageTypes.Undefined : ((ReadOnlySpan<byte>)_coverBuffer.AsSpan()).SniffImageType();
+        var coverType = _coverBuffer is null ? ImageTypes.Undefined : _coverBuffer.AsSpan().SniffImageType();
         if (coverType == ImageTypes.Undefined)
         {
             _coverBuffer = null;

diff --git a/MusicDecrypto.Library/Vendor/Tencent/QmcDecrypto.cs b/MusicDecrypto.Library/Vendor/Tencent/QmcDecrypto.cs
@@ -259,7 +259,7 @@ protected override async ValueTask<bool> ProcessMetadataOverrideAsync(Tag tag)
                     {
                         new Picture(new ByteVector(coverBuffer))
                         {
-                            MimeType = ((ReadOnlySpan<byte>)coverBuffer.AsSpan()).SniffImageType().GetMime(),
+                            MimeType = coverBuffer.AsSpan().SniffImageType().GetMime(),
                             Type = PictureType.FrontCover,
                         }
                     };

diff --git a/MusicDecrypto.Library/Vendor/Xiami/Decrypto.cs b/MusicDecrypto.Library/Vendor/Xiami/Decrypto.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using MusicDecrypto.Library.Media;
+using MusicDecrypto.Library.Media.Extensions;
 
 namespace MusicDecrypto.Library.Vendor.Xiami;
 
@@ -20,7 +21,7 @@ public Decrypto(MarshalMemoryStream buffer, string name, WarnHandler? warn, Audi
         if (!_reader.ReadBytes(8).AsSpan(0, 4).SequenceEqual(_magic) || !_reader.ReadBytes(4).SequenceEqual(_separator))
         {
             throw new InvalidDataException(
-                Path.GetExtension(_oldName).TrimStart('.') == "xm"
+                buffer.AsSpan().SniffAudioType() == AudioTypes.Undefined
                 ? "File header is unexpected."
                 : "File seems unencrypted.");
         }