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

Refactor: Simplify field names.

Browse Source
This commit is contained in:
Natalia Portillo
2017-07-19 16:37:11 +01:00
parent 711d19fd04
commit 16434f2788
170 changed files with 1816 additions and 1811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
DiscImageChef.DiscImages/Alcohol120.cs
View File

@@ -597,17 +597,17 @@ namespace DiscImageChef.ImagePlugins
{
Partition partition = new Partition();
partition.PartitionDescription = string.Format("Track {0}.", trk.point);
partition.PartitionStartSector = trk.startLba;
partition.PartitionLength = extra.sectors * trk.sectorSize;
partition.PartitionSectors = extra.sectors;
partition.PartitionSequence = trk.point;
partition.PartitionStart = byte_offset;
partition.PartitionType = trk.mode.ToString();
partition.Description = string.Format("Track {0}.", trk.point);
partition.Start = trk.startLba;
partition.Size = extra.sectors * trk.sectorSize;
partition.Length = extra.sectors;
partition.Sequence = trk.point;
partition.Offset = byte_offset;
partition.Type = trk.mode.ToString();
partitions.Add(partition);
ImageInfo.sectors += extra.sectors;
byte_offset += partition.PartitionLength;
byte_offset += partition.Size;
}
if(!offsetmap.ContainsKey(trk.point))
@@ -666,14 +666,14 @@ namespace DiscImageChef.ImagePlugins
DicConsole.DebugWriteLine("Alcohol 120% plugin", "printing partition map");
foreach(Partition partition in partitions)
{
DicConsole.DebugWriteLine("Alcohol 120% plugin", "Partition sequence: {0}", partition.PartitionSequence);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition name: {0}", partition.PartitionName);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition description: {0}", partition.PartitionDescription);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition type: {0}", partition.PartitionType);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting sector: {0}", partition.PartitionStartSector);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition sectors: {0}", partition.PartitionSectors);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting offset: {0}", partition.PartitionStart);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition size in bytes: {0}", partition.PartitionLength);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "Partition sequence: {0}", partition.Sequence);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition name: {0}", partition.Name);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition description: {0}", partition.Description);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition type: {0}", partition.Type);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting sector: {0}", partition.Start);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition sectors: {0}", partition.Length);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting offset: {0}", partition.Offset);
DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition size in bytes: {0}", partition.Size);
}
ImageInfo.imageApplication = "Alcohol 120%";

16
DiscImageChef.DiscImages/BlindWrite4.cs
View File

@@ -751,17 +751,17 @@ namespace DiscImageChef.ImagePlugins
Partition partition = new Partition();
if(bwTrack.pregap > 0)
currentPos += (ulong)(bwTrack.startSector - bwTrack.pregap) * 2352;
partition.PartitionDescription = track.TrackDescription;
partition.PartitionLength = (track.TrackEndSector - track.TrackStartSector + 1) * 2352;
partition.PartitionSectors = track.TrackEndSector - track.TrackStartSector;
partition.PartitionSequence = track.TrackSequence;
partition.PartitionStart = currentPos;
partition.PartitionStartSector = track.TrackStartSector;
partition.PartitionType = track.TrackType.ToString();
partition.Description = track.TrackDescription;
partition.Size = (track.TrackEndSector - track.TrackStartSector + 1) * 2352;
partition.Length = track.TrackEndSector - track.TrackStartSector;
partition.Sequence = track.TrackSequence;
partition.Offset = currentPos;
partition.Start = track.TrackStartSector;
partition.Type = track.TrackType.ToString();
partitions.Add(partition);
tracks.Add(track);
currentPos += partition.PartitionLength;
currentPos += partition.Size;
if(!offsetmap.ContainsKey(track.TrackSequence))
offsetmap.Add(track.TrackSequence, track.TrackStartSector);

34
DiscImageChef.DiscImages/BlindWrite5.cs
View File

