Skip to content

Commit

Permalink
Merge Aaru.Dto into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
@claunia
claunia committed Dec 19, 2023
2 parents 6d8b84d + ccfbac0 commit aa554f5
Show file tree
Hide file tree
Showing 9 changed files with 2,512 additions and 0 deletions.
1,342 changes: 1,342 additions & 0 deletions Aaru.Dto/.editorconfig
View file

Large diffs are not rendered by default.

595 changes: 595 additions & 0 deletions Aaru.Dto/.gitignore
View file

Large diffs are not rendered by default.

55 changes: 55 additions & 0 deletions Aaru.Dto/Aaru.Dto.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Aaru.Dto</RootNamespace>
<AssemblyName>Aaru.Dto</AssemblyName>
<ReleaseVersion>$(Version)</ReleaseVersion>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>6.0.0-alpha9</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2023 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Dto</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12</LangVersion>
<Description>Data transfer objects used to interchange data between Aaru and Aaru.Server.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<RepositoryUrl>https://github.com/aaru-dps/Aaru</RepositoryUrl>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<NeutralLanguage>en-US</NeutralLanguage>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<NoWarn>CS1591;CS1574</NoWarn>
</PropertyGroup>
<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
<InternalsVisibleTo Include="Aaru.Tests"/>
<InternalsVisibleTo Include="Aaru.Tests.Devices"/>
</ItemGroup>
<PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
<NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
<NrtShowRevision>true</NrtShowRevision>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="..\LICENSE.LGPL">
<Link>LICENSE.LGPL</Link>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj"/>
</ItemGroup>
</Project>
61 changes: 61 additions & 0 deletions Aaru.Dto/CdOffsetDto.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// /***************************************************************************
// Aaru Data Preservation Suite
// ----------------------------------------------------------------------------
//
// Filename : CdOffsetDto.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// Component : DTOs.
//
// --[ Description ] ----------------------------------------------------------
//
// DTO for syncing Compact Disc read offsets.
//
// --[ License ] --------------------------------------------------------------
//
// This library is free software; you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as
// published by the Free Software Foundation; either version 2.1 of the
// License, or (at your option) any later version.
//
// This library 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
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/

using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.Metadata;

namespace Aaru.Dto;

/// <inheritdoc />
/// <summary>DTO from a CD drive read offset</summary>
[SuppressMessage("ReSharper", "UnusedMember.Global")]
public class CdOffsetDto : CdOffset
{
/// <summary>Build an empty DTO</summary>
public CdOffsetDto() {}

/// <summary>Build a DTO using the specified offset and database ID</summary>
/// <param name="offset">CD reading offset</param>
/// <param name="id">Database ID</param>
public CdOffsetDto(CdOffset offset, int id)
{
Manufacturer = offset.Manufacturer;
Model = offset.Model;
Offset = offset.Offset;
Submissions = offset.Submissions;
Agreement = offset.Agreement;
Id = id;
}

/// <summary>Database ID</summary>
public int Id { get; set; }
}
265 changes: 265 additions & 0 deletions Aaru.Dto/DeviceDto.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,265 @@
// /***************************************************************************
// Aaru Data Preservation Suite
// ----------------------------------------------------------------------------
//
// Filename : DeviceDto.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// Component : Aaru Server.
//
// --[ Description ] ----------------------------------------------------------
//
// DTO for syncing processed device reports in database.
//
// --[ License ] --------------------------------------------------------------
//
// This library is free software; you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as
// published by the Free Software Foundation; either version 2.1 of the
// License, or (at your option) any later version.
//
// This library 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
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/

// ReSharper disable VirtualMemberCallInConstructor

using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.Metadata;

namespace Aaru.Dto;

