aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Use string interpolation expression.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-21 17:58:51 +00:00
parent a895700757
commit 4e6e8f340a
182 changed files with 766 additions and 1256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef.Partitions/AppleMap.cs
View File

@@ -171,7 +171,7 @@ namespace DiscImageChef.Partitions
};
if(old_entry.pdFSID == HFS_MAGIC_OLD) part.Type = "Apple_HFS";
else part.Type = string.Format("0x{0:X8}", old_entry.pdFSID);
else part.Type = $"0x{old_entry.pdFSID:X8}";
partitions.Add(part);

2
DiscImageChef.Partitions/GPT.cs
View File

@@ -166,7 +166,7 @@ namespace DiscImageChef.Partitions
Partition part = new Partition
{
Description = string.Format("ID: {0}", entry.partitionId),
Description = $"ID: {entry.partitionId}",
Size = (entry.endLBA - entry.startLBA + 1) * sectorSize,
Name = entry.name,
Length = (entry.endLBA - entry.startLBA + 1) / divisor,

4
DiscImageChef.Partitions/MBR.cs
View File

@@ -209,7 +209,7 @@ namespace DiscImageChef.Partitions
if(valid)
{
part.Type = string.Format("0x{0:X2}", entry.type);
part.Type = $"0x{entry.type:X2}";
part.Name = DecodeMBRType(entry.type);
part.Sequence = counter;
part.Description = entry.status == 0x80 ? "Partition is bootable." : "";
@@ -326,7 +326,7 @@ namespace DiscImageChef.Partitions
if(!ext_valid) continue;
part.Type = string.Format("0x{0:X2}", ebr_entry.type);
part.Type = $"0x{ebr_entry.type:X2}";
part.Name = DecodeMBRType(ebr_entry.type);
part.Sequence = counter;
part.Description = ebr_entry.status == 0x80 ? "Partition is bootable." : "";

33
DiscImageChef.Partitions/RDB.cs
View File

@@ -1453,44 +1453,37 @@ namespace DiscImageChef.Partitions
default:
{
if((amigaDosType & TYPEID_OFS) == TYPEID_OFS)
return string.Format("Unknown Amiga DOS filesystem type {0}",
AmigaDosTypeToString(amigaDosType));
return $"Unknown Amiga DOS filesystem type {AmigaDosTypeToString(amigaDosType)}";
if((amigaDosType & TypeID_AMIXSysV) == TypeID_AMIXSysV)
return string.Format("Unknown Amiga UNIX filesystem type {0}",
AmigaDosTypeToString(amigaDosType));
return $"Unknown Amiga UNIX filesystem type {AmigaDosTypeToString(amigaDosType)}";
if((amigaDosType & 0x50465300) == 0x50465300 || (amigaDosType & 0x41465300) == 0x41465300)
return string.Format("Unknown ProfessionalFileSystem type {0}",
AmigaDosTypeToString(amigaDosType));
return $"Unknown ProfessionalFileSystem type {AmigaDosTypeToString(amigaDosType)}";
if((amigaDosType & TYPEID_SFS) == TYPEID_SFS)
return string.Format("Unknown SmartFileSystem type {0}", AmigaDosTypeToString(amigaDosType));
return $"Unknown SmartFileSystem type {AmigaDosTypeToString(amigaDosType)}";
if((amigaDosType & TYPEID_OFS_MUSER) == TYPEID_OFS_MUSER)
return string.Format("Unknown Amiga DOS multi-user filesystem type {0}",
AmigaDosTypeToString(amigaDosType));
return $"Unknown Amiga DOS multi-user filesystem type {AmigaDosTypeToString(amigaDosType)}";
if((amigaDosType & TYPEID_OLD_BSD_UNUSED) == TYPEID_OLD_BSD_UNUSED)
return string.Format("Unknown BSD filesystem type {0}", AmigaDosTypeToString(amigaDosType));
return $"Unknown BSD filesystem type {AmigaDosTypeToString(amigaDosType)}";
if((amigaDosType & TYPEID_NETBSD_ROOT_UNUSED) == TYPEID_NETBSD_ROOT_UNUSED)
return string.Format("Unknown NetBSD root filesystem type {0}",
AmigaDosTypeToString(amigaDosType));
return $"Unknown NetBSD root filesystem type {AmigaDosTypeToString(amigaDosType)}";
if((amigaDosType & TYPEID_NETBSD_USER_UNUSED) == TYPEID_NETBSD_USER_UNUSED)
return string.Format("Unknown NetBSD user filesystem type {0}",
AmigaDosTypeToString(amigaDosType));
return $"Unknown NetBSD user filesystem type {AmigaDosTypeToString(amigaDosType)}";
if((amigaDosType & TYPEID_NETBSD_SWAP) == TYPEID_NETBSD_SWAP)
return string.Format("Unknown NetBSD swap filesystem type {0}",
AmigaDosTypeToString(amigaDosType));
return $"Unknown NetBSD swap filesystem type {AmigaDosTypeToString(amigaDosType)}";
if((amigaDosType & TYPEID_LINUX) == TYPEID_LINUX ||
(amigaDosType & TYPEID_LINUX_SWAP) == TYPEID_LINUX_SWAP)
return string.Format("Unknown Linux filesystem type {0}", AmigaDosTypeToString(amigaDosType));
return $"Unknown Linux filesystem type {AmigaDosTypeToString(amigaDosType)}";
return string.Format("Unknown partition type {0}", AmigaDosTypeToString(amigaDosType));
return $"Unknown partition type {AmigaDosTypeToString(amigaDosType)}";
}
}
}
@@ -1512,8 +1505,8 @@ namespace DiscImageChef.Partitions
textPartString = Encoding.ASCII.GetString(textPart);
return quoted
? string.Format("\"{0}\\{1}\"", textPartString, amigaDosType & 0xFF)
: string.Format("{0}\\{1}", textPartString, amigaDosType & 0xFF);
? $"\"{textPartString}\\{amigaDosType & 0xFF}\""
: $"{textPartString}\\{amigaDosType & 0xFF}";
}
}
}

