mirror of
https://github.com/chylex/TweetDuck.git
synced 2025-04-22 18:15:47 +02:00
Move CommandLineArgsParser code to CommandLineArgs
This commit is contained in:
parent
1b239bada1
commit
a51b34b48f
@ -2,6 +2,7 @@
|
||||
using System.Windows.Forms;
|
||||
using TweetDuck.Core.Controls;
|
||||
using TweetDuck.Core.Utils;
|
||||
using TweetDuck.Data;
|
||||
|
||||
namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
sealed partial class DialogSettingsCefArgs : Form{
|
||||
@ -30,7 +31,7 @@ private void btnApply_Click(object sender, EventArgs e){
|
||||
return;
|
||||
}
|
||||
|
||||
int count = CommandLineArgsParser.ReadCefArguments(CefArgs).Count;
|
||||
int count = CommandLineArgs.ReadCefArguments(CefArgs).Count;
|
||||
string prompt = count == 0 && !string.IsNullOrWhiteSpace(prevArgs) ? "All current arguments will be removed. Continue?" : count+(count == 1 ? " argument was" : " arguments were")+" detected. Continue?";
|
||||
|
||||
if (FormMessage.Question("Confirm CEF Arguments", prompt, FormMessage.OK, FormMessage.Cancel)){
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
using System;
|
||||
using System.Text.RegularExpressions;
|
||||
using TweetDuck.Data;
|
||||
|
||||
namespace TweetDuck.Core.Utils{
|
||||
static class CommandLineArgsParser{
|
||||
private static readonly Lazy<Regex> SplitRegex = new Lazy<Regex>(() => new Regex(@"([^=\s]+(?:=(?:\S*""[^""]*?""\S*|\S*))?)", RegexOptions.Compiled), false);
|
||||
|
||||
public static CommandLineArgs ReadCefArguments(string argumentString){
|
||||
CommandLineArgs args = new CommandLineArgs();
|
||||
|
||||
if (string.IsNullOrWhiteSpace(argumentString)){
|
||||
return args;
|
||||
}
|
||||
|
||||
foreach(Match match in SplitRegex.Value.Matches(argumentString)){
|
||||
string matchValue = match.Value;
|
||||
|
||||
int indexEquals = matchValue.IndexOf('=');
|
||||
string key, value;
|
||||
|
||||
if (indexEquals == -1){
|
||||
key = matchValue.TrimStart('-');
|
||||
value = "1";
|
||||
}
|
||||
else{
|
||||
key = matchValue.Substring(0, indexEquals).TrimStart('-');
|
||||
value = matchValue.Substring(indexEquals+1).Trim('"');
|
||||
}
|
||||
|
||||
if (key.Length != 0){
|
||||
args.SetValue(key, value);
|
||||
}
|
||||
}
|
||||
|
||||
return args;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace TweetDuck.Data{
|
||||
sealed class CommandLineArgs{
|
||||
@ -32,6 +33,36 @@ public static void ReadStringArray(char entryChar, string[] array, CommandLineAr
|
||||
}
|
||||
}
|
||||
|
||||
public static CommandLineArgs ReadCefArguments(string argumentString){
|
||||
CommandLineArgs args = new CommandLineArgs();
|
||||
|
||||
if (string.IsNullOrWhiteSpace(argumentString)){
|
||||
return args;
|
||||
}
|
||||
|
||||
foreach(Match match in Regex.Matches(argumentString, @"([^=\s]+(?:=(?:\S*""[^""]*?""\S*|\S*))?)")){
|
||||
string matchValue = match.Value;
|
||||
|
||||
int indexEquals = matchValue.IndexOf('=');
|
||||
string key, value;
|
||||
|
||||
if (indexEquals == -1){
|
||||
key = matchValue.TrimStart('-');
|
||||
value = "1";
|
||||
}
|
||||
else{
|
||||
key = matchValue.Substring(0, indexEquals).TrimStart('-');
|
||||
value = matchValue.Substring(indexEquals+1).Trim('"');
|
||||
}
|
||||
|
||||
if (key.Length != 0){
|
||||
args.SetValue(key, value);
|
||||
}
|
||||
}
|
||||
|
||||
return args;
|
||||
}
|
||||
|
||||
private readonly HashSet<string> flags = new HashSet<string>();
|
||||
private readonly Dictionary<string, string> values = new Dictionary<string, string>();
|
||||
|
||||
|
||||
@ -140,7 +140,7 @@ private static void Main(){
|
||||
#endif
|
||||
};
|
||||
|
||||
CommandLineArgsParser.ReadCefArguments(UserConfig.CustomCefArgs).ToDictionary(settings.CefCommandLineArgs);
|
||||
CommandLineArgs.ReadCefArguments(UserConfig.CustomCefArgs).ToDictionary(settings.CefCommandLineArgs);
|
||||
BrowserUtils.SetupCefArgs(settings.CefCommandLineArgs);
|
||||
|
||||
Cef.EnableHighDPISupport();
|
||||
|
||||
@ -201,7 +201,6 @@
|
||||
</Compile>
|
||||
<Compile Include="Core\Bridge\CallbackBridge.cs" />
|
||||
<Compile Include="Data\CommandLineArgs.cs" />
|
||||
<Compile Include="Core\Utils\CommandLineArgsParser.cs" />
|
||||
<Compile Include="Core\Notification\Screenshot\FormNotificationScreenshotable.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
using TweetDuck.Core.Utils;
|
||||
using TweetDuck.Data;
|
||||
|
||||
namespace UnitTests.Core{
|
||||
[TestClass]
|
||||
public class TestCommandLineArgsParser{
|
||||
[TestMethod]
|
||||
public void TestEmptyString(){
|
||||
Assert.AreEqual(0, CommandLineArgsParser.ReadCefArguments("").Count);
|
||||
Assert.AreEqual(0, CommandLineArgsParser.ReadCefArguments(" ").Count);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestValidString(){
|
||||
CommandLineArgs args = CommandLineArgsParser.ReadCefArguments("--aaa --bbb --first-value=123 --SECOND-VALUE=\"a b c d e\"\r\n--ccc");
|
||||
// cef has no flags, flag arguments have a value of 1
|
||||
// the processing removes all dashes in front of each key
|
||||
|
||||
Assert.AreEqual(5, args.Count);
|
||||
Assert.IsTrue(args.HasValue("aaa"));
|
||||
Assert.IsTrue(args.HasValue("bbb"));
|
||||
Assert.IsTrue(args.HasValue("ccc"));
|
||||
Assert.IsTrue(args.HasValue("first-value"));
|
||||
Assert.IsTrue(args.HasValue("second-value"));
|
||||
Assert.AreEqual("1", args.GetValue("aaa", string.Empty));
|
||||
Assert.AreEqual("1", args.GetValue("bbb", string.Empty));
|
||||
Assert.AreEqual("1", args.GetValue("ccc", string.Empty));
|
||||
Assert.AreEqual("123", args.GetValue("first-value", string.Empty));
|
||||
Assert.AreEqual("a b c d e", args.GetValue("second-value", string.Empty));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -153,5 +153,30 @@ public void TestValidStringArray(){
|
||||
Assert.IsTrue(args.HasValue("-value"));
|
||||
Assert.AreEqual("Here is some text!", args.GetValue("-value", string.Empty));
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestCefEmptyString(){
|
||||
Assert.AreEqual(0, CommandLineArgs.ReadCefArguments("").Count);
|
||||
Assert.AreEqual(0, CommandLineArgs.ReadCefArguments(" ").Count);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestCefValidString(){
|
||||
CommandLineArgs args = CommandLineArgs.ReadCefArguments("--aaa --bbb --first-value=123 --SECOND-VALUE=\"a b c d e\"\r\n--ccc");
|
||||
// cef has no flags, flag arguments have a value of 1
|
||||
// the processing removes all dashes in front of each key
|
||||
|
||||
Assert.AreEqual(5, args.Count);
|
||||
Assert.IsTrue(args.HasValue("aaa"));
|
||||
Assert.IsTrue(args.HasValue("bbb"));
|
||||
Assert.IsTrue(args.HasValue("ccc"));
|
||||
Assert.IsTrue(args.HasValue("first-value"));
|
||||
Assert.IsTrue(args.HasValue("second-value"));
|
||||
Assert.AreEqual("1", args.GetValue("aaa", string.Empty));
|
||||
Assert.AreEqual("1", args.GetValue("bbb", string.Empty));
|
||||
Assert.AreEqual("1", args.GetValue("ccc", string.Empty));
|
||||
Assert.AreEqual("123", args.GetValue("first-value", string.Empty));
|
||||
Assert.AreEqual("a b c d e", args.GetValue("second-value", string.Empty));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -51,7 +51,6 @@
|
||||
<Compile Include="Data\TestCombinedFileStream.cs" />
|
||||
<Compile Include="Core\TestBrowserUtils.cs" />
|
||||
<Compile Include="Data\TestCommandLineArgs.cs" />
|
||||
<Compile Include="Core\TestCommandLineArgsParser.cs" />
|
||||
<Compile Include="Data\TestFileSerializer.cs" />
|
||||
<Compile Include="Data\TestInjectedHTML.cs" />
|
||||
<Compile Include="Data\TestTwoKeyDictionary.cs" />
|
||||
|
||||
Loading…
Reference in New Issue
Block a user