@@ -851,20 +851,20 @@ namespace DiscImageChef.ImagePlugins
track.Indexes = new Dictionary<int, ulong>();
track.Indexes.Add(1, track.TrackStartSector);
partition.PartitionDescription = track.TrackDescription;
partition.PartitionLength = (track.TrackEndSector - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector;
partition.PartitionSectors = (track.TrackEndSector - track.TrackStartSector);
partition.PartitionSequence = track.TrackSequence;
partition.PartitionStart = offsetBytes;
partition.PartitionStartSector = track.TrackStartSector;
partition.PartitionType = track.TrackType.ToString();
partition.Description = track.TrackDescription;
partition.Size = (track.TrackEndSector - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector;
partition.Length = (track.TrackEndSector - track.TrackStartSector);
partition.Sequence = track.TrackSequence;
partition.Offset = offsetBytes;
partition.Start = track.TrackStartSector;
partition.Type = track.TrackType.ToString();
offsetBytes += partition.PartitionLength;
offsetBytes += partition.Size;
tracks.Add(track);
partitions.Add(partition);
offsetmap.Add(track.TrackSequence, track.TrackStartSector);
ImageInfo.sectors += partition.PartitionSectors;
ImageInfo.sectors += partition.Length;
}
}
}
@@ -882,14 +882,14 @@ namespace DiscImageChef.ImagePlugins
DicConsole.DebugWriteLine("BlindWrite5 plugin", "printing partition map");
foreach(Partition partition in partitions)
{
DicConsole.DebugWriteLine("BlindWrite5 plugin", "Partition sequence: {0}", partition.PartitionSequence);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition name: {0}", partition.PartitionName);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition description: {0}", partition.PartitionDescription);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition type: {0}", partition.PartitionType);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting sector: {0}", partition.PartitionStartSector);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition sectors: {0}", partition.PartitionSectors);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting offset: {0}", partition.PartitionStart);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition size in bytes: {0}", partition.PartitionLength);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "Partition sequence: {0}", partition.Sequence);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition name: {0}", partition.Name);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition description: {0}", partition.Description);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition type: {0}", partition.Type);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting sector: {0}", partition.Start);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition sectors: {0}", partition.Length);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting offset: {0}", partition.Offset);
DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition size in bytes: {0}", partition.Size);
}
if(!isDvd)

40
DiscImageChef.DiscImages/CDRDAO.cs
View File

@@ -820,29 +820,29 @@ namespace DiscImageChef.ImagePlugins
Partition partition = new Partition();
// Index 01
partition.PartitionDescription = string.Format("Track {0}.", discimage.tracks[i].sequence);
partition.PartitionName = discimage.tracks[i].title;
partition.PartitionStartSector = discimage.tracks[i].startSector;
partition.PartitionLength = (discimage.tracks[i].sectors - index0_len) * discimage.tracks[i].bps;
partition.PartitionSectors = (discimage.tracks[i].sectors - index0_len);
partition.PartitionSequence = partitionSequence;
partition.PartitionStart = byte_offset;
partition.PartitionType = discimage.tracks[i].tracktype;
partition.Description = string.Format("Track {0}.", discimage.tracks[i].sequence);
partition.Name = discimage.tracks[i].title;
partition.Start = discimage.tracks[i].startSector;
partition.Size = (discimage.tracks[i].sectors - index0_len) * discimage.tracks[i].bps;
partition.Length = (discimage.tracks[i].sectors - index0_len);
partition.Sequence = partitionSequence;
partition.Offset = byte_offset;
partition.Type = discimage.tracks[i].tracktype;
byte_offset += partition.PartitionLength;
byte_offset += partition.Size;
partitionSequence++;
if(!offsetmap.ContainsKey(discimage.tracks[i].sequence))
offsetmap.Add(discimage.tracks[i].sequence, partition.PartitionStartSector);
offsetmap.Add(discimage.tracks[i].sequence, partition.Start);
else
{
ulong old_start;
offsetmap.TryGetValue(discimage.tracks[i].sequence, out old_start);
if(partition.PartitionStartSector < old_start)
if(partition.Start < old_start)
{
offsetmap.Remove(discimage.tracks[i].sequence);
offsetmap.Add(discimage.tracks[i].sequence, partition.PartitionStartSector);
offsetmap.Add(discimage.tracks[i].sequence, partition.Start);
}
}
@@ -854,14 +854,14 @@ namespace DiscImageChef.ImagePlugins
DicConsole.DebugWriteLine("CDRDAO plugin", "printing partition map");
foreach(Partition partition in partitions)
{
DicConsole.DebugWriteLine("CDRDAO plugin", "Partition sequence: {0}", partition.PartitionSequence);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition name: {0}", partition.PartitionName);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition description: {0}", partition.PartitionDescription);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition type: {0}", partition.PartitionType);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting sector: {0}", partition.PartitionStartSector);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition sectors: {0}", partition.PartitionSectors);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting offset: {0}", partition.PartitionStart);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition size in bytes: {0}", partition.PartitionLength);
DicConsole.DebugWriteLine("CDRDAO plugin", "Partition sequence: {0}", partition.Sequence);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition name: {0}", partition.Name);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition description: {0}", partition.Description);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition type: {0}", partition.Type);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting sector: {0}", partition.Start);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition sectors: {0}", partition.Length);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting offset: {0}", partition.Offset);
DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition size in bytes: {0}", partition.Size);
}
foreach(CDRDAOTrack track in discimage.tracks)

