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

Show more detailed status on sidecar creation.

Browse Source
This commit is contained in:
Natalia Portillo
2019-04-20 21:30:39 +01:00
parent d18690b0e1
commit 888138e1af
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DiscImageChef.Core/Sidecar/BlockMedia.cs
View File

@@ -96,6 +96,7 @@ namespace DiscImageChef.Core
sidecar.BlockMedia[0].Sequence.TotalMedia = 1; sidecar.BlockMedia[0].Sequence.TotalMedia = 1;
} }
UpdateStatus("Hashing media tags...");
foreach(MediaTagType tagType in image.Info.ReadableMediaTags) foreach(MediaTagType tagType in image.Info.ReadableMediaTags)
{ {
if(aborted) return; if(aborted) return;
@@ -289,6 +290,8 @@ namespace DiscImageChef.Core
sidecar.BlockMedia[0].ContentChecksums = sidecar.BlockMedia[0].Checksums; sidecar.BlockMedia[0].ContentChecksums = sidecar.BlockMedia[0].Checksums;
else else
{ {
UpdateStatus("Hashing sectors...");
Checksum contentChkWorker = new Checksum(); Checksum contentChkWorker = new Checksum();
// For fast debugging, skip checksum // For fast debugging, skip checksum
@@ -431,6 +434,8 @@ namespace DiscImageChef.Core
if(lstFs.Count > 0) sidecar.BlockMedia[0].FileSystemInformation[0].FileSystems = lstFs.ToArray(); if(lstFs.Count > 0) sidecar.BlockMedia[0].FileSystemInformation[0].FileSystems = lstFs.ToArray();
} }
UpdateStatus("Saving metadata...");
if(image.Info.Cylinders > 0 && image.Info.Heads > 0 && image.Info.SectorsPerTrack > 0) if(image.Info.Cylinders > 0 && image.Info.Heads > 0 && image.Info.SectorsPerTrack > 0)
{ {
sidecar.BlockMedia[0].CylindersSpecified = true; sidecar.BlockMedia[0].CylindersSpecified = true;
@@ -591,6 +596,7 @@ namespace DiscImageChef.Core
if(File.Exists(scpFilePath)) if(File.Exists(scpFilePath))
{ {
UpdateStatus("Hashing SuperCardPro image...");
SuperCardPro scpImage = new SuperCardPro(); SuperCardPro scpImage = new SuperCardPro();
ZZZNoFilter scpFilter = new ZZZNoFilter(); ZZZNoFilter scpFilter = new ZZZNoFilter();
scpFilter.Open(scpFilePath); scpFilter.Open(scpFilePath);
@@ -684,6 +690,8 @@ namespace DiscImageChef.Core
if(kfFile != null) if(kfFile != null)
{ {
UpdateStatus("Hashing KryoFlux images...");
KryoFlux kfImage = new KryoFlux(); KryoFlux kfImage = new KryoFlux();
ZZZNoFilter kfFilter = new ZZZNoFilter(); ZZZNoFilter kfFilter = new ZZZNoFilter();
kfFilter.Open(kfFile); kfFilter.Open(kfFile);
@@ -770,6 +778,8 @@ namespace DiscImageChef.Core
try { dfiImage.Open(dfiFilter); } try { dfiImage.Open(dfiFilter); }
catch(NotImplementedException) { } catch(NotImplementedException) { }
UpdateStatus("Hashing DiscFerret image...");
if(image.Info.Heads == dfiImage.Info.Heads) if(image.Info.Heads == dfiImage.Info.Heads)
if(dfiImage.Info.Cylinders >= image.Info.Cylinders) if(dfiImage.Info.Cylinders >= image.Info.Cylinders)
{ {

2
DiscImageChef.Core/Sidecar/BlockTape.cs
View File

@@ -84,6 +84,7 @@ namespace DiscImageChef.Core
Checksum tapeWorker = new Checksum(); Checksum tapeWorker = new Checksum();
List<TapeFileType> tapeFiles = new List<TapeFileType>(); List<TapeFileType> tapeFiles = new List<TapeFileType>();
UpdateStatus("Hashing files...");
for(int i = 0; i < files.Count; i++) for(int i = 0; i < files.Count; i++)
{ {
if(aborted) return sidecar; if(aborted) return sidecar;
@@ -149,6 +150,7 @@ namespace DiscImageChef.Core
EndProgress2(); EndProgress2();
} }
UpdateStatus("Setting metadata...");
sidecar.BlockMedia[0].Checksums = tapeWorker.End().ToArray(); sidecar.BlockMedia[0].Checksums = tapeWorker.End().ToArray();
sidecar.BlockMedia[0].ContentChecksums = sidecar.BlockMedia[0].Checksums; sidecar.BlockMedia[0].ContentChecksums = sidecar.BlockMedia[0].Checksums;
sidecar.BlockMedia[0].Size = totalSize; sidecar.BlockMedia[0].Size = totalSize;

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

@@ -98,6 +98,7 @@ namespace DiscImageChef.Core
MediaType dskType = image.Info.MediaType; MediaType dskType = image.Info.MediaType;
UpdateStatus("Hashing media tags...");
foreach(MediaTagType tagType in image.Info.ReadableMediaTags) foreach(MediaTagType tagType in image.Info.ReadableMediaTags)
{ {
if(aborted) return; if(aborted) return;
@@ -366,6 +367,7 @@ namespace DiscImageChef.Core
List<Partition> partitions = Partitions.GetAll(image); List<Partition> partitions = Partitions.GetAll(image);
Partitions.AddSchemesToStats(partitions); Partitions.AddSchemesToStats(partitions);
UpdateStatus("Hashing tracks...");
foreach(Track trk in tracks) foreach(Track trk in tracks)
{ {
if(aborted) if(aborted)

2
DiscImageChef.Core/Sidecar/Sidecar.cs
View File

@@ -94,6 +94,7 @@ namespace DiscImageChef.Core
byte[] data; byte[] data;
long position = 0; long position = 0;
UpdateStatus("Hashing image file...");
InitProgress(); InitProgress();
while(position < fi.Length - 1048576) while(position < fi.Length - 1048576)
{ {
@@ -161,6 +162,7 @@ namespace DiscImageChef.Core
public void Abort() public void Abort()
{ {
UpdateStatus("Aborting...");
aborted = true; aborted = true;
} }
} }