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

Prefer using 'string.Equals(string, StringComparison)' to perform a case-insensitive comparison.

Browse Source
This commit is contained in:
Natalia Portillo
2023-10-04 08:13:57 +01:00
parent bd35ccc4f4
commit 62fbb024f7
14 changed files with 78 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Checksums

Submodule Aaru.Checksums updated: 29c9f29554...9275853232

2
Aaru.CommonTypes

Submodule Aaru.CommonTypes updated: d841ec2800...9859c8d9eb

2
Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
View File

@@ -709,7 +709,7 @@ partial class Dump
subBuf = DeinterleaveQ(cmdBuf);
else if(dbDev?.ATAPI?.RemovableMedias?.Any(d => d.SupportsPlextorReadCDDA == true) == true ||
dbDev?.SCSI?.RemovableMedias?.Any(d => d.SupportsPlextorReadCDDA == true) == true ||
dev.Manufacturer.ToLowerInvariant() == "plextor")
dev.Manufacturer.Equals("plextor", StringComparison.InvariantCultureIgnoreCase))
sense = dev.PlextorReadCdDa(out cmdBuf, out _, lba, 96, 1, PlextorSubchannel.All, dev.Timeout, out _);
{

3
Aaru.Core/Devices/Dumping/Sbc/Data.cs
View File

@@ -25,6 +25,7 @@
// Copyright © 2020-2023 Rebecca Wallander
// ****************************************************************************/
using System;
using System.Linq;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
@@ -214,7 +215,7 @@ partial class Dump
}
else
{
if(_dev.Manufacturer.ToLowerInvariant() == "insite")
if(_dev.Manufacturer.Equals("insite", StringComparison.InvariantCultureIgnoreCase))
{
_resume.BadBlocks.Add(i);
_resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();

4
Aaru.Core/Media/Info/CompactDisc.cs
View File

@@ -102,7 +102,7 @@ public static class CompactDisc
// Plextor READ CDDA
if(dbDev?.ATAPI?.RemovableMedias?.Any(d => d.SupportsPlextorReadCDDA == true) == true ||
dbDev?.SCSI?.RemovableMedias?.Any(d => d.SupportsPlextorReadCDDA == true) == true ||
dev.Manufacturer.ToLowerInvariant() == "plextor")
dev.Manufacturer.Equals("plextor", StringComparison.InvariantCultureIgnoreCase))
{
sense = dev.PlextorReadCdDa(out cmdBuf, out _, wantedLba, sectorSize, 3, PlextorSubchannel.None,
dev.Timeout, out _);
@@ -147,7 +147,7 @@ public static class CompactDisc
(debug || dbDev?.ATAPI?.RemovableMedias?.Any(d => d.CanReadCdScrambled == true) == true ||
dbDev?.SCSI?.RemovableMedias?.Any(d => d.CanReadCdScrambled == true) == true ||
dbDev?.SCSI?.MultiMediaDevice?.TestedMedia?.Any(d => d.CanReadCdScrambled == true) == true ||
dev.Manufacturer.ToLowerInvariant() == "hl-dt-st"))
dev.Manufacturer.Equals("hl-dt-st", StringComparison.InvariantCultureIgnoreCase)))
{
sense = dev.ReadCd(out cmdBuf, out _, wantedLba, sectorSize, 3, MmcSectorTypes.Cdda, false,
false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None,

22
Aaru.Filesystems/ISO9660/Dir.cs
View File

@@ -85,7 +85,7 @@ public sealed partial class ISO9660
string[] pieces = cutPath.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
KeyValuePair<string, DecodedDirectoryEntry> entry =
_rootDirectoryCache.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[0]);
_rootDirectoryCache.FirstOrDefault(t => t.Key.Equals(pieces[0], StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(entry.Key))
return ErrorNumber.NoSuchFile;
@@ -99,7 +99,8 @@ public sealed partial class ISO9660
for(var p = 0; p < pieces.Length; p++)
{
entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[p]);
entry = currentDirectory.FirstOrDefault(
t => t.Key.Equals(pieces[p], StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(entry.Key))
return ErrorNumber.NoSuchFile;
@@ -532,8 +533,10 @@ public sealed partial class ISO9660
{
KeyValuePair<string, DecodedDirectoryEntry> transTblEntry =
entries.FirstOrDefault(e => !e.Value.Flags.HasFlag(FileFlags.Directory) &&
(e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) == "trans.tbl" ||
e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) == "trans.tbl;1"));
(e.Value.Filename.Equals("trans.tbl",
StringComparison.CurrentCultureIgnoreCase) ||
e.Value.Filename.Equals("trans.tbl;1",
StringComparison.CurrentCultureIgnoreCase)));
if(transTblEntry.Value == null)
return;
@@ -576,9 +579,10 @@ public sealed partial class ISO9660
KeyValuePair<string, DecodedDirectoryEntry> originalEntry =
entries.FirstOrDefault(e => !e.Value.Flags.HasFlag(FileFlags.Directory) &&
(e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) == originalName ||
e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) ==
originalNameWithVersion));
(e.Value.Filename.Equals(originalName,
StringComparison.CurrentCultureIgnoreCase) ||
e.Value.Filename.Equals(originalNameWithVersion,
StringComparison.CurrentCultureIgnoreCase)));
originalEntry.Value.Filename = newName;
entries.Remove(originalEntry.Key);
@@ -1119,9 +1123,7 @@ public sealed partial class ISO9660
while(currentPiece < pieces.Length)
{
PathTableEntryInternal currentEntry = _pathTable.FirstOrDefault(p => p.Parent == currentParent &&
p.Name.ToLower(CultureInfo.
CurrentUICulture) ==
pieces[currentPiece]);
p.Name.Equals(pieces[currentPiece], StringComparison.CurrentCultureIgnoreCase));
if(currentEntry is null)
break;

