mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Update ApplicationVersion to use GetInformationalVersion across multiple files
This commit is contained in:
@@ -686,7 +686,7 @@ public partial class Dump
|
||||
var metadata = new CommonTypes.Structs.ImageInfo
|
||||
{
|
||||
Application = "Aaru",
|
||||
ApplicationVersion = Version.GetVersion()
|
||||
ApplicationVersion = Version.GetInformationalVersion()
|
||||
};
|
||||
|
||||
if(!outputFormat.SetImageInfo(metadata))
|
||||
|
||||
@@ -1079,9 +1079,8 @@ sealed partial class Dump
|
||||
foreach(int sub in _resume.BadSubchannels) subchannelExtents.Add(sub);
|
||||
|
||||
if(_resume.NextBlock < blocks)
|
||||
{
|
||||
for(ulong i = _resume.NextBlock; i < blocks; i++) subchannelExtents.Add((int)i);
|
||||
}
|
||||
for(ulong i = _resume.NextBlock; i < blocks; i++)
|
||||
subchannelExtents.Add((int)i);
|
||||
}
|
||||
|
||||
if(_resume.NextBlock > 0)
|
||||
@@ -1496,9 +1495,8 @@ sealed partial class Dump
|
||||
supportsLongSectors);
|
||||
|
||||
foreach(Tuple<ulong, ulong> leadoutExtent in leadOutExtents.ToArray())
|
||||
{
|
||||
for(ulong e = leadoutExtent.Item1; e <= leadoutExtent.Item2; e++) subchannelExtents.Remove((int)e);
|
||||
}
|
||||
for(ulong e = leadoutExtent.Item1; e <= leadoutExtent.Item2; e++)
|
||||
subchannelExtents.Remove((int)e);
|
||||
|
||||
if(subchannelExtents.Count > 0 && _retryPasses > 0 && _retrySubchannel)
|
||||
{
|
||||
@@ -1568,7 +1566,7 @@ sealed partial class Dump
|
||||
var metadata = new CommonTypes.Structs.ImageInfo
|
||||
{
|
||||
Application = "Aaru",
|
||||
ApplicationVersion = Version.GetVersion()
|
||||
ApplicationVersion = Version.GetInformationalVersion()
|
||||
};
|
||||
|
||||
if(!outputOptical.SetImageInfo(metadata))
|
||||
|
||||
@@ -401,7 +401,7 @@ public partial class Dump
|
||||
var metadata = new CommonTypes.Structs.ImageInfo
|
||||
{
|
||||
Application = "Aaru",
|
||||
ApplicationVersion = Version.GetVersion()
|
||||
ApplicationVersion = Version.GetInformationalVersion()
|
||||
};
|
||||
|
||||
if(!outputBai.SetImageInfo(metadata))
|
||||
|
||||
@@ -689,7 +689,7 @@ partial class Dump
|
||||
var metadata = new CommonTypes.Structs.ImageInfo
|
||||
{
|
||||
Application = "Aaru",
|
||||
ApplicationVersion = Version.GetVersion()
|
||||
ApplicationVersion = Version.GetInformationalVersion()
|
||||
};
|
||||
|
||||
if(!outputFormat.SetImageInfo(metadata))
|
||||
|
||||
@@ -612,7 +612,7 @@ public partial class Dump
|
||||
var metadata = new CommonTypes.Structs.ImageInfo
|
||||
{
|
||||
Application = "Aaru",
|
||||
ApplicationVersion = Version.GetVersion()
|
||||
ApplicationVersion = Version.GetInformationalVersion()
|
||||
};
|
||||
|
||||
if(!outputFormat.SetImageInfo(metadata))
|
||||
|
||||
@@ -627,7 +627,7 @@ public partial class Dump
|
||||
var metadata = new CommonTypes.Structs.ImageInfo
|
||||
{
|
||||
Application = "Aaru",
|
||||
ApplicationVersion = Version.GetVersion(),
|
||||
ApplicationVersion = Version.GetInformationalVersion(),
|
||||
MediaPartNumber = mediaPartNumber
|
||||
};
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@ static class ResumeSupport
|
||||
|
||||
if(oldTry.Software.Name != "Aaru" ||
|
||||
oldTry.Software.OperatingSystem != platform.ToString() ||
|
||||
oldTry.Software.Version != Version.GetVersion())
|
||||
oldTry.Software.Version != Version.GetInformationalVersion())
|
||||
continue;
|
||||
|
||||
if(removable &&
|
||||
|
||||
@@ -285,8 +285,9 @@ partial class Dump
|
||||
Modes.DecodedMode? decMode = null;
|
||||
|
||||
if(!sense && !_dev.Error)
|
||||
if(Modes.DecodeMode10(cmdBuf, _dev.ScsiType).HasValue)
|
||||
decMode = Modes.DecodeMode10(cmdBuf, _dev.ScsiType);
|
||||
{
|
||||
if(Modes.DecodeMode10(cmdBuf, _dev.ScsiType).HasValue) decMode = Modes.DecodeMode10(cmdBuf, _dev.ScsiType);
|
||||
}
|
||||
|
||||
UpdateStatus?.Invoke(Localization.Core.Requesting_MODE_SENSE_6);
|
||||
|
||||
@@ -314,8 +315,9 @@ partial class Dump
|
||||
if(sense || _dev.Error) sense = _dev.ModeSense(out cmdBuf, out senseBuf, 5, out duration);
|
||||
|
||||
if(!sense && !_dev.Error)
|
||||
if(Modes.DecodeMode6(cmdBuf, _dev.ScsiType).HasValue)
|
||||
decMode = Modes.DecodeMode6(cmdBuf, _dev.ScsiType);
|
||||
{
|
||||
if(Modes.DecodeMode6(cmdBuf, _dev.ScsiType).HasValue) decMode = Modes.DecodeMode6(cmdBuf, _dev.ScsiType);
|
||||
}
|
||||
|
||||
// TODO: Check partitions page
|
||||
if(decMode.HasValue)
|
||||
@@ -1340,7 +1342,7 @@ partial class Dump
|
||||
var metadata = new CommonTypes.Structs.ImageInfo
|
||||
{
|
||||
Application = "Aaru",
|
||||
ApplicationVersion = Version.GetVersion()
|
||||
ApplicationVersion = Version.GetInformationalVersion()
|
||||
};
|
||||
|
||||
if(!outputTape.SetImageInfo(metadata))
|
||||
|
||||
@@ -1056,7 +1056,7 @@ partial class Dump
|
||||
var metadata = new CommonTypes.Structs.ImageInfo
|
||||
{
|
||||
Application = "Aaru",
|
||||
ApplicationVersion = Version.GetVersion()
|
||||
ApplicationVersion = Version.GetInformationalVersion()
|
||||
};
|
||||
|
||||
if(!outputFormat.SetImageInfo(metadata))
|
||||
|
||||
@@ -864,7 +864,7 @@ public partial class Dump
|
||||
var metadata = new CommonTypes.Structs.ImageInfo
|
||||
{
|
||||
Application = "Aaru",
|
||||
ApplicationVersion = Version.GetVersion()
|
||||
ApplicationVersion = Version.GetInformationalVersion()
|
||||
};
|
||||
|
||||
if(!outputFormat.SetImageInfo(metadata))
|
||||
|
||||
@@ -1050,9 +1050,8 @@ partial class Dump
|
||||
List<ulong> tmpList = [];
|
||||
|
||||
foreach(ulong ur in _resume.BadBlocks)
|
||||
{
|
||||
for(ulong i = ur; i < ur + blocksToRead; i++) tmpList.Add(i);
|
||||
}
|
||||
for(ulong i = ur; i < ur + blocksToRead; i++)
|
||||
tmpList.Add(i);
|
||||
|
||||
tmpList.Sort();
|
||||
|
||||
@@ -1310,7 +1309,7 @@ partial class Dump
|
||||
var metadata = new CommonTypes.Structs.ImageInfo
|
||||
{
|
||||
Application = "Aaru",
|
||||
ApplicationVersion = Version.GetVersion()
|
||||
ApplicationVersion = Version.GetInformationalVersion()
|
||||
};
|
||||
|
||||
if(!outputFormat.SetImageInfo(metadata))
|
||||
|
||||
@@ -80,7 +80,7 @@ public static class Statistics
|
||||
|
||||
ctx.Versions.Add(new Version
|
||||
{
|
||||
Name = CommonTypes.Interop.Version.GetVersion(),
|
||||
Name = CommonTypes.Interop.Version.GetInformationalVersion(),
|
||||
Synchronized = false,
|
||||
Count = 1
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user