42
DiscImageChef.DiscImages/CDRWin.cs
View File

@@ -1145,30 +1145,30 @@ namespace DiscImageChef.ImagePlugins
}*/
// Index 01
partition.PartitionDescription = string.Format("Track {0}.", discimage.tracks[i].sequence);
partition.PartitionName = discimage.tracks[i].title;
partition.PartitionStartSector = sector_offset;
partition.PartitionLength = (discimage.tracks[i].sectors - index0_len) * discimage.tracks[i].bps;
partition.PartitionSectors = (discimage.tracks[i].sectors - index0_len);
partition.PartitionSequence = partitionSequence;
partition.PartitionStart = byte_offset;
partition.PartitionType = discimage.tracks[i].tracktype;
partition.Description = string.Format("Track {0}.", discimage.tracks[i].sequence);
partition.Name = discimage.tracks[i].title;
partition.Start = sector_offset;
partition.Size = (discimage.tracks[i].sectors - index0_len) * discimage.tracks[i].bps;
partition.Length = (discimage.tracks[i].sectors - index0_len);
partition.Sequence = partitionSequence;
partition.Offset = byte_offset;
partition.Type = discimage.tracks[i].tracktype;
sector_offset += partition.PartitionSectors;
byte_offset += partition.PartitionLength;
sector_offset += partition.Length;
byte_offset += partition.Size;
partitionSequence++;
if(!offsetmap.ContainsKey(discimage.tracks[i].sequence))
offsetmap.Add(discimage.tracks[i].sequence, partition.PartitionStartSector);
offsetmap.Add(discimage.tracks[i].sequence, partition.Start);
else
{
ulong old_start;
offsetmap.TryGetValue(discimage.tracks[i].sequence, out old_start);
if(partition.PartitionStartSector < old_start)
if(partition.Start < old_start)
{
offsetmap.Remove(discimage.tracks[i].sequence);
offsetmap.Add(discimage.tracks[i].sequence, partition.PartitionStartSector);
offsetmap.Add(discimage.tracks[i].sequence, partition.Start);
}
}
@@ -1180,14 +1180,14 @@ namespace DiscImageChef.ImagePlugins
DicConsole.DebugWriteLine("CDRWin plugin", "printing partition map");
foreach(Partition partition in partitions)
{
DicConsole.DebugWriteLine("CDRWin plugin", "Partition sequence: {0}", partition.PartitionSequence);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition name: {0}", partition.PartitionName);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition description: {0}", partition.PartitionDescription);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition type: {0}", partition.PartitionType);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition starting sector: {0}", partition.PartitionStartSector);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition sectors: {0}", partition.PartitionSectors);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition starting offset: {0}", partition.PartitionStart);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition size in bytes: {0}", partition.PartitionLength);
DicConsole.DebugWriteLine("CDRWin plugin", "Partition sequence: {0}", partition.Sequence);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition name: {0}", partition.Name);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition description: {0}", partition.Description);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition type: {0}", partition.Type);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition starting sector: {0}", partition.Start);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition sectors: {0}", partition.Length);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition starting offset: {0}", partition.Offset);
DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition size in bytes: {0}", partition.Size);
}
foreach(CDRWinTrack track in discimage.tracks)