10
DiscImageChef.Partitions/Sun.cs
View File

@@ -272,9 +272,8 @@ namespace DiscImageChef.Partitions
Scheme = Name
};
if(dkl8.dkl_vtoc.v_timestamp[i] != 0)
part.Description += string.Format("\nPartition timestamped on {0}",
DateHandlers
.UNIXToDateTime(dkl8.dkl_vtoc.v_timestamp[i]));
part.Description +=
$"\nPartition timestamped on {DateHandlers.UNIXToDateTime(dkl8.dkl_vtoc.v_timestamp[i])}";
if(part.Start < imagePlugin.GetSectors() && part.End <= imagePlugin.GetSectors())
partitions.Add(part);
@@ -342,9 +341,8 @@ namespace DiscImageChef.Partitions
Scheme = Name
};
if(dkl16.dkl_vtoc.v_timestamp[i] != 0)
part.Description += string.Format("\nPartition timestamped on {0}",
DateHandlers
.UNIXToDateTime(dkl16.dkl_vtoc.v_timestamp[i]));
part.Description +=
$"\nPartition timestamped on {DateHandlers.UNIXToDateTime(dkl16.dkl_vtoc.v_timestamp[i])}";
if(part.Start < imagePlugin.GetSectors() && part.End <= imagePlugin.GetSectors())
partitions.Add(part);
}

6
DiscImageChef.Partitions/VTOC.cs
View File

@@ -334,7 +334,7 @@ namespace DiscImageChef.Partitions
Offset = (ulong)(parts[i].p_start * bps),
Size = (ulong)(parts[i].p_size * bps),
Sequence = (ulong)i,
Type = string.Format("UNIX: {0}", decodeUNIXTAG(parts[i].p_tag, !useOld)),
Type = $"UNIX: {decodeUNIXTAG(parts[i].p_tag, !useOld)}",
Scheme = Name
};
string info = "";
@@ -352,7 +352,7 @@ namespace DiscImageChef.Partitions
if(parts[i].p_flag.HasFlag(pFlag.V_REMAP)) info += " (alternate sector mapping)";
if(parts[i].p_flag.HasFlag(pFlag.V_RONLY)) info += " (read-only)";
if(timestamps[i] != 0)
info += string.Format(" created on {0}", DateHandlers.UNIXToDateTime(timestamps[i]));
info += $" created on {DateHandlers.UNIXToDateTime(timestamps[i])}";
part.Description = "UNIX slice" + info + ".";
@@ -544,7 +544,7 @@ namespace DiscImageChef.Partitions
case pTag.V_ALTSCTR: return "Alternate sector track";
case pTag.V_VMPUBLIC: return "volume mgt public partition";
case pTag.V_VMPRIVATE: return "volume mgt private partition";
default: return string.Format("Unknown TAG: 0x{0:X4}", type);
default: return $"Unknown TAG: 0x{type:X4}";
}
}
}