Config rework (part 3)

Author: Decimation

SmartImage/Core/ConfigComponents.cs

@@ -98,7 +98,8 @@ internal static IDictionary<string, string> ConvertComponentsToMap(object obj)
 		}
 
 
-		internal static void WriteComponentsToFile(object obj, string dest) => Collections.WriteDictionary(ConvertComponentsToMap(obj), dest);
+		internal static void WriteComponentsToFile(object obj, string dest) =>
+			Collections.WriteDictionary(ConvertComponentsToMap(obj), dest);
 
 
 		internal static T ReadComponentMapValue<T>(object obj, IDictionary<string, string> cfg, string mname)
@@ -194,28 +195,30 @@ internal static T ReadComponentMapValue<T>(IDictionary<string, string> cfg, stri
 			var parse = ParseComponentValue<T>(rawValue);
 			return parse;
 		}
-		
-		
-		internal static void ReadComponentFromArgument(object obj,IEnumerator<string> argEnumerator)
+
+
+		internal static void ReadComponentFromArgument(object obj, IEnumerator<string> argEnumerator)
 		{
-			var argName               = argEnumerator.Current;
-			
-			var x                      = GetMembers(obj);
-			
-			var correspondingComponent = x.FirstOrDefault(y => y.Attribute.ArgumentName == argName);
+			var parameterName = argEnumerator.Current;
+
+			var members = GetMembers(obj);
 
-			if (correspondingComponent == default) {
+			// Corresponding component
+			var component = members.FirstOrDefault(y => y.Attribute.ParameterName == parameterName);
+
+			if (component == default) {
 				return;
 			}
-			
+
 			argEnumerator.MoveNext();
-			
-			string argValue2 = argEnumerator.Current;
-			var    bf        = correspondingComponent.Member.GetBackingField();
-			
-			var    value     = ConfigComponents.ParseComponentValue(argValue2, bf.FieldType);
-			
-			bf.SetValue(obj, value);
+
+			string argValueRaw = argEnumerator.Current;
+
+			var field = component.Member.GetBackingField();
+
+			var value = ParseComponentValue(argValueRaw, field.FieldType);
+
+			field.SetValue(obj, value);
 		}
 	}
 }

SmartImage/Core/SearchConfig.cs

@@ -60,27 +60,28 @@ private SearchConfig()
 		/// <summary>
 		///     Engines to use for searching
 		/// </summary>
-		[field: ConfigComponent("search_engines", SearchEngineOptions.All, "--search-engines")]
+		[field: ConfigComponent("search_engines", "--search-engines", SearchEngineOptions.All)]
 		public SearchEngineOptions SearchEngines { get; set; }
 
 		/// <summary>
 		///     Engines whose results should be opened in the browser
 		/// </summary>
-		[field: ConfigComponent("priority_engines", SearchEngineOptions.Auto)]
+		[field: ConfigComponent("priority_engines", "--priority-engines", SearchEngineOptions.Auto)]
 		public SearchEngineOptions PriorityEngines { get; set; }
 
 		/// <summary>
 		///     <see cref="ImgurClient" /> API key
 		/// </summary>
-		[field: ConfigComponent("imgur_client_id", Strings.Empty)]
+		[field: ConfigComponent("imgur_client_id", "--saucenao-auth", Strings.Empty)]
 		public string ImgurAuth { get; set; }
 
 		/// <summary>
 		///     <see cref="SauceNaoEngine" /> API key
 		/// </summary>
-		[field: ConfigComponent("saucenao_key", Strings.Empty)]
+		[field: ConfigComponent("saucenao_key", "--imgur-auth", Strings.Empty)]
 		public string SauceNaoAuth { get; set; }
 
+		
 		/// <summary>
 		///     Whether to save passed in arguments (via CLI) to the config file upon exit
 		/// </summary>
@@ -123,10 +124,7 @@ private void ReadFromFile()
 		}
 
 
