Skip to content

Commit 52eb546

Browse files
Zeugma440Zeugma440
committed
Cleanup using string interpolation
1 parent 0b9a1e8 commit 52eb546

File tree

6 files changed

+59
-59
lines changed

6 files changed

+59
-59
lines changed

‎ATL/AudioData/IO/Helpers/CartTag.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -159,23 +159,23 @@ public static int ToStream(BinaryWriter w, bool isLittleEndian, MetaDataHolder m
159159
// Dates and times
160160
if (additionalFields.TryGetValue("cart.startDate", out var startDate) && !Utils.CheckDateFormat(startDate))
161161
{
162-
LogDelegator.GetLogDelegate()(Log.LV_WARNING, "'cart.startDate' : error writing field - YYYY-MM-DD format required; " + startDate + " found");
162+
LogDelegator.GetLogDelegate()(Log.LV_WARNING, $"'cart.startDate' : error writing field - YYYY-MM-DD format required; {startDate} found");
163163
}
164164
WavHelper.WriteFixedFieldTextValue("cart.startDate", additionalFields, 10, w);
165165
if (additionalFields.TryGetValue("cart.startTime", out var startTime) && !Utils.CheckTimeFormat(startTime))
166166
{
167-
LogDelegator.GetLogDelegate()(Log.LV_WARNING, "'cart.startTime' : error writing field - hh:mm:ss format required; " + startTime + " found");
167+
LogDelegator.GetLogDelegate()(Log.LV_WARNING, $"'cart.startTime' : error writing field - hh:mm:ss format required; {startTime} found");
168168
}
169169
WavHelper.WriteFixedFieldTextValue("cart.startTime", additionalFields, 8, w);
170170

171171
if (additionalFields.TryGetValue("cart.endDate", out var endDate) && !Utils.CheckDateFormat(endDate))
172172
{
173-
LogDelegator.GetLogDelegate()(Log.LV_WARNING, "'cart.endDate' : error writing field - YYYY-MM-DD format required; " + endDate + " found");
173+
LogDelegator.GetLogDelegate()(Log.LV_WARNING, $"'cart.endDate' : error writing field - YYYY-MM-DD format required; {endDate} found");
174174
}
175175
WavHelper.WriteFixedFieldTextValue("cart.endDate", additionalFields, 10, w);
176176
if (additionalFields.TryGetValue("cart.endTime", out var endTime) && !Utils.CheckTimeFormat(endTime))
177177
{
178-
LogDelegator.GetLogDelegate()(Log.LV_WARNING, "'cart.endTime' : error writing field - hh:mm:ss format required; " + endTime + " found");
178+
LogDelegator.GetLogDelegate()(Log.LV_WARNING, $"'cart.endTime' : error writing field - hh:mm:ss format required; {endTime} found");
179179
}
180180
WavHelper.WriteFixedFieldTextValue("cart.endTime", additionalFields, 8, w);
181181

‎ATL/AudioData/IO/Helpers/CueTag.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ public static void FromStream(Stream source, MetaDataIO meta, ReadTagParams read
3131
for (int i = 0; i < numCuePoints; i++)
3232
{
3333
// Cue point ID
34-
WavHelper.ReadInt32(source, meta, "cue.CuePoints[" + i + "].CuePointId", data, readTagParams.ReadAllMetaFrames);
34+
WavHelper.ReadInt32(source, meta, $"cue.CuePoints[{i}].CuePointId", data, readTagParams.ReadAllMetaFrames);
3535

3636
// Play order position
37-
WavHelper.ReadInt32(source, meta, "cue.CuePoints[" + i + "].Position", data, readTagParams.ReadAllMetaFrames);
37+
WavHelper.ReadInt32(source, meta, $"cue.CuePoints[{i}].Position", data, readTagParams.ReadAllMetaFrames);
3838

3939
// RIFF ID of corresponding data chunk
4040
if (source.Read(data, 0, 4) < 4) return;
41-
meta.SetMetaField("cue.CuePoints[" + i + "].DataChunkId", Utils.Latin1Encoding.GetString(data, 0, 4), readTagParams.ReadAllMetaFrames);
41+
meta.SetMetaField($"cue.CuePoints[{i}].DataChunkId", Utils.Latin1Encoding.GetString(data, 0, 4), readTagParams.ReadAllMetaFrames);
4242

4343
// Byte Offset of Data Chunk
44-
WavHelper.ReadInt32(source, meta, "cue.CuePoints[" + i + "].ChunkStart", data, readTagParams.ReadAllMetaFrames);
44+
WavHelper.ReadInt32(source, meta, $"cue.CuePoints[{i}].ChunkStart", data, readTagParams.ReadAllMetaFrames);
4545

4646
// Byte Offset to sample of First Channel
47-
WavHelper.ReadInt32(source, meta, "cue.CuePoints[" + i + "].BlockStart", data, readTagParams.ReadAllMetaFrames);
47+
WavHelper.ReadInt32(source, meta, $"cue.CuePoints[{i}].BlockStart", data, readTagParams.ReadAllMetaFrames);
4848

4949
// Byte Offset to sample byte of First Channel
50-
WavHelper.ReadInt32(source, meta, "cue.CuePoints[" + i + "].SampleOffset", data, readTagParams.ReadAllMetaFrames);
50+
WavHelper.ReadInt32(source, meta, $"cue.CuePoints[{i}].SampleOffset", data, readTagParams.ReadAllMetaFrames);
5151
}
5252
}
5353

‎ATL/AudioData/IO/Helpers/ListTag.cs

+15-15
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private static void readInfoPurpose(Stream source, MetaDataIO meta, ReadTagParam
5959
// Manage parasite zeroes at the end of data
6060
if (source.Position < maxPos && source.ReadByte() != 0) source.Seek(-1, SeekOrigin.Current);
6161
var value = Encoding.UTF8.GetString(data, 0, size);
62-
meta.SetMetaField("info." + key, Utils.StripEndingZeroChars(value), readTagParams.ReadAllMetaFrames);
62+
meta.SetMetaField($"info.{key}", Utils.StripEndingZeroChars(value), readTagParams.ReadAllMetaFrames);
6363

6464
WavHelper.SkipEndPadding(source, maxPos);
6565
}
@@ -83,7 +83,7 @@ private static void readDataListPurpose(Stream source, MetaDataIO meta, ReadTagP
8383
size = StreamUtils.DecodeInt32(data);
8484
if (size <= 0) continue;
8585

86-
meta.SetMetaField("adtl.Labels[" + position + "].Type", id, readTagParams.ReadAllMetaFrames);
86+
meta.SetMetaField($"adtl.Labels[{position}].Type", id, readTagParams.ReadAllMetaFrames);
8787
if (id.Equals(CHUNK_LABEL, StringComparison.OrdinalIgnoreCase)) readLabelSubChunk(source, meta, position, size, readTagParams);
8888
else if (id.Equals(CHUNK_NOTE, StringComparison.OrdinalIgnoreCase)) readLabelSubChunk(source, meta, position, size, readTagParams);
8989
else if (id.Equals(CHUNK_LABELED_TEXT, StringComparison.OrdinalIgnoreCase)) readLabeledTextSubChunk(source, meta, position, size, readTagParams);
@@ -96,31 +96,31 @@ private static void readDataListPurpose(Stream source, MetaDataIO meta, ReadTagP
9696
private static void readLabelSubChunk(Stream source, MetaDataIO meta, int position, int size, ReadTagParams readTagParams)
9797
{
9898
byte[] data = new byte[Math.Max(4, size - 4)];
99-
WavHelper.ReadInt32(source, meta, "adtl.Labels[" + position + "].CuePointId", data, readTagParams.ReadAllMetaFrames);
99+
WavHelper.ReadInt32(source, meta, $"adtl.Labels[{position}].CuePointId", data, readTagParams.ReadAllMetaFrames);
100100

101101
if (source.Read(data, 0, size - 4) < size - 4) return;
102102
string value = Encoding.UTF8.GetString(data, 0, size - 4);
103103
value = Utils.StripEndingZeroChars(value); // Not ideal but effortslessly handles the ending zero
104104

105-
meta.SetMetaField("adtl.Labels[" + position + "].Text", value, readTagParams.ReadAllMetaFrames);
105+
meta.SetMetaField($"adtl.Labels[{position}].Text", value, readTagParams.ReadAllMetaFrames);
106106
}
107107

108108
private static void readLabeledTextSubChunk(Stream source, MetaDataIO meta, int position, int size, ReadTagParams readTagParams)
109109
{
110110
byte[] data = new byte[Math.Max(4, size - 4)];
111-
WavHelper.ReadInt32(source, meta, "adtl.Labels[" + position + "].CuePointId", data, readTagParams.ReadAllMetaFrames);
112-
WavHelper.ReadInt32(source, meta, "adtl.Labels[" + position + "].SampleLength", data, readTagParams.ReadAllMetaFrames);
113-
WavHelper.ReadInt32(source, meta, "adtl.Labels[" + position + "].PurposeId", data, readTagParams.ReadAllMetaFrames);
114-
WavHelper.ReadInt16(source, meta, "adtl.Labels[" + position + "].Country", data, readTagParams.ReadAllMetaFrames);
115-
WavHelper.ReadInt16(source, meta, "adtl.Labels[" + position + "].Language", data, readTagParams.ReadAllMetaFrames);
116-
WavHelper.ReadInt16(source, meta, "adtl.Labels[" + position + "].Dialect", data, readTagParams.ReadAllMetaFrames);
117-
WavHelper.ReadInt16(source, meta, "adtl.Labels[" + position + "].CodePage", data, readTagParams.ReadAllMetaFrames);
111+
WavHelper.ReadInt32(source, meta, $"adtl.Labels[{position}].CuePointId", data, readTagParams.ReadAllMetaFrames);
112+
WavHelper.ReadInt32(source, meta, $"adtl.Labels[{position}].SampleLength", data, readTagParams.ReadAllMetaFrames);
113+
WavHelper.ReadInt32(source, meta, $"adtl.Labels[{position}].PurposeId", data, readTagParams.ReadAllMetaFrames);
114+
WavHelper.ReadInt16(source, meta, $"adtl.Labels[{position}].Country", data, readTagParams.ReadAllMetaFrames);
115+
WavHelper.ReadInt16(source, meta, $"adtl.Labels[{position}].Language", data, readTagParams.ReadAllMetaFrames);
116+
WavHelper.ReadInt16(source, meta, $"adtl.Labels[{position}].Dialect", data, readTagParams.ReadAllMetaFrames);
117+
WavHelper.ReadInt16(source, meta, $"adtl.Labels[{position}].CodePage", data, readTagParams.ReadAllMetaFrames);
118118

119119
if (source.Read(data, 0, size - 20) < size - 20) return;
120120
string value = Encoding.UTF8.GetString(data, 0, size - 20);
121121
value = Utils.StripEndingZeroChars(value); // Not ideal but effortslessly handles the ending zero
122122

123-
meta.SetMetaField("adtl.Labels[" + position + "].Text", value, readTagParams.ReadAllMetaFrames);
123+
meta.SetMetaField($"adtl.Labels[{position}].Text", value, readTagParams.ReadAllMetaFrames);
124124
}
125125

126126
public static bool IsDataEligible(MetaDataHolder meta)
@@ -325,12 +325,12 @@ private static void writeSizeAndNullTerminatedString(string key, string value, B
325325
{
326326
if (key.Length > 4)
327327
{
328-
LogDelegator.GetLogDelegate()(Log.LV_WARNING, "'" + key + "' : LIST.INFO field key must be 4-characters long; cropping");
328+
LogDelegator.GetLogDelegate()(Log.LV_WARNING, $"'{key}' : LIST.INFO field key must be 4-characters long; cropping");
329329
key = Utils.BuildStrictLengthString(key, 4, ' ');
330330
}
331331
else if (key.Length < 4)
332332
{
333-
LogDelegator.GetLogDelegate()(Log.LV_WARNING, "'" + key + "' : LIST.INFO field key must be 4-characters long; completing with whitespaces");
333+
LogDelegator.GetLogDelegate()(Log.LV_WARNING, $"'{key}' : LIST.INFO field key must be 4-characters long; completing with whitespaces");
334334
key = Utils.BuildStrictLengthString(key, 4, ' ');
335335
}
336336
w.Write(Utils.Latin1Encoding.GetBytes(key));
@@ -347,7 +347,7 @@ private static void writeSizeAndNullTerminatedString(string key, string value, B
347347
string keyFull = "info." + key;
348348
if (writtenFields.ContainsKey(keyFull))
349349
{
350-
LogDelegator.GetLogDelegate()(Log.LV_WARNING, "'" + key + "' : already written");
350+
LogDelegator.GetLogDelegate()(Log.LV_WARNING, $"'{key}' : already written");
351351
}
352352
else writtenFields.Add(keyFull, value);
353353
}

‎ATL/AudioData/IO/Helpers/SampleTag.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,22 @@ public static void FromStream(Stream source, MetaDataIO meta, ReadTagParams read
4848
for (int i = 0; i < numSampleLoops; i++)
4949
{
5050
// Cue point ID
51-
WavHelper.ReadInt32(source, meta, "sample.SampleLoop[" + i + "].CuePointId", data, readTagParams.ReadAllMetaFrames);
51+
WavHelper.ReadInt32(source, meta, $"sample.SampleLoop[{i}].CuePointId", data, readTagParams.ReadAllMetaFrames);
5252

5353
// Type
54-
WavHelper.ReadInt32(source, meta, "sample.SampleLoop[" + i + "].Type", data, readTagParams.ReadAllMetaFrames);
54+
WavHelper.ReadInt32(source, meta, $"sample.SampleLoop[{i}].Type", data, readTagParams.ReadAllMetaFrames);
5555

5656
// Start
57-
WavHelper.ReadInt32(source, meta, "sample.SampleLoop[" + i + "].Start", data, readTagParams.ReadAllMetaFrames);
57+
WavHelper.ReadInt32(source, meta, $"sample.SampleLoop[{i}].Start", data, readTagParams.ReadAllMetaFrames);
5858

5959
// End
60-
WavHelper.ReadInt32(source, meta, "sample.SampleLoop[" + i + "].End", data, readTagParams.ReadAllMetaFrames);
60+
WavHelper.ReadInt32(source, meta, $"sample.SampleLoop[{i}].End", data, readTagParams.ReadAllMetaFrames);
6161

6262
// Fraction
63-
WavHelper.ReadInt32(source, meta, "sample.SampleLoop[" + i + "].Fraction", data, readTagParams.ReadAllMetaFrames);
63+
WavHelper.ReadInt32(source, meta, $"sample.SampleLoop[{i}].Fraction", data, readTagParams.ReadAllMetaFrames);
6464

6565
// Play count
66-
WavHelper.ReadInt32(source, meta, "sample.SampleLoop[" + i + "].PlayCount", data, readTagParams.ReadAllMetaFrames);
66+
WavHelper.ReadInt32(source, meta, $"sample.SampleLoop[{i}].PlayCount", data, readTagParams.ReadAllMetaFrames);
6767
}
6868
}
6969

‎ATL/AudioData/IO/MIDI.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -723,15 +723,15 @@ private MidiTrack parseTrack(byte[] data, int trackNumber)
723723
string textType = texttypes[meta - 1];
724724
position += 2;
725725
len = readVarLen(ref data, ref position);
726-
if ((len + position) > trackLen) throw new InvalidDataException("Meta " + textType + " has corrupt variable length field (" + len + ") [track: " + trackNumber + " dt: " + currentDelta + "]");
726+
if ((len + position) > trackLen) throw new InvalidDataException($"Meta {textType} has corrupt variable length field ({len}) [track: {trackNumber} dt: {currentDelta}]");
727727

728728
txt = Encoding.ASCII.GetString(data, position, len);
729729
if (MidiEvents.META_TEXT == meta || MidiEvents.META_TRACK_NAME == meta || MidiEvents.META_MARKER == meta) comment.Append(txt).Append(Settings.InternalValueSeparator);
730730
else if (MidiEvents.META_COPYRIGHT == meta) tagData.IntegrateValue(TagData.Field.COPYRIGHT, txt);
731731

732732
evt = new MidiEvent(currentTicks, meta, -1, meta - 1);
733733
evt.isMetaEvent = true;
734-
evt.Description = " Meta " + textType + " \"" + txt + "\"";
734+
evt.Description = $" Meta {textType} '{txt}'";
735735
track.Add(evt);
736736

737737
position += len;
@@ -781,7 +781,7 @@ private MidiTrack parseTrack(byte[] data, int trackNumber)
781781

782782
evt = new MidiEvent(currentTicks, meta, -1, currentTempo);
783783
evt.isMetaEvent = true;
784-
evt.Description = " Meta Tempo " + evt.Param0 + " (duration :" + track.Duration + ")";
784+
evt.Description = $" Meta Tempo {evt.Param0} (duration : {track.Duration})";
785785
track.Add(evt);
786786

787787
// Sets song tempo as last tempo event of 1st track
@@ -802,7 +802,7 @@ private MidiTrack parseTrack(byte[] data, int trackNumber)
802802
// TODO : store the arguments in a solid structure within MidiEvent
803803
evt = new MidiEvent(currentTicks, meta, -1, -1);
804804
evt.isMetaEvent = true;
805-
evt.Description = " Meta SMPTE " + h + " " + m + " " + s + " " + f + " " + fh;
805+
evt.Description = $" Meta SMPTE {h} {m} {s} {f} {fh}";
806806
track.Add(evt);
807807

808808
position += 8;
@@ -816,7 +816,7 @@ private MidiTrack parseTrack(byte[] data, int trackNumber)
816816
// TODO : store the arguments in a solid structure within MidiEvent
817817
evt = new MidiEvent(currentTicks, meta, -1, -1);
818818
evt.isMetaEvent = true;
819-
evt.Description = " Meta TimeSig " + z + "/" + t + " " + mc + " " + c;
819+
evt.Description = $" Meta TimeSig {z}/{t} {mc} {c}";
820820
track.Add(evt);
821821

822822
position += 7;
@@ -832,7 +832,7 @@ private MidiTrack parseTrack(byte[] data, int trackNumber)
832832
case MidiEvents.META_SEQUENCER_DATA: // Sequencer specific data
833833
position += 2;
834834
len = readVarLen(ref data, ref position);
835-
if ((len + position) > trackLen) throw new InvalidDataException("SeqSpec has corrupt variable length field (" + len + ") [track: " + trackNumber + " dt: " + currentDelta + "]");
835+
if ((len + position) > trackLen) throw new InvalidDataException($"SeqSpec has corrupt variable length field ({len}) [track: {trackNumber} dt: {currentDelta}]");
836836
position -= 3;
837837
{
838838
evt = new MidiEvent(currentTicks, meta, -1, currentTempo);
@@ -848,13 +848,13 @@ private MidiTrack parseTrack(byte[] data, int trackNumber)
848848
byte metacode = data[position + 1];
849849
position += 2;
850850
len = readVarLen(ref data, ref position);
851-
if ((len + position) > trackLen) throw new InvalidDataException("Meta " + metacode + " has corrupt variable length field (" + len + ") [track: " + trackNumber + " dt: " + currentDelta + "]");
851+
if ((len + position) > trackLen) throw new InvalidDataException($"Meta {metacode} has corrupt variable length field ({len}) [track: {trackNumber} dt: {currentDelta}]");
852852
position -= 3;
853853
{
854854
String str = Encoding.ASCII.GetString(data, position + 3, len);
855855
evt = new MidiEvent(currentTicks, meta, -1, currentTempo);
856856
evt.isMetaEvent = true;
857-
evt.Description = " Meta 0x" + metacode + " " + str;
857+
evt.Description = $" Meta 0x{metacode} {str}";
858858
track.Add(evt);
859859
}
860860
position += len + 3;
@@ -866,7 +866,7 @@ private MidiTrack parseTrack(byte[] data, int trackNumber)
866866
case MidiEvents.EVT_SYSEX: // SysEx
867867
position += 1;
868868
len = readVarLen(ref data, ref position);
869-
if ((len + position) > trackLen) throw new InvalidDataException("SysEx has corrupt variable length field (" + len + ") [track: " + trackNumber + " dt: " + currentDelta + " p: " + position + "]");
869+
if ((len + position) > trackLen) throw new InvalidDataException($"SysEx has corrupt variable length field ({len}) [track: {trackNumber} dt: {currentDelta} p: {position}]");
870870
{
871871
evt = new MidiEvent(currentTicks, eventTypeHigh, -1, currentTempo);
872872
evt.isMetaEvent = true;
@@ -962,7 +962,7 @@ private static int readVarLen(ref byte[] data, ref int pos)
962962
value = (value << 7) + (c & 0x7F);
963963
} while ((c & 0x80) != 0);
964964
}
965-
return (value);
965+
return value;
966966
}
967967

968968
/// <inheritdoc/>

0 commit comments

Comments
 (0)