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

For DiscImageChef format, solve minor implementation bugs.

Browse Source
This commit is contained in:
Natalia Portillo
2018-01-25 19:37:52 +00:00
parent 2f252709a0
commit 0946db6a88
1 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
DiscImageChef.DiscImages/DiscImageChef.cs
View File

@@ -404,7 +404,7 @@ namespace DiscImageChef.DiscImages
lzmaDdt.Read(decompressedDdt, 0, (int)ddtHeader.length); lzmaDdt.Read(decompressedDdt, 0, (int)ddtHeader.length);
lzmaDdt.Close(); lzmaDdt.Close();
compressedDdtMs.Close(); compressedDdtMs.Close();
userDataDdt = new ulong[ddtHeader.entries]; userDataDdt = new ulong[ddtHeader.entries];
for(ulong i = 0; i < ddtHeader.entries; i++) for(ulong i = 0; i < ddtHeader.entries; i++)
userDataDdt[i] = BitConverter.ToUInt64(decompressedDdt, (int)(i * sizeof(ulong))); userDataDdt[i] = BitConverter.ToUInt64(decompressedDdt, (int)(i * sizeof(ulong)));
DateTime ddtEnd = DateTime.UtcNow; DateTime ddtEnd = DateTime.UtcNow;
@@ -677,6 +677,8 @@ namespace DiscImageChef.DiscImages
trackIsrcs.Add(trackEntry.sequence, trackEntry.isrc); trackIsrcs.Add(trackEntry.sequence, trackEntry.isrc);
} }
imageInfo.HasPartitions = true;
imageInfo.HasSessions = true;
break; break;
} }
} }
@@ -684,9 +686,9 @@ namespace DiscImageChef.DiscImages
if(!foundUserDataDdt) throw new ImageNotSupportedException("Could not find user data deduplication table."); if(!foundUserDataDdt) throw new ImageNotSupportedException("Could not find user data deduplication table.");
imageInfo.CreationTime = DateTime.FromFileTimeUtc(header.creationTime); imageInfo.CreationTime = DateTime.FromFileTimeUtc(header.creationTime);
DicConsole.DebugWriteLine("DiscImageChef format plugin", "Image created on", imageInfo.CreationTime); DicConsole.DebugWriteLine("DiscImageChef format plugin", "Image created on {0}", imageInfo.CreationTime);
imageInfo.LastModificationTime = DateTime.FromFileTimeUtc(header.lastWrittenTime); imageInfo.LastModificationTime = DateTime.FromFileTimeUtc(header.lastWrittenTime);
DicConsole.DebugWriteLine("DiscImageChef format plugin", "Image last written on", DicConsole.DebugWriteLine("DiscImageChef format plugin", "Image last written on {0}",
imageInfo.LastModificationTime); imageInfo.LastModificationTime);
if(geometryBlock.identifier != BlockType.GeometryBlock && imageInfo.XmlMediaType == XmlMediaType.BlockMedia) if(geometryBlock.identifier != BlockType.GeometryBlock && imageInfo.XmlMediaType == XmlMediaType.BlockMedia)
@@ -1721,35 +1723,29 @@ namespace DiscImageChef.DiscImages
if(header.mediaType != mediaType) if(header.mediaType != mediaType)
{ {
ErrorMessage = $"Cannot write a media with type {mediaType} to an image with type {header.mediaType}"; ErrorMessage =
$"Cannot write a media with type {mediaType} to an image with type {header.mediaType}";
return false; return false;
} }
// TODO: Set correct version
header.application = "DiscImageChef";
header.imageMajorVersion = DICF_VERSION;
header.imageMinorVersion = 0;
header.applicationMajorVersion = 4;
header.applicationMinorVersion = 0;
} }
else else
{ {
// TODO: Set correct version
header = new DicHeader header = new DicHeader
{ {
identifier = DIC_MAGIC, identifier = DIC_MAGIC,
application = "DiscImageChef", mediaType = mediaType,
imageMajorVersion = DICF_VERSION, creationTime = DateTime.UtcNow.ToFileTimeUtc()
imageMinorVersion = 0,
applicationMajorVersion = 4,
applicationMinorVersion = 0,
mediaType = mediaType,
creationTime = DateTime.UtcNow.ToFileTimeUtc()
}; };
imageStream.Write(new byte[Marshal.SizeOf(typeof(DicHeader))], 0, Marshal.SizeOf(typeof(DicHeader))); imageStream.Write(new byte[Marshal.SizeOf(typeof(DicHeader))], 0, Marshal.SizeOf(typeof(DicHeader)));
} }
header.application = "DiscImageChef";
header.imageMajorVersion = DICF_VERSION;
header.imageMinorVersion = 0;
header.applicationMajorVersion = (byte)typeof(DiscImageChef).Assembly.GetName().Version.Major;
header.applicationMinorVersion = (byte)typeof(DiscImageChef).Assembly.GetName().Version.Minor;
index = new List<IndexEntry>(); index = new List<IndexEntry>();
if(header.indexOffset > 0) if(header.indexOffset > 0)
@@ -1955,7 +1951,7 @@ namespace DiscImageChef.DiscImages
else else
{ {
inMemoryDdt = sectors <= maxDdtSize * 1024 * 1024 / sizeof(ulong); inMemoryDdt = sectors <= maxDdtSize * 1024 * 1024 / sizeof(ulong);
if(inMemoryDdt) userDataDdt = new ulong[sectors]; if(inMemoryDdt) userDataDdt = new ulong[sectors];
else else
{ {
@@ -1987,8 +1983,8 @@ namespace DiscImageChef.DiscImages
imageStream.Write(structureBytes, 0, structureBytes.Length); imageStream.Write(structureBytes, 0, structureBytes.Length);
structureBytes = null; structureBytes = null;
// TODO: Can be changed to a seek? imageStream.Position += (long)(sectors * sizeof(ulong)) - 1;
imageStream.Write(new byte[sectors * sizeof(ulong)], 0, (int)(sectors * sizeof(ulong))); imageStream.WriteByte(0);
} }
} }
@@ -2309,9 +2305,11 @@ namespace DiscImageChef.DiscImages
return false; return false;
} }
if(track.TrackStartSector + sectorAddress + length > track.TrackEndSector + 1) if(sectorAddress + length > track.TrackEndSector + 1)
throw new ArgumentOutOfRangeException(nameof(length), {
$"Requested more sectors ({length + sectorAddress}) than present in track ({track.TrackEndSector - track.TrackStartSector + 1}), won't cross tracks"); ErrorMessage = "Can't cross tracks";
return false;
}
sector = new byte[2352]; sector = new byte[2352];
for(uint i = 0; i < length; i++) for(uint i = 0; i < length; i++)
@@ -2484,8 +2482,7 @@ namespace DiscImageChef.DiscImages
imageStream.Write(lzmaProperties, 0, lzmaProperties.Length); imageStream.Write(lzmaProperties, 0, lzmaProperties.Length);
imageStream.Write(tagData, 0, tagData.Length); imageStream.Write(tagData, 0, tagData.Length);
index.RemoveAll(t => t.blockType == BlockType.DataBlock && index.RemoveAll(t => t.blockType == BlockType.DataBlock && t.dataType == dataType);
t.dataType == dataType);
index.Add(idxEntry); index.Add(idxEntry);
} }
@@ -2509,8 +2506,7 @@ namespace DiscImageChef.DiscImages
Marshal.FreeHGlobal(structurePointer); Marshal.FreeHGlobal(structurePointer);
imageStream.Write(structureBytes, 0, structureBytes.Length); imageStream.Write(structureBytes, 0, structureBytes.Length);
index.RemoveAll(t => t.blockType == BlockType.GeometryBlock && index.RemoveAll(t => t.blockType == BlockType.GeometryBlock && t.dataType == DataType.NoData);
t.dataType == DataType.NoData);
index.Add(idxEntry); index.Add(idxEntry);
} }
@@ -2569,8 +2565,7 @@ namespace DiscImageChef.DiscImages
blockStream = null; blockStream = null;
compressedBlockStream = null; compressedBlockStream = null;
index.RemoveAll(t => t.blockType == BlockType.DeDuplicationTable && index.RemoveAll(t => t.blockType == BlockType.DeDuplicationTable && t.dataType == DataType.UserData);
t.dataType == DataType.UserData);
index.Add(idxEntry); index.Add(idxEntry);
} }
@@ -2777,8 +2772,7 @@ namespace DiscImageChef.DiscImages
DicConsole.DebugWriteLine("DiscImageChef format plugin", "Writing tracks to position {0}", DicConsole.DebugWriteLine("DiscImageChef format plugin", "Writing tracks to position {0}",
imageStream.Position); imageStream.Position);
index.RemoveAll(t => t.blockType == BlockType.TracksBlock && index.RemoveAll(t => t.blockType == BlockType.TracksBlock && t.dataType == DataType.NoData);
t.dataType == DataType.NoData);
index.Add(new IndexEntry index.Add(new IndexEntry
{ {
@@ -2867,8 +2861,7 @@ namespace DiscImageChef.DiscImages
imageStream.Write(lzmaProperties, 0, lzmaProperties.Length); imageStream.Write(lzmaProperties, 0, lzmaProperties.Length);
imageStream.Write(blockStream.ToArray(), 0, (int)blockStream.Length); imageStream.Write(blockStream.ToArray(), 0, (int)blockStream.Length);
index.RemoveAll(t => t.blockType == BlockType.DataBlock && index.RemoveAll(t => t.blockType == BlockType.DataBlock && t.dataType == tagType);
t.dataType == tagType);
index.Add(idxEntry); index.Add(idxEntry);
blockStream = null; blockStream = null;
@@ -3021,8 +3014,7 @@ namespace DiscImageChef.DiscImages
Marshal.FreeHGlobal(structurePointer); Marshal.FreeHGlobal(structurePointer);
blockStream.Position = 0; blockStream.Position = 0;
blockStream.Write(structureBytes, 0, structureBytes.Length); blockStream.Write(structureBytes, 0, structureBytes.Length);
index.RemoveAll(t => t.blockType == BlockType.MetadataBlock && index.RemoveAll(t => t.blockType == BlockType.MetadataBlock && t.dataType == DataType.NoData);
t.dataType == DataType.NoData);
index.Add(new IndexEntry index.Add(new IndexEntry
{ {