-		public void Reset()
-		{
-			ConfigComponents.ResetComponents(this);
-		}
+		public void Reset() => ConfigComponents.ResetComponents(this);
 
 
 		public void SaveFile()
@@ -225,44 +223,24 @@ private void ReadFromArguments()
 				return;
 			}
 
-			var       argQueue      = new Queue<string>(args);
+			var argQueue = new Queue<string>(args);
+
 			using var argEnumerator = argQueue.GetEnumerator();
 
 			while (argEnumerator.MoveNext()) {
-				string argValue = argEnumerator.Current;
+				string parameterName = argEnumerator.Current;
 
-				// todo: add to ConfigComponentAttribute
 				ConfigComponents.ReadComponentFromArgument(this, argEnumerator);
-				
-				
-				switch (argValue) {
-					/*case "--search-engines":
-						argEnumerator.MoveNext();
-						string sestr = argEnumerator.Current;
-						SearchEngines = ConfigComponents.ParseComponentValue<SearchEngineOptions>(sestr);
-						break;
-					case "--priority-engines":
-						argEnumerator.MoveNext();
-						string pestr = argEnumerator.Current;
-						PriorityEngines = ConfigComponents.ParseComponentValue<SearchEngineOptions>(pestr);
-						break;
-					case "--saucenao-auth":
-						argEnumerator.MoveNext();
-						string snastr = argEnumerator.Current;
-						SauceNaoAuth = snastr;
-						break;
-					case "--imgur-auth":
-						argEnumerator.MoveNext();
-						string imastr = argEnumerator.Current;
-						ImgurAuth = imastr;
-						break;*/
+
+				// Special cases
+				switch (parameterName) {
+
 					case "--update-cfg":
 						UpdateConfig = true;
 						break;
 
-
 					default:
-						Image = argValue;
+						Image = parameterName;
 						break;
 				}
 			}

SmartImage/Program.cs

@@ -35,6 +35,7 @@ public static class Program
 
 		/*
 		 * --search-engines Iqdb,SauceNao --priority-engines Auto --update-cfg C:\Users\Deci\Desktop\fucking_epic.jpg
+		 * --search-engines All --priority-engines Auto C:\Users\Deci\Desktop\fucking_epic.jpg
 		 */
 
 		private static void Main(string[] args)

SmartImage/Utilities/ConfigComponentAttribute.cs

@@ -17,26 +17,34 @@ internal sealed class ConfigComponentAttribute : Attribute
 	{
 		internal object DefaultValue { get; set; }
 
+		/// <summary>
+		/// Component name
+		/// </summary>
 		internal string Id { get; set; }
 
+
 		internal bool SetDefaultIfNull { get; set; }
 
+
+		/// <summary>
+		/// Parameter name
+		/// </summary>
 		[CanBeNull]
-		internal string ArgumentName { get; set; }
+		internal string ParameterName { get; set; }
 
 
-		internal ConfigComponentAttribute(string id, object defaultValue, bool setDefaultIfNull, string argumentName)
+		internal ConfigComponentAttribute(string id, string parameterName, object defaultValue, bool setDefaultIfNull)
 		{
 			Id               = id;
 			DefaultValue     = defaultValue;
 			SetDefaultIfNull = setDefaultIfNull;
-			ArgumentName     = argumentName;
+			ParameterName    = parameterName;
 		}
 
-		internal ConfigComponentAttribute(string id, object defaultValue, [CanBeNull] string argumentName) : this(id,
-			defaultValue, false, argumentName) { }
+		internal ConfigComponentAttribute(string id, [CanBeNull] string parameterName, object defaultValue) : this(id,
+			parameterName, defaultValue, false) { }
 
 
-		internal ConfigComponentAttribute(string id, object defaultValue) : this(id, defaultValue, null) { }
+		internal ConfigComponentAttribute(string id, object defaultValue) : this(id, null, defaultValue) { }
 	}
 }