CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-28 15:31:30 +12:00
Code Issues Projects Releases Packages Wiki Activity

Use OrdinalIgnoreCase

Browse source
This commit is contained in:
Jaex 2022-10-15 02:10:59 +03:00
parent cd22e384e2
commit ff28b68ca0
26 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.HelpersLib/Extensions/StringExtensions.cs
View file

@ -122,7 +122,7 @@ public static string Replace(this string str, string oldValue, string newValue,
}
public static string ReplaceWith(this string str, string search, string replace,
int occurrence = 0, StringComparison comparison = StringComparison.InvariantCultureIgnoreCase)
int occurrence = 0, StringComparison comparison = StringComparison.OrdinalIgnoreCase)
{
if (!string.IsNullOrEmpty(search))
{

2
ShareX.HelpersLib/Forms/DebugForm.cs
View file

@ -110,7 +110,7 @@ private void btnLoadedAssemblies_Click(object sender, EventArgs e)
string directoryPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
{
if (!assembly.IsDynamic && assembly.Location.StartsWith(directoryPath, StringComparison.InvariantCultureIgnoreCase))
if (!assembly.IsDynamic && assembly.Location.StartsWith(directoryPath, StringComparison.OrdinalIgnoreCase))
{
sb.AppendLine(assembly.ManifestModule.Name);
}

2
ShareX.HelpersLib/Forms/HashCheckForm.cs
View file

@ -61,7 +61,7 @@ private void UpdateResult()
{
if (!string.IsNullOrEmpty(txtResult.Text) && !string.IsNullOrEmpty(txtTarget.Text))
{
if (txtResult.Text.Equals(txtTarget.Text, StringComparison.InvariantCultureIgnoreCase))
if (txtResult.Text.Equals(txtTarget.Text, StringComparison.OrdinalIgnoreCase))
{
txtTarget.BackColor = Color.FromArgb(200, 255, 200);
}

2
ShareX.HelpersLib/Helpers/ColorHelpers.cs
View file

@ -178,7 +178,7 @@ public static Color HexToColor(string hex, ColorFormat format = ColorFormat.RGB)
{
hex = hex.Remove(0, 1);
}
else if (hex.StartsWith("0x", StringComparison.InvariantCultureIgnoreCase))
else if (hex.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
{
hex = hex.Remove(0, 2);
}

12
ShareX.HelpersLib/UpdateChecker/AppVeyorUpdateChecker.cs
View file

@ -44,16 +44,16 @@ public override void CheckUpdate()
AppVeyorProject project = appveyor.GetProjectByBranch(Branch);
if (!project.build.status.Equals("success", StringComparison.InvariantCultureIgnoreCase) &&
!project.build.status.Equals("running", StringComparison.InvariantCultureIgnoreCase))
if (!project.build.status.Equals("success", StringComparison.OrdinalIgnoreCase) &&
!project.build.status.Equals("running", StringComparison.OrdinalIgnoreCase))
{
throw new Exception("Latest project build is not successful.");
}
AppVeyorProjectJob job = project.build.jobs.FirstOrDefault(x =>
x.name.Equals("Configuration: Release", StringComparison.InvariantCultureIgnoreCase) &&
x.osType.Equals("Windows", StringComparison.InvariantCultureIgnoreCase) &&
x.status.Equals("success", StringComparison.InvariantCultureIgnoreCase));
x.name.Equals("Configuration: Release", StringComparison.OrdinalIgnoreCase) &&
x.osType.Equals("Windows", StringComparison.OrdinalIgnoreCase) &&
x.status.Equals("success", StringComparison.OrdinalIgnoreCase));
if (job == null)
{
@ -73,7 +73,7 @@ public override void CheckUpdate()
deploymentName = "Setup";
}
AppVeyorProjectArtifact artifact = artifacts.FirstOrDefault(x => x.name.Equals(deploymentName, StringComparison.InvariantCultureIgnoreCase));
AppVeyorProjectArtifact artifact = artifacts.FirstOrDefault(x => x.name.Equals(deploymentName, StringComparison.OrdinalIgnoreCase));
if (artifact == null)
{

2
ShareX.MediaLib/FFmpegCLIManager.cs
View file

@ -129,7 +129,7 @@ private void FFmpeg_DataReceived(object sender, DataReceivedEventArgs e)
{
Output.AppendLine(data);
if (!IsEncoding && data.Contains("Press [q] to stop", StringComparison.InvariantCultureIgnoreCase))
if (!IsEncoding && data.Contains("Press [q] to stop", StringComparison.OrdinalIgnoreCase))
{
IsEncoding = true;

8
ShareX.ScreenCaptureLib/ScreenRecording/FFmpegOptions.cs
View file

@ -82,7 +82,7 @@ public string Extension
{
get
{
if (!VideoSource.Equals(FFmpegCLIManager.SourceNone, StringComparison.InvariantCultureIgnoreCase))
if (!VideoSource.Equals(FFmpegCLIManager.SourceNone, StringComparison.OrdinalIgnoreCase))
{
switch (VideoCodec)
{
@ -108,7 +108,7 @@ public string Extension
return "apng";
}
}
else if (!AudioSource.Equals(FFmpegCLIManager.SourceNone, StringComparison.InvariantCultureIgnoreCase))
else if (!AudioSource.Equals(FFmpegCLIManager.SourceNone, StringComparison.OrdinalIgnoreCase))
{
switch (AudioCodec)
{
@ -129,9 +129,9 @@ public string Extension
public bool IsSourceSelected => IsVideoSourceSelected || IsAudioSourceSelected;
public bool IsVideoSourceSelected => !string.IsNullOrEmpty(VideoSource) && !VideoSource.Equals(FFmpegCLIManager.SourceNone, StringComparison.InvariantCultureIgnoreCase);
public bool IsVideoSourceSelected => !string.IsNullOrEmpty(VideoSource) && !VideoSource.Equals(FFmpegCLIManager.SourceNone, StringComparison.OrdinalIgnoreCase);
public bool IsAudioSourceSelected => !string.IsNullOrEmpty(AudioSource) && !AudioSource.Equals(FFmpegCLIManager.SourceNone, StringComparison.InvariantCultureIgnoreCase) &&
public bool IsAudioSourceSelected => !string.IsNullOrEmpty(AudioSource) && !AudioSource.Equals(FFmpegCLIManager.SourceNone, StringComparison.OrdinalIgnoreCase) &&
(!IsVideoSourceSelected || !IsAnimatedImage);
public bool IsAnimatedImage => VideoCodec == FFmpegVideoCodec.gif || VideoCodec == FFmpegVideoCodec.libwebp || VideoCodec == FFmpegVideoCodec.apng;

20
ShareX.ScreenCaptureLib/ScreenRecording/ScreenRecordingOptions.cs
View file

@ -49,7 +49,7 @@ public string GetFFmpegCommands()
{
string commands;
if (IsRecording && !string.IsNullOrEmpty(FFmpeg.VideoSource) && FFmpeg.VideoSource.Equals("screen-capture-recorder", StringComparison.InvariantCultureIgnoreCase))
if (IsRecording && !string.IsNullOrEmpty(FFmpeg.VideoSource) && FFmpeg.VideoSource.Equals("screen-capture-recorder", StringComparison.OrdinalIgnoreCase))
{
// https://github.com/rdp/screen-capture-recorder-to-video-windows-free
string registryPath = "Software\\screen-capture-recorder";
@ -64,14 +64,14 @@ public string GetFFmpegCommands()
if (!IsLossless && FFmpeg.UseCustomCommands && !string.IsNullOrEmpty(FFmpeg.CustomCommands))
{
commands = FFmpeg.CustomCommands.
Replace("$fps$", FPS.ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace("$area_x$", CaptureArea.X.ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace("$area_y$", CaptureArea.Y.ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace("$area_width$", CaptureArea.Width.ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace("$area_height$", CaptureArea.Height.ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace("$cursor$", DrawCursor ? "1" : "0", StringComparison.InvariantCultureIgnoreCase).
Replace("$duration$", Duration.ToString("0.0", CultureInfo.InvariantCulture), StringComparison.InvariantCultureIgnoreCase).
Replace("$output$", Path.ChangeExtension(OutputPath, FFmpeg.Extension), StringComparison.InvariantCultureIgnoreCase);
Replace("$fps$", FPS.ToString(), StringComparison.OrdinalIgnoreCase).
Replace("$area_x$", CaptureArea.X.ToString(), StringComparison.OrdinalIgnoreCase).
Replace("$area_y$", CaptureArea.Y.ToString(), StringComparison.OrdinalIgnoreCase).
Replace("$area_width$", CaptureArea.Width.ToString(), StringComparison.OrdinalIgnoreCase).
Replace("$area_height$", CaptureArea.Height.ToString(), StringComparison.OrdinalIgnoreCase).
Replace("$cursor$", DrawCursor ? "1" : "0", StringComparison.OrdinalIgnoreCase).
Replace("$duration$", Duration.ToString("0.0", CultureInfo.InvariantCulture), StringComparison.OrdinalIgnoreCase).
Replace("$output$", Path.ChangeExtension(OutputPath, FFmpeg.Extension), StringComparison.OrdinalIgnoreCase);
}
else
{
@ -97,7 +97,7 @@ public string GetFFmpegArgs(bool isCustom = false)
{
if (FFmpeg.IsVideoSourceSelected)
{
if (FFmpeg.VideoSource.Equals(FFmpegCLIManager.SourceGDIGrab, StringComparison.InvariantCultureIgnoreCase))
if (FFmpeg.VideoSource.Equals(FFmpegCLIManager.SourceGDIGrab, StringComparison.OrdinalIgnoreCase))
{
string x = isCustom ? "$area_x$" : CaptureArea.X.ToString();
string y = isCustom ? "$area_y$" : CaptureArea.Y.ToString();

2
ShareX.Steam/Helpers.cs
View file

@ -120,7 +120,7 @@ public static bool IsCommandExist(string[] args, string command)
{
if (args != null && !string.IsNullOrEmpty(command))
{
return args.Any(arg => !string.IsNullOrEmpty(arg) && arg.Equals(command, StringComparison.InvariantCultureIgnoreCase));
return args.Any(arg => !string.IsNullOrEmpty(arg) && arg.Equals(command, StringComparison.OrdinalIgnoreCase));
}
return false;

2
ShareX.UploadersLib/FileUploaders/Dropbox.cs
View file

@ -279,7 +279,7 @@ public bool IsExists(string path)
{
DropboxMetadata metadata = GetMetadata(path);
return metadata != null && !metadata.tag.Equals("deleted", StringComparison.InvariantCultureIgnoreCase);
return metadata != null && !metadata.tag.Equals("deleted", StringComparison.OrdinalIgnoreCase);
}
public string CreateShareableLink(string path, bool directLink)

6
ShareX.UploadersLib/FileUploaders/GfycatUploader.cs
View file

@ -230,7 +230,7 @@ private void WaitForTranscode(string name, UploadResult result)
result.IsSuccess = false;
break;
}
else if (response.Task.Equals("error", StringComparison.InvariantCultureIgnoreCase))
else if (response.Task.Equals("error", StringComparison.OrdinalIgnoreCase))
{
Errors.Add(response.Description);
result.IsSuccess = false;
@ -242,8 +242,8 @@ private void WaitForTranscode(string name, UploadResult result)
result.URL = "https://gfycat.com/" + response.GfyName;
break;
}
else if ((response.Task.Equals("NotFoundo", StringComparison.InvariantCultureIgnoreCase) ||
response.Task.Equals("NotFound", StringComparison.InvariantCultureIgnoreCase)) && iterations > 5)
else if ((response.Task.Equals("NotFoundo", StringComparison.OrdinalIgnoreCase) ||
response.Task.Equals("NotFound", StringComparison.OrdinalIgnoreCase)) && iterations > 5)
{
Errors.Add("Gfy not found");
result.IsSuccess = false;

4
ShareX.UploadersLib/Forms/UploadersConfigForm.cs
View file

@ -270,7 +270,7 @@ private void LoadTextUploaderSettings()
for (int i = 0; i < cbPastebinSyntax.Items.Count; i++)
{
PastebinSyntaxInfo pastebinSyntaxInfo = (PastebinSyntaxInfo)cbPastebinSyntax.Items[i];
if (pastebinSyntaxInfo.Value.Equals(Config.PastebinSettings.TextFormat, StringComparison.InvariantCultureIgnoreCase))
if (pastebinSyntaxInfo.Value.Equals(Config.PastebinSettings.TextFormat, StringComparison.OrdinalIgnoreCase))
{
cbPastebinSyntax.SelectedIndex = i;
break;
@ -543,7 +543,7 @@ private void LoadFileUploaderSettings()
cbAmazonS3Endpoints.Items.AddRange(AmazonS3.Endpoints.ToArray());
for (int i = 0; i < cbAmazonS3Endpoints.Items.Count; i++)
{
if (((AmazonS3Endpoint)cbAmazonS3Endpoints.Items[i]).Endpoint.Equals(Config.AmazonS3Settings.Endpoint, StringComparison.InvariantCultureIgnoreCase))
if (((AmazonS3Endpoint)cbAmazonS3Endpoints.Items[i]).Endpoint.Equals(Config.AmazonS3Settings.Endpoint, StringComparison.OrdinalIgnoreCase))
{
cbAmazonS3Endpoints.SelectedIndex = i;
break;

2
ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs
View file

@ -69,7 +69,7 @@ private void ImgurFillAlbumList()
lvi.SubItems.Add(album.title ?? "");
lvi.SubItems.Add(album.description ?? "");
lvi.Selected = Config.ImgurSelectedAlbum != null && !string.IsNullOrEmpty(Config.ImgurSelectedAlbum.id) &&
album.id.Equals(Config.ImgurSelectedAlbum.id, StringComparison.InvariantCultureIgnoreCase);
album.id.Equals(Config.ImgurSelectedAlbum.id, StringComparison.OrdinalIgnoreCase);
lvi.Tag = album;
lvImgurAlbumList.Items.Add(lvi);
}

2
ShareX.UploadersLib/ImageUploaders/Imgur.cs
View file

@ -373,7 +373,7 @@ private UploadResult InternalUpload(Stream stream, string fileName, bool refresh
if (errorData != null)
{
if (UploadMethod == AccountType.User && refreshTokenOnError &&
((string)errorData.error).Equals("The access token provided is invalid.", StringComparison.InvariantCultureIgnoreCase) &&
((string)errorData.error).Equals("The access token provided is invalid.", StringComparison.OrdinalIgnoreCase) &&
RefreshAccessToken())
{
DebugHelper.WriteLine("Imgur access token refreshed, reuploading image.");

2
ShareX.UploadersLib/TextUploaders/Hastebin.cs
View file

@ -92,7 +92,7 @@ public override UploadResult UploadText(string text, string fileName)
{
string ext = FileHelpers.GetFileNameExtension(fileName);
if (!string.IsNullOrEmpty(ext) && !ext.Equals("txt", StringComparison.InvariantCultureIgnoreCase))
if (!string.IsNullOrEmpty(ext) && !ext.Equals("txt", StringComparison.OrdinalIgnoreCase))
{
syntaxHighlighting = ext.ToLowerInvariant();
}

2
ShareX.UploadersLib/TextUploaders/Upaste.cs
View file

@ -89,7 +89,7 @@ public override UploadResult UploadText(string text, string fileName)
if (response != null)
{
if (response.status.Equals("success", StringComparison.InvariantCultureIgnoreCase))
if (response.status.Equals("success", StringComparison.OrdinalIgnoreCase))
{
ur.URL = response.paste.link;
}

2
ShareX.UploadersLib/URLShorteners/IsgdURLShortener.cs
View file

@ -56,7 +56,7 @@ public override UploadResult ShortenURL(string url)
result.Response = SendRequest(HttpMethod.GET, APIURL, arguments);
if (!result.Response.StartsWith("Error:", StringComparison.InvariantCultureIgnoreCase))
if (!result.Response.StartsWith("Error:", StringComparison.OrdinalIgnoreCase))
{
result.ShortenedURL = result.Response;
}

2
ShareX/CaptureHelpers/CaptureBase.cs
View file

@ -138,7 +138,7 @@ protected TaskMetadata CreateMetadata(Rectangle insideRect, string ignoreProcess
IntPtr handle = NativeMethods.GetForegroundWindow();
WindowInfo windowInfo = new WindowInfo(handle);
if ((ignoreProcess == null || !windowInfo.ProcessName.Equals(ignoreProcess, StringComparison.InvariantCultureIgnoreCase)) &&
if ((ignoreProcess == null || !windowInfo.ProcessName.Equals(ignoreProcess, StringComparison.OrdinalIgnoreCase)) &&
(insideRect.IsEmpty || windowInfo.Rectangle.Contains(insideRect)))
{
metadata.UpdateInfo(windowInfo);

4
ShareX/Forms/FileExistForm.cs
View file

@ -94,7 +94,7 @@ private void Cancel()
private void txtNewName_TextChanged(object sender, EventArgs e)
{
string newFileName = txtNewName.Text;
btnNewName.Enabled = !string.IsNullOrEmpty(newFileName) && !newFileName.Equals(fileName, StringComparison.InvariantCultureIgnoreCase);
btnNewName.Enabled = !string.IsNullOrEmpty(newFileName) && !newFileName.Equals(fileName, StringComparison.OrdinalIgnoreCase);
btnNewName.Text = Resources.FileExistForm_txtNewName_TextChanged_Use_new_name__ + GetNewFileName();
}
@ -114,7 +114,7 @@ private void txtNewName_KeyUp(object sender, KeyEventArgs e)
if (!string.IsNullOrEmpty(newFileName))
{
if (newFileName.Equals(fileName, StringComparison.InvariantCultureIgnoreCase))
if (newFileName.Equals(fileName, StringComparison.OrdinalIgnoreCase))
{
Close();
}

2
ShareX/Forms/QRCodeForm.cs
View file

@ -214,7 +214,7 @@ private void tsmiSaveAs_Click(object sender, EventArgs e)
{
string filePath = sfd.FileName;
if (filePath.EndsWith("svg", StringComparison.InvariantCultureIgnoreCase))
if (filePath.EndsWith("svg", StringComparison.OrdinalIgnoreCase))
{
BarcodeWriterSvg writer = new BarcodeWriterSvg
{

2
ShareX/Forms/TaskSettingsForm.cs
View file

@ -1505,7 +1505,7 @@ private void UpdateUploaderFilterFields(UploaderFilter filter)
for (int i = 0; i < cbUploaderFiltersDestination.Items.Count; i++)
{
if (cbUploaderFiltersDestination.Items[i] is IGenericUploaderService service &&
service.ServiceIdentifier.Equals(filter.Uploader, StringComparison.InvariantCultureIgnoreCase))
service.ServiceIdentifier.Equals(filter.Uploader, StringComparison.OrdinalIgnoreCase))
{
cbUploaderFiltersDestination.SelectedIndex = i;
break;

2
ShareX/HotkeyManager.cs
View file

@ -190,7 +190,7 @@ public void ShowFailedHotkeys()
string[] processNames = new string[] { "ShareX", "OneDrive", "Dropbox", "Greenshot", "ScreenshotCaptor", "FSCapture", "Snagit32", "puush", "Lightshot" };
int ignoreProcess = Process.GetCurrentProcess().Id;
List<string> conflictProcessNames = Process.GetProcesses().Where(x => x.Id != ignoreProcess && !string.IsNullOrEmpty(x.ProcessName) &&
processNames.Any(x2 => x.ProcessName.Equals(x2, StringComparison.InvariantCultureIgnoreCase))).
processNames.Any(x2 => x.ProcessName.Equals(x2, StringComparison.OrdinalIgnoreCase))).
Select(x => string.Format("{0} ({1})", x.MainModule.FileVersionInfo.ProductName, x.MainModule.ModuleName)).Distinct().ToList();
if (conflictProcessNames != null && conflictProcessNames.Count > 0)

2
ShareX/Program.cs
View file

@ -590,7 +590,7 @@ public static bool WritePersonalPathConfig(string path)
{
string currentPath = ReadPersonalPathConfig();
if (!path.Equals(currentPath, StringComparison.InvariantCultureIgnoreCase))
if (!path.Equals(currentPath, StringComparison.OrdinalIgnoreCase))
{
try
{

4
ShareX/ScreenRecordManager.cs
View file

@ -340,7 +340,7 @@ private static void StartRecording(ScreenRecordOutput outputType, TaskSettings t
string currentFileName = Path.GetFileNameWithoutExtension(path);
string ext = Path.GetExtension(path);
if (!currentFileName.Equals(customFileName, StringComparison.InvariantCultureIgnoreCase))
if (!currentFileName.Equals(customFileName, StringComparison.OrdinalIgnoreCase))
{
path = FileHelpers.RenameFile(path, customFileName + ext);
}
@ -384,7 +384,7 @@ private static string ProcessTwoPassEncoding(string input, TaskMetadata metadata
}
finally
{
if (deleteInputFile && !input.Equals(output, StringComparison.InvariantCultureIgnoreCase) && File.Exists(input))
if (deleteInputFile && !input.Equals(output, StringComparison.OrdinalIgnoreCase) && File.Exists(input))
{
File.Delete(input);
}

2
ShareX/SettingManager.cs
View file

@ -279,7 +279,7 @@ private static void UploadersConfigBackwardCompatibilityTasks()
foreach (AmazonS3Endpoint endpoint in AmazonS3.Endpoints)
{
if (endpoint.Region != null && endpoint.Region.Equals(UploadersConfig.AmazonS3Settings.Endpoint, StringComparison.InvariantCultureIgnoreCase))
if (endpoint.Region != null && endpoint.Region.Equals(UploadersConfig.AmazonS3Settings.Endpoint, StringComparison.OrdinalIgnoreCase))
{
UploadersConfig.AmazonS3Settings.Endpoint = endpoint.Endpoint;
UploadersConfig.AmazonS3Settings.Region = endpoint.Region;

6
ShareX/ShareXCLIManager.cs
View file

@ -94,7 +94,7 @@ private TaskSettings FindCLITask(List<CLICommand> commands)
private bool CheckCustomUploader(CLICommand command)
{
if (command.Command.Equals("CustomUploader", StringComparison.InvariantCultureIgnoreCase))
if (command.Command.Equals("CustomUploader", StringComparison.OrdinalIgnoreCase))
{
if (!string.IsNullOrEmpty(command.Parameter) && command.Parameter.EndsWith(".sxcu", StringComparison.OrdinalIgnoreCase))
{
@ -109,7 +109,7 @@ private bool CheckCustomUploader(CLICommand command)
private bool CheckImageEffect(CLICommand command)
{
if (command.Command.Equals("ImageEffect", StringComparison.InvariantCultureIgnoreCase))
if (command.Command.Equals("ImageEffect", StringComparison.OrdinalIgnoreCase))
{
if (!string.IsNullOrEmpty(command.Parameter) && command.Parameter.EndsWith(".sxie", StringComparison.OrdinalIgnoreCase))
{
@ -160,7 +160,7 @@ private async Task<bool> CheckCLIWorkflow(CLICommand command)
private bool CheckNativeMessagingInput(CLICommand command)
{
if (command.Command.Equals("NativeMessagingInput", StringComparison.InvariantCultureIgnoreCase))
if (command.Command.Equals("NativeMessagingInput", StringComparison.OrdinalIgnoreCase))
{
if (!string.IsNullOrEmpty(command.Parameter) && command.Parameter.EndsWith(".json", StringComparison.OrdinalIgnoreCase))
{