aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[GUI] Enhance tag handling in BlurayInfoViewModel and DecodeMediaTagsViewModel

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-27 09:38:05 +00:00
parent da1768d153
commit ad7b3c5483
2 changed files with 138 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs
View File

@@ -31,7 +31,6 @@
// ****************************************************************************/ // ****************************************************************************/
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Input; using System.Windows.Input;
@@ -119,7 +118,17 @@ public sealed class BlurayInfoViewModel
BlurayDdsText = DDS.Prettify(blurayDds); BlurayDdsText = DDS.Prettify(blurayDds);
} }
if(blurayCartridgeStatus != null) BlurayCartridgeStatusText = Cartridge.Prettify(blurayCartridgeStatus); if(blurayCartridgeStatus != null)
{
if(blurayCartridgeStatus.Length == 4)
{
var tmp = new byte[8];
Array.Copy(blurayCartridgeStatus, 0, tmp, 4, 4);
blurayCartridgeStatus = tmp;
}
BlurayCartridgeStatusText = Cartridge.Prettify(blurayCartridgeStatus);
}
if(bluraySpareAreaInformation != null) if(bluraySpareAreaInformation != null)
{ {

132
Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs
View File

@@ -30,6 +30,7 @@
// Copyright © 2011-2025 Natalia Portillo // Copyright © 2011-2025 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
using System;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Text; using System.Text;
using Aaru.CommonTypes; using Aaru.CommonTypes;
@@ -44,6 +45,7 @@ using Aaru.Decoders.SCSI;
using Aaru.Decoders.SCSI.MMC; using Aaru.Decoders.SCSI.MMC;
using Aaru.Decoders.Xbox; using Aaru.Decoders.Xbox;
using Aaru.Gui.Models; using Aaru.Gui.Models;
using Aaru.Helpers;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using JetBrains.Annotations; using JetBrains.Annotations;
using BCA = Aaru.Decoders.Bluray.BCA; using BCA = Aaru.Decoders.Bluray.BCA;
@@ -109,111 +111,229 @@ public sealed partial class DecodeMediaTagsViewModel : ViewModelBase
return; return;
} }
uint dataLen;
switch(value.Tag) switch(value.Tag)
{ {
case MediaTagType.CD_TOC: case MediaTagType.CD_TOC:
dataLen = Swapping.Swap(BitConverter.ToUInt16(value.Data, 0));
if(dataLen + 2 != value.Data.Length)
{
var tmp = new byte[value.Data.Length + 2];
Array.Copy(value.Data, 0, tmp, 2, value.Data.Length);
tmp[0] = (byte)((value.Data.Length & 0xFF00) >> 8);
tmp[1] = (byte)(value.Data.Length & 0xFF);
value.Data = tmp;
}
DecodedText = TOC.Prettify(value.Data); DecodedText = TOC.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.CD_SessionInfo: case MediaTagType.CD_SessionInfo:
DecodedText = Session.Prettify(value.Data); DecodedText = Session.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.CD_FullTOC: case MediaTagType.CD_FullTOC:
dataLen = Swapping.Swap(BitConverter.ToUInt16(value.Data, 0));
if(dataLen + 2 != value.Data.Length)
{
var tmp = new byte[value.Data.Length + 2];
Array.Copy(value.Data, 0, tmp, 2, value.Data.Length);
tmp[0] = (byte)((value.Data.Length & 0xFF00) >> 8);
tmp[1] = (byte)(value.Data.Length & 0xFF);
value.Data = tmp;
}
DecodedText = FullTOC.Prettify(value.Data); DecodedText = FullTOC.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.CD_PMA: case MediaTagType.CD_PMA:
dataLen = Swapping.Swap(BitConverter.ToUInt16(value.Data, 0));
if(dataLen + 2 != value.Data.Length)
{
var tmp = new byte[value.Data.Length + 2];
Array.Copy(value.Data, 0, tmp, 2, value.Data.Length);
tmp[0] = (byte)((value.Data.Length & 0xFF00) >> 8);
tmp[1] = (byte)(value.Data.Length & 0xFF);
value.Data = tmp;
}
DecodedText = PMA.Prettify(value.Data); DecodedText = PMA.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.CD_ATIP: case MediaTagType.CD_ATIP:
dataLen = Swapping.Swap(BitConverter.ToUInt32(value.Data, 0));
if(dataLen + 4 != value.Data.Length)
{
var tmp = new byte[value.Data.Length + 4];
Array.Copy(value.Data, 0, tmp, 4, value.Data.Length);
tmp[0] = (byte)((value.Data.Length & 0xFF000000) >> 24);
tmp[1] = (byte)((value.Data.Length & 0xFF0000) >> 16);
tmp[2] = (byte)((value.Data.Length & 0xFF00) >> 8);
tmp[3] = (byte)(value.Data.Length & 0xFF);
value.Data = tmp;
}
DecodedText = ATIP.Prettify(value.Data); DecodedText = ATIP.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.CD_TEXT: case MediaTagType.CD_TEXT:
dataLen = Swapping.Swap(BitConverter.ToUInt32(value.Data, 0));
if(dataLen + 4 != value.Data.Length)
{
var tmp = new byte[value.Data.Length + 4];
Array.Copy(value.Data, 0, tmp, 4, value.Data.Length);
tmp[0] = (byte)((value.Data.Length & 0xFF000000) >> 24);
tmp[1] = (byte)((value.Data.Length & 0xFF0000) >> 16);
tmp[2] = (byte)((value.Data.Length & 0xFF00) >> 8);
tmp[3] = (byte)(value.Data.Length & 0xFF);
value.Data = tmp;
}
DecodedText = CDTextOnLeadIn.Prettify(value.Data); DecodedText = CDTextOnLeadIn.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.CD_MCN: case MediaTagType.CD_MCN:
DecodedText = Encoding.ASCII.GetString(value.Data); DecodedText = Encoding.UTF8.GetString(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.DVD_PFI: case MediaTagType.DVD_PFI:
DecodedText = PFI.Prettify(value.Data, _mediaType); DecodedText = PFI.Prettify(value.Data, _mediaType);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.DVD_CMI: case MediaTagType.DVD_CMI:
DecodedText = CSS_CPRM.PrettifyLeadInCopyright(value.Data); DecodedText = CSS_CPRM.PrettifyLeadInCopyright(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.DVDRAM_DDS: case MediaTagType.DVDRAM_DDS:
DecodedText = DDS.Prettify(value.Data); DecodedText = DDS.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.DVDRAM_SpareArea: case MediaTagType.DVDRAM_SpareArea:
DecodedText = Spare.Prettify(value.Data); DecodedText = Spare.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.DVDR_PFI: case MediaTagType.DVDR_PFI:
DecodedText = PFI.Prettify(value.Data, _mediaType); DecodedText = PFI.Prettify(value.Data, _mediaType);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break;
case MediaTagType.HDDVD_MediumStatus:
DecodedText = PFI.Prettify(value.Data, _mediaType);
break; break;
case MediaTagType.BD_DI: case MediaTagType.BD_DI:
if(value.Data.Length == 4096)
{
var tmp = new byte[4100];
Array.Copy(value.Data, 0, tmp, 4, 4096);
value.Data = tmp;
}
DecodedText = DI.Prettify(value.Data); DecodedText = DI.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.BD_BCA: case MediaTagType.BD_BCA:
if(value.Data.Length == 64)
{
var tmp = new byte[68];
Array.Copy(value.Data, 0, tmp, 4, 64);
value.Data = tmp;
}
DecodedText = BCA.Prettify(value.Data); DecodedText = BCA.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.BD_DDS: case MediaTagType.BD_DDS:
if(value.Data.Length == 96)
{
var tmp = new byte[100];
Array.Copy(value.Data, 0, tmp, 4, 96);
value.Data = tmp;
}
DecodedText = Decoders.Bluray.DDS.Prettify(value.Data); DecodedText = Decoders.Bluray.DDS.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.BD_CartridgeStatus: case MediaTagType.BD_CartridgeStatus:
if(value.Data.Length == 4)
{
var tmp = new byte[8];
Array.Copy(value.Data, 0, tmp, 4, 4);
value.Data = tmp;
}
DecodedText = Cartridge.Prettify(value.Data); DecodedText = Cartridge.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.BD_SpareArea: case MediaTagType.BD_SpareArea:
if(value.Data.Length == 12)
{
var tmp = new byte[16];
Array.Copy(value.Data, 0, tmp, 4, 12);
value.Data = tmp;
}
DecodedText = Decoders.Bluray.Spare.Prettify(value.Data); DecodedText = Decoders.Bluray.Spare.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.MMC_WriteProtection: case MediaTagType.MMC_WriteProtection:
DecodedText = WriteProtect.PrettifyWriteProtectionStatus(value.Data); DecodedText = WriteProtect.PrettifyWriteProtectionStatus(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.MMC_DiscInformation: case MediaTagType.MMC_DiscInformation:
DecodedText = DiscInformation.Prettify(value.Data); DecodedText = DiscInformation.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.SCSI_INQUIRY: case MediaTagType.SCSI_INQUIRY:
DecodedText = Inquiry.Prettify(value.Data); DecodedText = Inquiry.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.SCSI_MODEPAGE_2A: case MediaTagType.SCSI_MODEPAGE_2A:
DecodedText = Modes.PrettifyModePage_2A(value.Data); DecodedText = Modes.PrettifyModePage_2A(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.ATA_IDENTIFY: case MediaTagType.ATA_IDENTIFY:
case MediaTagType.ATAPI_IDENTIFY: case MediaTagType.ATAPI_IDENTIFY:
DecodedText = Identify.Prettify(value.Data); DecodedText = Identify.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.Xbox_SecuritySector: case MediaTagType.Xbox_SecuritySector:
DecodedText = SS.Prettify(value.Data); DecodedText = SS.Prettify(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.SCSI_MODESENSE_6: case MediaTagType.SCSI_MODESENSE_6:
DecodedText = Modes.PrettifyModeHeader6(value.Data, PeripheralDeviceTypes.DirectAccess); DecodedText = Modes.PrettifyModeHeader6(value.Data, PeripheralDeviceTypes.DirectAccess);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.SCSI_MODESENSE_10: case MediaTagType.SCSI_MODESENSE_10:
DecodedText = Modes.PrettifyModeHeader10(value.Data, PeripheralDeviceTypes.DirectAccess); DecodedText = Modes.PrettifyModeHeader10(value.Data, PeripheralDeviceTypes.DirectAccess);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
case MediaTagType.Xbox_DMI: case MediaTagType.Xbox_DMI:
@@ -221,6 +341,8 @@ public sealed partial class DecodeMediaTagsViewModel : ViewModelBase
? DMI.PrettifyXbox360(value.Data) ? DMI.PrettifyXbox360(value.Data)
: DMI.PrettifyXbox(value.Data); : DMI.PrettifyXbox(value.Data);
if(string.IsNullOrEmpty(DecodedText)) DecodedVisible = false;
break; break;
default: default:
DecodedVisible = false; DecodedVisible = false;