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

🎨🎨🎨 Removed methods in images that only returned what's already in the ImageInfo structure.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-26 02:51:10 +00:00
parent 03a4e286cc
commit a002253fa4
135 changed files with 2111 additions and 8526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DiscImageChef.Core/Sidecar/OpticalDisc.cs
View File

@@ -67,20 +67,20 @@ namespace DiscImageChef.Core
Checksums = imgChecksums.ToArray(),
Image = new ImageType
{
format = image.GetImageFormat(),
format = image.ImageFormat,
offset = 0,
offsetSpecified = true,
Value = Path.GetFileName(imagePath)
},
Size = fi.Length,
Sequence = new SequenceType {MediaTitle = image.GetImageName()}
Sequence = new SequenceType {MediaTitle = image.ImageInfo.MediaTitle}
}
};
if(image.GetMediaSequence() != 0 && image.GetLastDiskSequence() != 0)
if(image.ImageInfo.MediaSequence != 0 && image.ImageInfo.LastMediaSequence != 0)
{
sidecar.OpticalDisc[0].Sequence.MediaSequence = image.GetMediaSequence();
sidecar.OpticalDisc[0].Sequence.TotalMedia = image.GetMediaSequence();
sidecar.OpticalDisc[0].Sequence.MediaSequence = image.ImageInfo.MediaSequence;
sidecar.OpticalDisc[0].Sequence.TotalMedia = image.ImageInfo.LastMediaSequence;
}
else
{
@@ -246,12 +246,12 @@ namespace DiscImageChef.Core
try
{
List<Session> sessions = image.GetSessions();
List<Session> sessions = image.Sessions;
sidecar.OpticalDisc[0].Sessions = sessions?.Count ?? 1;
}
catch { sidecar.OpticalDisc[0].Sessions = 1; }
List<Track> tracks = image.GetTracks();
List<Track> tracks = image.Tracks;
List<TrackType> trksLst = null;
if(tracks != null)
{
@@ -608,8 +608,8 @@ namespace DiscImageChef.Core
Serial = image.ImageInfo.DriveSerialNumber,
Software = new SoftwareType
{
Name = image.GetImageApplication(),
Version = image.GetImageApplicationVersion()
Name = image.ImageInfo.Application,
Version = image.ImageInfo.ApplicationVersion
}
}
};