Merge pull request #9 from vanyauhalin/search-query

Add the remaining search options

osub/Client/Client.swift

@@ -64,12 +64,31 @@ public final class Client: ClientProtocol {
 
   public func url(path: String, with queryItems: [URLQueryItem]) throws -> URL {
     var url = try url(path: path)
+
     guard !queryItems.isEmpty else {
       return url.absoluteURL
     }
+
+    let queryItems: [URLQueryItem] =
+      [
+        // Crutch. Some items cannot be the first, so it is necessary to insert
+        // a dummy item at the beginning.
+        URLQueryItem(name: "&", value: nil)
+      ]
+      + queryItems.compactMap { queryItem in
+        guard let value = queryItem.value else {
+          return nil
+        }
+        return URLQueryItem(
+          name: queryItem.name,
+          value: value.replacingOccurrences(of: " ", with: "+")
+        )
+      }
+
     guard url.append2(queryItems: queryItems) else {
       throw ClientError.cannotCreateURL
     }
+
     return url.absoluteURL
   }
 

osub/Command/AuthenticationCommand.swift

@@ -256,6 +256,15 @@ extension AuthenticationStatusCommand {
         .remainingDownloads
       ]
     }
+
+    var text: String {
+      switch self {
+      case .remainingDownloads:
+        return "remaining_downloads"
+      case .userID:
+        return "user_id"
+      }
+    }
   }
 }
 

osub/Command/Command.swift

@@ -32,3 +32,40 @@ extension ClientProtocol {
     )
   }
 }
+
+indirect enum ValueName {
+  case array(ValueName)
+  case `enum`
+  case int
+  case path
+  case string
+
+  var rawValue: String {
+    switch self {
+    case .array(let valueName):
+      return "[\(valueName.rawValue)]"
+    case .enum:
+      return "enum"
+    case .int:
+      return "int"
+    case .path:
+      return "path"
+    case .string:
+      return "string"
+    }
+  }
+}
+
+extension ArgumentHelp {
+  init(
+    _ abstract: String = "",
+    discussion: String = "",
+    valueName: ValueName? = nil
+  ) {
+    self.init(
+      abstract,
+      discussion: discussion,
+      valueName: valueName?.rawValue
+    )
+  }
+}

osub/Command/DownloadCommand.swift

@@ -15,7 +15,7 @@ struct DownloadCommand: AsyncParsableCommand {
     name: .shortAndLong,
     help: ArgumentHelp(
       "The file ID from subtitles search results.",
-      valueName: "int"
+      valueName: .int
     )
   )
   var fileID: Int

osub/Command/Formatting.swift

@@ -3,25 +3,23 @@ import TablePrinter
 
 protocol FormattingField: RawRepresentable<String>, CaseIterable, ExpressibleByArgument {
   static var defaultValues: [Self] { get }
+  var text: String { get }
 }
 
 struct FormattingOptions<Field>: ParsableArguments where Field: FormattingField {
   @Option(
     parsing: .upToNextOption,
     help: ArgumentHelp(
       "Space-separated list of fields to print.",
-      discussion: "The list of available fields: \(Field.allValueStrings.joined(separator: ", "))."
+      valueName: .array(.enum)
     )
   )
   var fields = Field.defaultValues
 
   func printer() -> TablePrinter {
     var printer = TablePrinter()
     fields.forEach { field in
-      let header = field
-        .rawValue
-        .replacingOccurrences(of: "_", with: " ")
-        .uppercased()
+      let header = field.text.uppercased()
       printer.append(header)
     }
     printer.next()

osub/Command/LanguagesCommand.swift

@@ -61,5 +61,9 @@ extension LanguagesCommand {
         .name
       ]
     }
+
+    var text: String {
+      rawValue
+    }
   }
 }