16
DiscImageChef.DiscImages/CHD.cs
View File

@@ -1471,14 +1471,14 @@ namespace DiscImageChef.ImagePlugins
foreach(Track _track in tracks.Values)
{
Partition partition = new Partition();
partition.PartitionDescription = _track.TrackDescription;
partition.PartitionLength = (_track.TrackEndSector - _track.TrackStartSector + 1) * (ulong)_track.TrackRawBytesPerSector;
partition.PartitionSectors = (_track.TrackEndSector - _track.TrackStartSector + 1);
partition.PartitionSequence = _track.TrackSequence;
partition.PartitionStart = partPos;
partition.PartitionStartSector = _track.TrackStartSector;
partition.PartitionType = _track.TrackType.ToString();
partPos += partition.PartitionSectors;
partition.Description = _track.TrackDescription;
partition.Size = (_track.TrackEndSector - _track.TrackStartSector + 1) * (ulong)_track.TrackRawBytesPerSector;
partition.Length = (_track.TrackEndSector - _track.TrackStartSector + 1);
partition.Sequence = _track.TrackSequence;
partition.Offset = partPos;
partition.Start = _track.TrackStartSector;
partition.Type = _track.TrackType.ToString();
partPos += partition.Length;
offsetmap.Add(_track.TrackStartSector, _track.TrackSequence);
if(_track.TrackSubchannelType != TrackSubchannelType.None)

16
DiscImageChef.DiscImages/CloneCD.cs
View File

@@ -751,14 +751,14 @@ namespace DiscImageChef.DiscImages
}
Partition partition = new Partition();
partition.PartitionDescription = track.TrackDescription;
partition.PartitionLength = (track.TrackEndSector - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector;
partition.PartitionSectors = (track.TrackEndSector - track.TrackStartSector);
ImageInfo.sectors += partition.PartitionSectors;
partition.PartitionSequence = track.TrackSequence;
partition.PartitionStart = track.TrackFileOffset;
partition.PartitionStartSector = track.TrackStartSector;
partition.PartitionType = track.TrackType.ToString();
partition.Description = track.TrackDescription;
partition.Size = (track.TrackEndSector - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector;
partition.Length = (track.TrackEndSector - track.TrackStartSector);
ImageInfo.sectors += partition.Length;
partition.Sequence = track.TrackSequence;
partition.Offset = track.TrackFileOffset;
partition.Start = track.TrackStartSector;
partition.Type = track.TrackType.ToString();
partitions.Add(partition);
offsetmap.Add(track.TrackSequence, track.TrackStartSector);
}

16
DiscImageChef.DiscImages/DiscJuggler.cs
View File

@@ -510,14 +510,14 @@ namespace DiscImageChef.DiscImages
}
Partition partition = new Partition();
partition.PartitionDescription = track.TrackDescription;
partition.PartitionLength = (ulong)(trackLen * track.TrackBytesPerSector);
partition.PartitionSectors = trackLen;
ImageInfo.sectors += partition.PartitionSectors;
partition.PartitionSequence = track.TrackSequence;
partition.PartitionStart = track.TrackFileOffset;
partition.PartitionStartSector = track.TrackStartSector;
partition.PartitionType = track.TrackType.ToString();
partition.Description = track.TrackDescription;
partition.Size = (ulong)(trackLen * track.TrackBytesPerSector);
partition.Length = trackLen;
ImageInfo.sectors += partition.Length;
partition.Sequence = track.TrackSequence;
partition.Offset = track.TrackFileOffset;
partition.Start = track.TrackStartSector;
partition.Type = track.TrackType.ToString();
partitions.Add(partition);
offsetmap.Add(track.TrackSequence, track.TrackStartSector);
tracks.Add(track);

