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

Pass string interpolation.

Browse Source
This commit is contained in:
Natalia Portillo
2023-10-04 08:16:21 +01:00
parent 62fbb024f7
commit 87caffe50e
6 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Checksums

Submodule Aaru.Checksums updated: 9275853232...d7a0a3e42f

37
Aaru.Core/Logging/IBGLog.cs
View File

@@ -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");

2
Aaru.Decoders

Submodule Aaru.Decoders updated: 1a90640c11...8df73a2b23

50
Aaru.Filesystems/ZFS/Helpers.cs
View File

@@ -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<string, NVS_Item>)item.value)).
sb.Append($"{item.name} =\n{PrintNvList((Dictionary<string, NVS_Item>)item.value)}").
AppendLine();
}
else

2
Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs
View File

@@ -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();
}

2
Aaru.Helpers

Submodule Aaru.Helpers updated: 6f76a5d460...bfe4402f0a