diff --git a/Aaru.Checksums b/Aaru.Checksums index 927585323..d7a0a3e42 160000 --- a/Aaru.Checksums +++ b/Aaru.Checksums @@ -1 +1 @@ -Subproject commit 9275853232eebfb477686ceb175da4f7f611061e +Subproject commit d7a0a3e42ff8fd7dc1a5c9039f6947699b0d27cf diff --git a/Aaru.Core/Logging/IBGLog.cs b/Aaru.Core/Logging/IBGLog.cs index 862e22d01..aa4e553c9 100644 --- a/Aaru.Core/Logging/IBGLog.cs +++ b/Aaru.Core/Logging/IBGLog.cs @@ -256,8 +256,8 @@ sealed class IbgLog _ibgStartSet = true; } - _ibgSb.AppendFormat("{0:0.00},{1},{2:0},0", _ibgIntSpeed / _ibgSnaps / _ibgDivider, _ibgIntSector, - _ibgSampleRate).AppendLine(); + _ibgSb.Append($"{_ibgIntSpeed / _ibgSnaps / _ibgDivider:0.00},{_ibgIntSector},{_ibgSampleRate:0},0"). + AppendLine(); if(_ibgIntSpeed / _ibgSnaps / _ibgDivider > _ibgMaxSpeed) _ibgMaxSpeed = _ibgIntSpeed / _ibgDivider; @@ -301,42 +301,41 @@ sealed class IbgLog ibgHeader.AppendLine("[START_CONFIGURATION]"); ibgHeader.AppendLine("IBGD_VERSION=2"); ibgHeader.AppendLine(); - ibgHeader.AppendFormat("DATE={0}", DateTime.Now).AppendLine(); + ibgHeader.Append($"DATE={DateTime.Now}").AppendLine(); ibgHeader.AppendLine(); - ibgHeader.AppendFormat("SAMPLE_RATE={0}", 100).AppendLine(); + ibgHeader.Append($"SAMPLE_RATE={100}").AppendLine(); ibgHeader.AppendLine(); - ibgHeader.AppendFormat("DEVICE=[0:0:0] {0} {1} ({2}) ({3})", dev.Manufacturer, dev.Model, devicePath, - ibgBusType).AppendLine(); + ibgHeader.Append($"DEVICE=[0:0:0] {dev.Manufacturer} {dev.Model} ({devicePath}) ({ibgBusType})").AppendLine(); ibgHeader.AppendLine("DEVICE_ADDRESS=0:0:0"); - ibgHeader.AppendFormat("DEVICE_MAKEMODEL={0} {1}", dev.Manufacturer, dev.Model).AppendLine(); - ibgHeader.AppendFormat("DEVICE_FIRMWAREVERSION={0}", dev.FirmwareRevision).AppendLine(); - ibgHeader.AppendFormat("DEVICE_DRIVELETTER={0}", devicePath).AppendLine(); - ibgHeader.AppendFormat("DEVICE_BUSTYPE={0}", ibgBusType).AppendLine(); + ibgHeader.Append($"DEVICE_MAKEMODEL={dev.Manufacturer} {dev.Model}").AppendLine(); + ibgHeader.Append($"DEVICE_FIRMWAREVERSION={dev.FirmwareRevision}").AppendLine(); + ibgHeader.Append($"DEVICE_DRIVELETTER={devicePath}").AppendLine(); + ibgHeader.Append($"DEVICE_BUSTYPE={ibgBusType}").AppendLine(); ibgHeader.AppendLine(); - ibgHeader.AppendFormat("MEDIA_TYPE={0}", _ibgMediaType).AppendLine(); + ibgHeader.Append($"MEDIA_TYPE={_ibgMediaType}").AppendLine(); ibgHeader.AppendLine("MEDIA_BOOKTYPE=Unknown"); ibgHeader.AppendLine("MEDIA_ID=N/A"); ibgHeader.AppendLine("MEDIA_TRACKPATH=PTP"); ibgHeader.AppendLine("MEDIA_SPEEDS=N/A"); - ibgHeader.AppendFormat("MEDIA_CAPACITY={0}", blocks).AppendLine(); + ibgHeader.Append($"MEDIA_CAPACITY={blocks}").AppendLine(); ibgHeader.AppendLine("MEDIA_LAYER_BREAK=0"); ibgHeader.AppendLine(); ibgHeader.AppendLine("DATA_IMAGEFILE=/dev/null"); - ibgHeader.AppendFormat("DATA_SECTORS={0}", blocks).AppendLine(); - ibgHeader.AppendFormat("DATA_TYPE=MODE1/{0}", blockSize).AppendLine(); + ibgHeader.Append($"DATA_SECTORS={blocks}").AppendLine(); + ibgHeader.Append($"DATA_TYPE=MODE1/{blockSize}").AppendLine(); ibgHeader.AppendLine("DATA_VOLUMEIDENTIFIER="); ibgHeader.AppendLine(); - ibgHeader.AppendFormat(_ibgCulture, "VERIFY_SPEED_START={0:0.00}", _ibgStartSpeed).AppendLine(); - ibgHeader.AppendFormat(_ibgCulture, "VERIFY_SPEED_END={0:0.00}", currentSpeed / _ibgDivider).AppendLine(); + ibgHeader.Append(_ibgCulture, $"VERIFY_SPEED_START={_ibgStartSpeed:0.00}").AppendLine(); + ibgHeader.Append(_ibgCulture, $"VERIFY_SPEED_END={currentSpeed / _ibgDivider:0.00}").AppendLine(); - ibgHeader.AppendFormat(_ibgCulture, "VERIFY_SPEED_AVERAGE={0:0.00}", averageSpeed / _ibgDivider).AppendLine(); + ibgHeader.Append(_ibgCulture, $"VERIFY_SPEED_AVERAGE={averageSpeed / _ibgDivider:0.00}").AppendLine(); - ibgHeader.AppendFormat(_ibgCulture, "VERIFY_SPEED_MAX={0:0.00}", _ibgMaxSpeed).AppendLine(); - ibgHeader.AppendFormat(_ibgCulture, "VERIFY_TIME_TAKEN={0:0}", Math.Floor(totalSeconds)).AppendLine(); + ibgHeader.Append(_ibgCulture, $"VERIFY_SPEED_MAX={_ibgMaxSpeed:0.00}").AppendLine(); + ibgHeader.Append(_ibgCulture, $"VERIFY_TIME_TAKEN={Math.Floor(totalSeconds):0}").AppendLine(); ibgHeader.AppendLine("[END_CONFIGURATION]"); ibgHeader.AppendLine(); ibgHeader.AppendLine("HRPC=True"); diff --git a/Aaru.Decoders b/Aaru.Decoders index 1a90640c1..8df73a2b2 160000 --- a/Aaru.Decoders +++ b/Aaru.Decoders @@ -1 +1 @@ -Subproject commit 1a90640c11b774c5dd85668e3a109c4c62111622 +Subproject commit 8df73a2b23cd2bb49d13ce08f4665182f4ae650c diff --git a/Aaru.Filesystems/ZFS/Helpers.cs b/Aaru.Filesystems/ZFS/Helpers.cs index cb3f1ccb5..a46bab103 100644 --- a/Aaru.Filesystems/ZFS/Helpers.cs +++ b/Aaru.Filesystems/ZFS/Helpers.cs @@ -457,10 +457,10 @@ public sealed partial class ZFS if(item.elements > 1) { for(var i = 0; i < item.elements; i++) - sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((bool[])item.value)[i]).AppendLine(); + sb.Append($"{item.name}[{i}] = {((bool[])item.value)[i]}").AppendLine(); } else - sb.AppendFormat("{0} = {1}", item.name, (bool)item.value).AppendLine(); + sb.Append($"{item.name} = {(bool)item.value}").AppendLine(); break; case NVS_DataTypes.DATA_TYPE_BYTE: @@ -470,30 +470,30 @@ public sealed partial class ZFS if(item.elements > 1) { for(var i = 0; i < item.elements; i++) - sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((byte[])item.value)[i]).AppendLine(); + sb.Append($"{item.name}[{i}] = {((byte[])item.value)[i]}").AppendLine(); } else - sb.AppendFormat("{0} = {1}", item.name, (byte)item.value).AppendLine(); + sb.Append($"{item.name} = {(byte)item.value}").AppendLine(); break; case NVS_DataTypes.DATA_TYPE_DOUBLE: if(item.elements > 1) { for(var i = 0; i < item.elements; i++) - sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((double[])item.value)[i]).AppendLine(); + sb.Append($"{item.name}[{i}] = {((double[])item.value)[i]}").AppendLine(); } else - sb.AppendFormat("{0} = {1}", item.name, (double)item.value).AppendLine(); + sb.Append($"{item.name} = {(double)item.value}").AppendLine(); break; case NVS_DataTypes.DATA_TYPE_HRTIME: if(item.elements > 1) { for(var i = 0; i < item.elements; i++) - sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((DateTime[])item.value)[i]).AppendLine(); + sb.Append($"{item.name}[{i}] = {((DateTime[])item.value)[i]}").AppendLine(); } else - sb.AppendFormat("{0} = {1}", item.name, (DateTime)item.value).AppendLine(); + sb.Append($"{item.name} = {(DateTime)item.value}").AppendLine(); break; case NVS_DataTypes.DATA_TYPE_INT16: @@ -501,10 +501,10 @@ public sealed partial class ZFS if(item.elements > 1) { for(var i = 0; i < item.elements; i++) - sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((short[])item.value)[i]).AppendLine(); + sb.Append($"{item.name}[{i}] = {((short[])item.value)[i]}").AppendLine(); } else - sb.AppendFormat("{0} = {1}", item.name, (short)item.value).AppendLine(); + sb.Append($"{item.name} = {(short)item.value}").AppendLine(); break; case NVS_DataTypes.DATA_TYPE_INT32: @@ -512,10 +512,10 @@ public sealed partial class ZFS if(item.elements > 1) { for(var i = 0; i < item.elements; i++) - sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((int[])item.value)[i]).AppendLine(); + sb.Append($"{item.name}[{i}] = {((int[])item.value)[i]}").AppendLine(); } else - sb.AppendFormat("{0} = {1}", item.name, (int)item.value).AppendLine(); + sb.Append($"{item.name} = {(int)item.value}").AppendLine(); break; case NVS_DataTypes.DATA_TYPE_INT64: @@ -523,10 +523,10 @@ public sealed partial class ZFS if(item.elements > 1) { for(var i = 0; i < item.elements; i++) - sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((long[])item.value)[i]).AppendLine(); + sb.Append($"{item.name}[{i}] = {((long[])item.value)[i]}").AppendLine(); } else - sb.AppendFormat("{0} = {1}", item.name, (long)item.value).AppendLine(); + sb.Append($"{item.name} = {(long)item.value}").AppendLine(); break; case NVS_DataTypes.DATA_TYPE_INT8: @@ -534,10 +534,10 @@ public sealed partial class ZFS if(item.elements > 1) { for(var i = 0; i < item.elements; i++) - sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((sbyte[])item.value)[i]).AppendLine(); + sb.Append($"{item.name}[{i}] = {((sbyte[])item.value)[i]}").AppendLine(); } else - sb.AppendFormat("{0} = {1}", item.name, (sbyte)item.value).AppendLine(); + sb.Append($"{item.name} = {(sbyte)item.value}").AppendLine(); break; case NVS_DataTypes.DATA_TYPE_STRING: @@ -545,10 +545,10 @@ public sealed partial class ZFS if(item.elements > 1) { for(var i = 0; i < item.elements; i++) - sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((string[])item.value)[i]).AppendLine(); + sb.Append($"{item.name}[{i}] = {((string[])item.value)[i]}").AppendLine(); } else - sb.AppendFormat("{0} = {1}", item.name, (string)item.value).AppendLine(); + sb.Append($"{item.name} = {(string)item.value}").AppendLine(); break; case NVS_DataTypes.DATA_TYPE_UINT16: @@ -556,10 +556,10 @@ public sealed partial class ZFS if(item.elements > 1) { for(var i = 0; i < item.elements; i++) - sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((ushort[])item.value)[i]).AppendLine(); + sb.Append($"{item.name}[{i}] = {((ushort[])item.value)[i]}").AppendLine(); } else - sb.AppendFormat("{0} = {1}", item.name, (ushort)item.value).AppendLine(); + sb.Append($"{item.name} = {(ushort)item.value}").AppendLine(); break; case NVS_DataTypes.DATA_TYPE_UINT32: @@ -567,10 +567,10 @@ public sealed partial class ZFS if(item.elements > 1) { for(var i = 0; i < item.elements; i++) - sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((uint[])item.value)[i]).AppendLine(); + sb.Append($"{item.name}[{i}] = {((uint[])item.value)[i]}").AppendLine(); } else - sb.AppendFormat("{0} = {1}", item.name, (uint)item.value).AppendLine(); + sb.Append($"{item.name} = {(uint)item.value}").AppendLine(); break; case NVS_DataTypes.DATA_TYPE_UINT64: @@ -578,16 +578,16 @@ public sealed partial class ZFS if(item.elements > 1) { for(var i = 0; i < item.elements; i++) - sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((ulong[])item.value)[i]).AppendLine(); + sb.Append($"{item.name}[{i}] = {((ulong[])item.value)[i]}").AppendLine(); } else - sb.AppendFormat("{0} = {1}", item.name, (ulong)item.value).AppendLine(); + sb.Append($"{item.name} = {(ulong)item.value}").AppendLine(); break; case NVS_DataTypes.DATA_TYPE_NVLIST: if(item.elements == 1) { - sb.AppendFormat("{0} =\n{1}", item.name, PrintNvList((Dictionary)item.value)). + sb.Append($"{item.name} =\n{PrintNvList((Dictionary)item.value)}"). AppendLine(); } else diff --git a/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs index ebae0c531..e299c74ff 100644 --- a/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs @@ -115,7 +115,7 @@ public sealed class MediaInfoViewModel : ViewModelBase var sbSerial = new StringBuilder(); for(var i = 4; i < scsiInfo.MediaSerialNumber.Length; i++) - sbSerial.AppendFormat("{0:X2}", scsiInfo.MediaSerialNumber[i]); + sbSerial.Append($"{scsiInfo.MediaSerialNumber[i]:X2}"); MediaSerial = sbSerial.ToString(); } diff --git a/Aaru.Helpers b/Aaru.Helpers index 6f76a5d46..bfe4402f0 160000 --- a/Aaru.Helpers +++ b/Aaru.Helpers @@ -1 +1 @@ -Subproject commit 6f76a5d4601dc3ba2895eba4981ff8602a52aae4 +Subproject commit bfe4402f0a2d448149fd5d36daf0da5d003e7853