/// <summary>DTO for known device</summary>
[SuppressMessage("ReSharper", "UnusedMember.Global")]
public class DeviceDto : DeviceReport
{
/// <summary>Build an empty DTO</summary>
public DeviceDto() {}

/// <summary>Build a DTO from a device report</summary>
/// <param name="report">Device report</param>
public DeviceDto(DeviceReport report)
{
ATA = report.ATA;
ATAPI = report.ATAPI;
CompactFlash = report.CompactFlash;
FireWire = report.FireWire;
MultiMediaCard = report.MultiMediaCard;
PCMCIA = report.PCMCIA;
SCSI = report.SCSI;
SecureDigital = report.SecureDigital;
USB = report.USB;
Manufacturer = report.Manufacturer;
Model = report.Model;
Revision = report.Revision;
Type = report.Type;
GdRomSwapDiscCapabilities = report.GdRomSwapDiscCapabilities;
}

/// <summary>Build a DTO from a device report with the specified parameters</summary>
/// <param name="report">Device report</param>
/// <param name="id">Database ID</param>
/// <param name="optimalMultipleSectorsRead">Optimal number of blocks for read</param>
/// <param name="canReadGdRomUsingSwapDisc">Can read GD-ROM using swap trick?</param>
public DeviceDto(DeviceReport report, int id, int optimalMultipleSectorsRead, bool? canReadGdRomUsingSwapDisc)
{
ATA = report.ATA;
ATAPI = report.ATAPI;
CompactFlash = report.CompactFlash;
FireWire = report.FireWire;
MultiMediaCard = report.MultiMediaCard;
PCMCIA = report.PCMCIA;
SCSI = report.SCSI;
SecureDigital = report.SecureDigital;
USB = report.USB;
Manufacturer = report.Manufacturer;
Model = report.Model;
Revision = report.Revision;
Type = report.Type;
GdRomSwapDiscCapabilities = report.GdRomSwapDiscCapabilities;

if(ATA != null)
{
ATA.Identify = null;
ATA.ReadCapabilities = ClearBinaries(ATA.ReadCapabilities);

if(ATA.RemovableMedias != null)
{
TestedMedia[] medias = ATA.RemovableMedias.ToArray();
ATA.RemovableMedias = new List<TestedMedia>();

foreach(TestedMedia media in medias)
ATA.RemovableMedias.Add(ClearBinaries(media));
}
}

if(ATAPI != null)
{
ATAPI.Identify = null;
ATAPI.ReadCapabilities = ClearBinaries(ATAPI.ReadCapabilities);

if(ATAPI.RemovableMedias != null)
{
TestedMedia[] medias = ATAPI.RemovableMedias.ToArray();
ATAPI.RemovableMedias = new List<TestedMedia>();

foreach(TestedMedia media in medias)
ATAPI.RemovableMedias.Add(ClearBinaries(media));
}
}

if(PCMCIA != null)
{
PCMCIA.AdditionalInformation = null;
PCMCIA.CIS = null;
}

MultiMediaCard = null;
SecureDigital = null;

if(SCSI != null)
{
SCSI.EVPDPages = null;
SCSI.InquiryData = null;
SCSI.ModeSense6Data = null;
SCSI.ModeSense10Data = null;
SCSI.ModeSense6CurrentData = null;
SCSI.ModeSense10CurrentData = null;
SCSI.ModeSense6ChangeableData = null;
SCSI.ModeSense10ChangeableData = null;
SCSI.ReadCapabilities = ClearBinaries(SCSI.ReadCapabilities);

if(SCSI.ModeSense != null)
{
SCSI.ModeSense.BlockDescriptors = null;
SCSI.ModeSense.ModePages = null;
}

if(SCSI.RemovableMedias != null)
{
TestedMedia[] medias = SCSI.RemovableMedias.ToArray();
SCSI.RemovableMedias = new List<TestedMedia>();

foreach(TestedMedia media in medias)
SCSI.RemovableMedias.Add(ClearBinaries(media));
}

if(SCSI.MultiMediaDevice != null)
{
SCSI.MultiMediaDevice.ModeSense2AData = null;

if(SCSI.MultiMediaDevice.Features != null)
SCSI.MultiMediaDevice.Features.BinaryData = null;

if(SCSI.MultiMediaDevice.TestedMedia != null)
{
TestedMedia[] medias = SCSI.MultiMediaDevice.TestedMedia.ToArray();
SCSI.MultiMediaDevice.TestedMedia = new List<TestedMedia>();

foreach(TestedMedia media in medias)
SCSI.MultiMediaDevice.TestedMedia.Add(ClearBinaries(media));
}
}

SCSI.SequentialDevice = null;
}

if(USB != null)
USB.Descriptors = null;

Id = id;
OptimalMultipleSectorsRead = optimalMultipleSectorsRead;
CanReadGdRomUsingSwapDisc = canReadGdRomUsingSwapDisc;
}

/// <summary>Optimal maximum number of transfer blocks to read</summary>
public int OptimalMultipleSectorsRead { get; set; }

/// <summary>Can read GD-ROM using disc swap trick?</summary>
public bool? CanReadGdRomUsingSwapDisc { get; set; }

/// <summary>Database ID</summary>
public new int Id { get; set; }

static TestedMedia ClearBinaries(TestedMedia media)
{
if(media is null)
return null;

media.AdipData = null;
media.AtipData = null;
media.BluBcaData = null;
media.BluDdsData = null;
media.BluDiData = null;
media.BluPacData = null;
media.BluSaiData = null;
media.C2PointersData = null;
media.CmiData = null;
media.CorrectedSubchannelData = null;
media.CorrectedSubchannelWithC2Data = null;
media.DcbData = null;
media.DmiData = null;
media.DvdAacsData = null;
media.DvdBcaData = null;
media.DvdDdsData = null;
media.DvdLayerData = null;
media.DvdSaiData = null;
media.EmbossedPfiData = null;
media.FullTocData = null;
media.HdCmiData = null;
media.HLDTSTReadRawDVDData = null;
media.IdentifyData = null;
media.LeadInData = null;
media.LeadOutData = null;
media.ModeSense6Data = null;
media.ModeSense10Data = null;
media.NecReadCddaData = null;
media.PfiData = null;
media.PioneerReadCddaData = null;
media.PioneerReadCddaMsfData = null;
media.PlextorReadCddaData = null;
media.PlextorReadRawDVDData = null;
media.PmaData = null;
media.PQSubchannelData = null;
media.PQSubchannelWithC2Data = null;
media.PriData = null;
media.Read6Data = null;
media.Read10Data = null;
media.Read12Data = null;
media.Read16Data = null;
media.ReadCdData = null;
media.ReadCdFullData = null;
media.ReadCdMsfData = null;
media.ReadCdMsfFullData = null;
media.ReadDmaData = null;
media.ReadDmaLba48Data = null;
media.ReadDmaLbaData = null;
media.ReadDmaRetryData = null;
media.ReadLba48Data = null;
media.ReadLbaData = null;
media.ReadLong10Data = null;
media.ReadLong16Data = null;
media.ReadLongData = null;
media.ReadLongLbaData = null;
media.ReadLongRetryData = null;
media.ReadLongRetryLbaData = null;
media.ReadRetryLbaData = null;
media.ReadSectorsData = null;
media.ReadSectorsRetryData = null;
media.RWSubchannelData = null;
media.RWSubchannelWithC2Data = null;
media.TocData = null;
media.Track1PregapData = null;

return media;
}
}
Loading

0 comments on commit aa554f5

Please sign in to comment.