5
Aaru.Filesystems/ISO9660/File.cs
View File

@@ -500,14 +500,15 @@ public sealed partial class ISO9660
return ErrorNumber.InvalidArgument;
KeyValuePair<string, DecodedDirectoryEntry> dirent =
parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[^1]);
parent.FirstOrDefault(t => t.Key.Equals(pieces[^1], StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(dirent.Key))
{
if(!_joliet &&
!pieces[^1].EndsWith(";1", StringComparison.Ordinal))
{
dirent = parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[^1] + ";1");
dirent = parent.FirstOrDefault(
t => t.Key.Equals(pieces[^1] + ";1", StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(dirent.Key))
return ErrorNumber.NoSuchFile;

5
Aaru.Filesystems/Opera/Dir.cs
View File

@@ -80,7 +80,7 @@ public sealed partial class OperaFS
string[] pieces = cutPath.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
KeyValuePair<string, DirectoryEntryWithPointers> entry =
_rootDirectoryCache.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[0]);
_rootDirectoryCache.FirstOrDefault(t => t.Key.Equals(pieces[0], StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(entry.Key))
return ErrorNumber.NoSuchFile;
@@ -94,7 +94,8 @@ public sealed partial class OperaFS
for(var p = 0; p < pieces.Length; p++)
{
entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[p]);
entry = currentDirectory.FirstOrDefault(
t => t.Key.Equals(pieces[p], StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(entry.Key))
return ErrorNumber.NoSuchFile;

2
Aaru.Filesystems/Opera/File.cs
View File

@@ -229,7 +229,7 @@ public sealed partial class OperaFS
return ErrorNumber.InvalidArgument;
KeyValuePair<string, DirectoryEntryWithPointers> dirent =
parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[^1]);
parent.FirstOrDefault(t => t.Key.Equals(pieces[^1], StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(dirent.Key))
return ErrorNumber.NoSuchFile;

64
Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
View File

@@ -162,38 +162,38 @@ public sealed class SubdirectoryViewModel
if(DetectOS.IsWindows)
{
if(filename.Contains('<') ||
filename.Contains('>') ||
filename.Contains(':') ||
filename.Contains('\\') ||
filename.Contains('/') ||
filename.Contains('|') ||
filename.Contains('?') ||
filename.Contains('*') ||
filename.Any(c => c < 32) ||
filename.ToUpperInvariant() == "CON" ||
filename.ToUpperInvariant() == "PRN" ||
filename.ToUpperInvariant() == "AUX" ||
filename.ToUpperInvariant() == "COM1" ||
filename.ToUpperInvariant() == "COM2" ||
filename.ToUpperInvariant() == "COM3" ||
filename.ToUpperInvariant() == "COM4" ||
filename.ToUpperInvariant() == "COM5" ||
filename.ToUpperInvariant() == "COM6" ||
filename.ToUpperInvariant() == "COM7" ||
filename.ToUpperInvariant() == "COM8" ||
filename.ToUpperInvariant() == "COM9" ||
filename.ToUpperInvariant() == "LPT1" ||
filename.ToUpperInvariant() == "LPT2" ||
filename.ToUpperInvariant() == "LPT3" ||
filename.ToUpperInvariant() == "LPT4" ||
filename.ToUpperInvariant() == "LPT5" ||
filename.ToUpperInvariant() == "LPT6" ||
filename.ToUpperInvariant() == "LPT7" ||
filename.ToUpperInvariant() == "LPT8" ||
filename.ToUpperInvariant() == "LPT9" ||
filename.Last() == '.' ||
filename.Last() == ' ')
if(filename.Contains('<') ||
filename.Contains('>') ||
filename.Contains(':') ||
filename.Contains('\\') ||
filename.Contains('/') ||
filename.Contains('|') ||
filename.Contains('?') ||
filename.Contains('*') ||
filename.Any(c => c < 32) ||
filename.Equals("CON", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("PRN", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("AUX", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("COM1", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("COM2", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("COM3", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("COM4", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("COM5", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("COM6", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("COM7", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("COM8", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("COM9", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("LPT1", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("LPT2", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("LPT3", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("LPT4", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("LPT5", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("LPT6", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("LPT7", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("LPT8", StringComparison.InvariantCultureIgnoreCase) ||
filename.Equals("LPT9", StringComparison.InvariantCultureIgnoreCase) ||
filename.Last() == '.' ||
filename.Last() == ' ')
{
char[] chars;

4
Aaru.Images/Alcohol120/Read.cs
View File

@@ -329,9 +329,9 @@ public sealed partial class Alcohol120
if(_alcFooter.filenameOffset == 0)
{
if(Path.GetExtension(imageFilter.BasePath).ToLowerInvariant() == ".mds")
if(Path.GetExtension(imageFilter.BasePath).Equals(".mds", StringComparison.InvariantCultureIgnoreCase))
alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".mdf";
else if(Path.GetExtension(imageFilter.BasePath).ToLowerInvariant() == ".xmd")
else if(Path.GetExtension(imageFilter.BasePath).Equals(".xmd", StringComparison.InvariantCultureIgnoreCase))
alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".xmf";
}
else if(string.Compare(alcFile, "*.mdf", StringComparison.InvariantCultureIgnoreCase) == 0)

4
Aaru.Images/CDRWin/Read.cs
View File

@@ -1546,8 +1546,8 @@ public sealed partial class CdrWin
_imageInfo.Application = "Redump.org";
// Detect ISOBuster extensions
else if(_discImage.OriginalMediaType != null ||
_discImage.Comment.ToLower().Contains("isobuster") ||
else if(_discImage.OriginalMediaType != null ||
_discImage.Comment.Contains("isobuster", StringComparison.InvariantCultureIgnoreCase) ||
sessions.Length > 1)
_imageInfo.Application = "ISOBuster";
else

18
Aaru/Commands/Device/DeviceReport.cs
View File

@@ -274,7 +274,7 @@ sealed class DeviceReportCommand : Command
}
else if(!removable &&
report.ATA.IdentifyDevice?.GeneralConfiguration.HasFlag(Identify.GeneralConfigurationBit.
Removable) == true)
Removable) == true)
removable = AnsiConsole.Confirm($"[italic]{UI.Is_the_media_removable}[/]");
if(removable)
@@ -426,8 +426,9 @@ sealed class DeviceReportCommand : Command
or MediumTypes.ReadWriteBlockDevice)
goto default;
bool iomegaRev = dev.Manufacturer.ToLowerInvariant() == "iomega" && dev.Model.
ToLowerInvariant().StartsWith("rrd", StringComparison.OrdinalIgnoreCase);
bool iomegaRev =
dev.Manufacturer.Equals("iomega", StringComparison.InvariantCultureIgnoreCase) && dev.Model.
StartsWith("rrd", StringComparison.InvariantCultureIgnoreCase);
if(trapDisc)
{
@@ -709,10 +710,13 @@ sealed class DeviceReportCommand : Command
tryNec = false,
tryMediaTekF106 = false;
tryPlextor |= dev.Manufacturer.ToLowerInvariant() == "plextor";
tryHldtst |= dev.Manufacturer.ToLowerInvariant() == "hl-dt-st";
tryPioneer |= dev.Manufacturer.ToLowerInvariant() == "pioneer";
tryNec |= dev.Manufacturer.ToLowerInvariant() == "nec";
tryPlextor |=
dev.Manufacturer.Equals("plextor", StringComparison.InvariantCultureIgnoreCase);
tryHldtst |=
dev.Manufacturer.Equals("hl-dt-st", StringComparison.InvariantCultureIgnoreCase);
tryPioneer |=
dev.Manufacturer.Equals("pioneer", StringComparison.InvariantCultureIgnoreCase);
tryNec |= dev.Manufacturer.Equals("nec", StringComparison.InvariantCultureIgnoreCase);
if(!iomegaRev)
{

9
Aaru/Main.cs
View File

@@ -79,8 +79,8 @@ class MainClass
_assemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
if(args.Length == 1 &&
args[0].ToLowerInvariant() == "gui")
if(args.Length == 1 &&
args[0].Equals("gui", StringComparison.InvariantCultureIgnoreCase))
return Gui.Main.Start(args);
AaruConsole.WriteLineEvent += (format, objects) =>
@@ -198,8 +198,9 @@ class MainClass
// GDPR level compliance does not match and there are no arguments or the arguments are neither GUI neither configure.
if(Settings.Settings.Current.GdprCompliance < DicSettings.GDPR_LEVEL &&
(args.Length < 1 || args.Length >= 1 && args[0].ToLowerInvariant() != "gui" &&
args[0].ToLowerInvariant() != "configure"))
(args.Length < 1 || args.Length >= 1 &&
!args[0].Equals("gui", StringComparison.InvariantCultureIgnoreCase) &&
!args[0].Equals("configure", StringComparison.InvariantCultureIgnoreCase)))
new ConfigureCommand().DoConfigure(true);
Statistics.LoadStats();