20
DiscImageChef.DiscImages/GDI.cs
View File

@@ -387,17 +387,17 @@ namespace DiscImageChef.ImagePlugins
Partition partition = new Partition();
// Index 01
partition.PartitionDescription = string.Format("Track {0}.", discimage.tracks[i].sequence);
partition.PartitionName = null;
partition.PartitionStartSector = discimage.tracks[i].startSector;
partition.PartitionLength = discimage.tracks[i].sectors * discimage.tracks[i].bps;
partition.PartitionSectors = discimage.tracks[i].sectors;
partition.PartitionSequence = discimage.tracks[i].sequence;
partition.PartitionStart = byte_offset;
partition.PartitionType = discimage.tracks[i].tracktype.ToString();
partition.Description = string.Format("Track {0}.", discimage.tracks[i].sequence);
partition.Name = null;
partition.Start = discimage.tracks[i].startSector;
partition.Size = discimage.tracks[i].sectors * discimage.tracks[i].bps;
partition.Length = discimage.tracks[i].sectors;
partition.Sequence = discimage.tracks[i].sequence;
partition.Offset = byte_offset;
partition.Type = discimage.tracks[i].tracktype.ToString();
byte_offset += partition.PartitionLength;
offsetmap.Add(discimage.tracks[i].sequence, partition.PartitionStartSector);
byte_offset += partition.Size;
offsetmap.Add(discimage.tracks[i].sequence, partition.Start);
partitions.Add(partition);
}

18
DiscImageChef.DiscImages/Nero.cs
View File

@@ -1643,17 +1643,17 @@ namespace DiscImageChef.ImagePlugins
}*/
partition = new Partition();
partition.PartitionDescription = string.Format("Track {0} Index 1", _track.TrackSequence);
partition.PartitionLength = (_neroTrack.EndOfTrack - _neroTrack.Index1);
partition.PartitionName = StringHandlers.CToString(_neroTrack.ISRC);
partition.PartitionSectors = partition.PartitionLength / _neroTrack.SectorSize;
partition.PartitionSequence = PartitionSequence;
partition.PartitionStart = partitionStartByte;
partition.PartitionStartSector = _neroTrack.StartLBA + ((_neroTrack.Index1 - _neroTrack.Index0) / _neroTrack.SectorSize);
partition.PartitionType = NeroTrackModeToTrackType((DAOMode)_neroTrack.Mode).ToString();
partition.Description = string.Format("Track {0} Index 1", _track.TrackSequence);
partition.Size = (_neroTrack.EndOfTrack - _neroTrack.Index1);
partition.Name = StringHandlers.CToString(_neroTrack.ISRC);
partition.Length = partition.Size / _neroTrack.SectorSize;
partition.Sequence = PartitionSequence;
partition.Offset = partitionStartByte;
partition.Start = _neroTrack.StartLBA + ((_neroTrack.Index1 - _neroTrack.Index0) / _neroTrack.SectorSize);
partition.Type = NeroTrackModeToTrackType((DAOMode)_neroTrack.Mode).ToString();
ImagePartitions.Add(partition);
PartitionSequence++;
partitionStartByte += partition.PartitionLength;
partitionStartByte += partition.Size;
}
}

12
DiscImageChef.DiscImages/ZZZRawImage.cs
View File

@@ -881,12 +881,12 @@ namespace DiscImageChef.ImagePlugins
List<Partition> parts = new List<Partition>();
Partition part = new Partition
{
PartitionStartSector = 0,
PartitionSectors = ImageInfo.sectors,
PartitionStart = 0,
PartitionSequence = 0,
PartitionType = "MODE1/2048",
PartitionLength = ImageInfo.sectors * ImageInfo.sectorSize
Start = 0,
Length = ImageInfo.sectors,
Offset = 0,
Sequence = 0,
Type = "MODE1/2048",
Size = ImageInfo.sectors * ImageInfo.sectorSize
};
parts.Add(part);
return parts;