Cleanup argument parser usage

Frizlab · Frizlab · commit 2808aabec6e9 · 2024-05-13T13:43:23.000+02:00
diff --git a/LocMapper CLI/Commands/Experimental.swift b/LocMapper CLI/Commands/Experimental.swift
@@ -36,7 +36,7 @@ struct Experimental : ParsableCommand {
 		]
 	)
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
 }
diff --git a/LocMapper CLI/Commands/Experimental/ConvertStdreflocToXibrefloc.swift b/LocMapper CLI/Commands/Experimental/ConvertStdreflocToXibrefloc.swift
@@ -28,16 +28,16 @@ struct ConvertStdreflocToXibrefloc : ParsableCommand {
 		abstract: "Does the inverse of convert_xibrefloc_to_stdrefloc."
 	)
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
-	@Argument()
+	@Argument
 	var inputFile: String
 	
-	@Argument()
+	@Argument
 	var outputFile: String
 	
-	@Argument()
+	@Argument
 	var languagesNames: [String]
 	
 	func run() throws {
diff --git a/LocMapper CLI/Commands/Experimental/ConvertXibreflocToStdrefloc.swift b/LocMapper CLI/Commands/Experimental/ConvertXibreflocToStdrefloc.swift
@@ -28,16 +28,16 @@ struct ConvertXibreflocToStdrefloc : ParsableCommand {
 		abstract: "Take a XibLoc-styled RefLoc (with tokens for plurals, gender, etc.) and convert it to a more usual format (one key per plural/gender/etc. variations)."
 	)
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
-	@Argument()
+	@Argument
 	var inputFile: String
 	
-	@Argument()
+	@Argument
 	var outputFile: String
 	
-	@Argument()
+	@Argument
 	var languagesNames: [String]
 	
 	func run() throws {
diff --git a/LocMapper CLI/Commands/Experimental/CreateInitialAndroidMappingFromStdRefLoc.swift b/LocMapper CLI/Commands/Experimental/CreateInitialAndroidMappingFromStdRefLoc.swift
@@ -25,10 +25,10 @@ struct CreateInitialAndroidMappingFromStdRefLoc : ParsableCommand {
 	
 	static var configuration = CommandConfiguration(commandName: "create_initial_android_mapping_from_std_ref_loc")
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
-	@Argument()
+	@Argument
 	var transformedFilePath: String
 	
 	func run() throws {
diff --git a/LocMapper CLI/Commands/Experimental/GitUnfriendly.swift b/LocMapper CLI/Commands/Experimental/GitUnfriendly.swift
@@ -25,10 +25,10 @@ struct GitUnfriendly : ParsableCommand {
 	
 	static var configuration = CommandConfiguration(commandName: "git_unfriendly")
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
-	@Argument()
+	@Argument
 	var filePath: String
 	
 	func run() throws {
diff --git a/LocMapper CLI/Commands/Experimental/TransformMappings.swift b/LocMapper CLI/Commands/Experimental/TransformMappings.swift
@@ -25,13 +25,13 @@ struct TransformMappings : ParsableCommand {
 	
 	static var configuration = CommandConfiguration(commandName: "transform_mappings")
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
-	@Option()
+	@Option
 	var keysMappingFile: String?
 	
-	@Argument()
+	@Argument
 	var transformedFilePath: String
 	
 	func run() throws {
diff --git a/LocMapper CLI/Commands/Experimental/UploadXibreflocToLokalise.swift b/LocMapper CLI/Commands/Experimental/UploadXibreflocToLokalise.swift
@@ -32,19 +32,19 @@ struct UploadXibreflocToLokalise : ParsableCommand {
 			"""
 	)
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
-	@Argument()
+	@Argument
 	var lokalizeReadAndWriteToken: String
 	
-	@Argument()
+	@Argument
 	var lokalizeProjectID: String
 	
-	@Argument()
+	@Argument
 	var inputFile: String
 	
-	@Argument()
+	@Argument
 	var refLocToLokalizeLanguageNameMapping: [String]
 	
 	func run() throws {
diff --git a/LocMapper CLI/Commands/ExportToAndroid.swift b/LocMapper CLI/Commands/ExportToAndroid.swift
@@ -28,19 +28,19 @@ struct ExportToAndroid : ParsableCommand {
 		abstract: "Exports the locs from an lcm file in an android project."
 	)
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
-	@Option()
+	@Option
 	var stringsFilenames: [String]
 	
-	@Argument()
+	@Argument
 	var inputFile: String
 	
-	@Argument()
+	@Argument
 	var rootFolder: String
 	
-	@Argument()
+	@Argument
 	var folderNameToLanguageNameMapping: [String]
 	
 	func run() throws {
diff --git a/LocMapper CLI/Commands/ExportToXcode.swift b/LocMapper CLI/Commands/ExportToXcode.swift
@@ -31,8 +31,8 @@ struct ExportToXcode : ParsableCommand {
 			"""
 	)
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
 	@Option
 	var encoding = "utf16"
diff --git a/LocMapper CLI/Commands/Lint.swift b/LocMapper CLI/Commands/Lint.swift
@@ -23,8 +23,8 @@ import LocMapper
 
 struct Lint : ParsableCommand {
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
 	@Flag
 	var detectUnusedRefloc = false
diff --git a/LocMapper CLI/Commands/MergeAndroidLocs.swift b/LocMapper CLI/Commands/MergeAndroidLocs.swift
@@ -28,8 +28,8 @@ struct MergeAndroidLocs : ParsableCommand {
 		abstract: "Merge the strings from an android project in a locmapper file."
 	)
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
 	@Option
 	var resFolder = [String]()
diff --git a/LocMapper CLI/Commands/MergeLokaliseTradsAsStdrefloc.swift b/LocMapper CLI/Commands/MergeLokaliseTradsAsStdrefloc.swift
@@ -28,8 +28,8 @@ struct MergeLokaliseTradsAsStdrefloc : ParsableCommand {
 		abstract: "Fetch ref loc from lokalise and merge them in an lcm file, converted into the StdRefLoc format."
 	)
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
 	@Option
 	var mergeStyle = LocFile.MergeStyle.add
diff --git a/LocMapper CLI/Commands/MergeLokaliseTradsAsXibrefloc.swift b/LocMapper CLI/Commands/MergeLokaliseTradsAsXibrefloc.swift
@@ -28,8 +28,8 @@ struct MergeLokaliseTradsAsXibrefloc : ParsableCommand {
 		abstract: "Fetch ref loc from lokalise and merge them in an lcm file, converted into the XibRefLoc format."
 	)
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
 	@Option
 	var mergeStyle = LocFile.MergeStyle.add
diff --git a/LocMapper CLI/Commands/MergeXcodeLocs.swift b/LocMapper CLI/Commands/MergeXcodeLocs.swift
@@ -32,22 +32,22 @@ struct MergeXcodeLocs : ParsableCommand {
 			"""
 	)
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
 	@Option(help: "List of paths to exclude when reading the project.")
 	var excludeList: [String]
 	
 	@Option(help: "List of paths to only include when reading the project.")
 	var includeList: [String]
 	
-	@Argument()
+	@Argument
 	var rootFolder: String
 	
-	@Argument()
+	@Argument
 	var outputFile: String
 	
-	@Argument()
+	@Argument
 	var lprojNameToLanguageNameMapping: [String]
 	
 	func run() throws {
diff --git a/LocMapper CLI/Commands/StandardizeRefloc.swift b/LocMapper CLI/Commands/StandardizeRefloc.swift
@@ -32,16 +32,16 @@ struct StandardizeRefloc : ParsableCommand {
 			"""
 	)
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
-	@Argument()
+	@Argument
 	var inputFile: String
 	
-	@Argument()
+	@Argument
 	var outputFile: String
 	
-	@Argument()
+	@Argument
 	var languagesNames: [String]
 	
 	func run() throws {
diff --git a/LocMapper CLI/Commands/UpdateXcodeStringsFromCode.swift b/LocMapper CLI/Commands/UpdateXcodeStringsFromCode.swift
@@ -48,7 +48,7 @@ struct UpdateXcodeStringsFromCode : ParsableCommand {
 			"""
 	)
 	
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
 	@Option(help: "The paths in which the lproj files are contained (for the source localizations; storyboards/xibs are localized wherever). Required if the code is not skipped.")
 	var localizablesPath: String?
diff --git a/LocMapper CLI/main.swift b/LocMapper CLI/main.swift
@@ -57,8 +57,8 @@ struct LocMapperCLI : ParsableCommand {
 		+ platformSpecificCommands
 	)
 	
-	@OptionGroup() var csvOptions: CSVOptions
-	@OptionGroup() var logOptions: LoggingOptions
+	@OptionGroup var csvOptions: CSVOptions
+	@OptionGroup var logOptions: LoggingOptions
 	
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ struct Experimental : ParsableCommand {`
`36`	`36`	`]`
`37`	`37`	`)`
`38`	`38`
`39`		`- @OptionGroup() var csvOptions: CSVOptions`
`40`		`- @OptionGroup() var logOptions: LoggingOptions`
	`39`	`+ @OptionGroup var csvOptions: CSVOptions`
	`40`	`+ @OptionGroup var logOptions: LoggingOptions`
`41`	`41`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ struct ExportToXcode : ParsableCommand {`
`31`	`31`	`"""`
`32`	`32`	`)`
`33`	`33`
`34`		`- @OptionGroup() var csvOptions: CSVOptions`
`35`		`- @OptionGroup() var logOptions: LoggingOptions`
	`34`	`+ @OptionGroup var csvOptions: CSVOptions`
	`35`	`+ @OptionGroup var logOptions: LoggingOptions`
`36`	`36`
`37`	`37`	`@Option`
`38`	`38`	`var encoding = "utf16"`