Removed usage of ArgumentParser since it is overhead to use it in suc…

…h small tools. Added own arguments parsing instead.

Package.swift

@@ -85,7 +85,6 @@ let package = Package(
  targets: ["RHVoiceSwift"])
  ],
  dependencies: [
- .package(url: "https://github.com/apple/swift-argument-parser", from: "1.3.1")
  ],
  targets: [
  .target(
@@ -182,7 +181,6 @@ let package = Package(
  .executableTarget(
  name: "RHVoiceSwiftSample",
  dependencies: [
- .product(name: "ArgumentParser", package: "swift-argument-parser"),
  .target(name: "RHVoiceSwift")
  ],
  path: "Sources/RHVoiceSwiftSample",
@@ -199,7 +197,6 @@ let package = Package(
  .executableTarget(
  name: "PackDataExecutable",
  dependencies: [
- .product(name: "ArgumentParser", package: "swift-argument-parser")
  ],
  path: "Sources/Plugins/PackDataExecutable"
  ),

Sources/Plugins/PackDataExecutable/PackDataExecutable.swift

@@ -6,22 +6,62 @@
 // Copyright (C) 2022 Olga Yakovleva <olga@rhvoice.org>
 
 import Foundation
-import ArgumentParser
 
 @main
-struct PackDataExecutable: ParsableCommand {
+struct PackDataExecutable {
 
- @Option(help: "Input containing the data files")
- var input: String
+ private enum PackDataError: Error {
+ case runtimeError(String)
+ }
+
+ /// Input containing the data files
+ private var input: String
+
+ /// Directory containing the output files
+ private var output: String
 
- @Option(help: "Directory containing the output files")
- var output: String
+ /// list of languages that should copied")
+ private var languages: String
 
- @Option(help: "list of languages that should copied")
- var languages: String
+ /// List of voices that should copied
+ private var voices: String
 
- @Option(help: "list of voices that should copied")
- var voices: String
+ static func main() throws {
+ let arguments = CommandLine.arguments
+ var input: String?
+ var output: String?
+ var languages: String?
+ var voices: String?
+
+ for (index, argument) in arguments.enumerated() {
+ switch argument {
+ case "--input":
+ input = arguments[index + 1]
+ case "--output":
+ output = arguments[index + 1]
+ case "--languages":
+ languages = arguments[index + 1]
+ case "--voices":
+ voices = arguments[index + 1]
+ default:
+ break
+ }
+ }
+
+ guard let input,
+ let output,
+ let languages,
+ let voices else {
+ throw PackDataError.runtimeError("Not enough arguments!")
+ }
+
+ let executable = PackDataExecutable(input: input,
+ output: output,
+ languages: languages,
+ voices: voices)
+
+ try executable.run()
+ }
 
  func run() throws {
  do {

Sources/RHVoiceSwiftSample/RHVoiceSwiftSample.swift

@@ -6,13 +6,12 @@
 //
 
 import Foundation
-import ArgumentParser
 import RHVoiceSwift
 
 @main
-struct PackDataExecutable: ParsableCommand {
+struct PackDataExecutable {
 
- var dataPath: String {
+ static var dataPath: String {
  let fileUrl = URL(fileURLWithPath: #file)
  .deletingLastPathComponent()
  .deletingLastPathComponent()
@@ -21,7 +20,7 @@ struct PackDataExecutable: ParsableCommand {
  return fileUrl.path + "/RHVoice/RHVoice/data"
  }
 
- func run() throws {
+ static func main() throws {
  var params = RHVoiceSwift.RHSpeechSynthesizer.Params.default
 
  params.dataPath = dataPath