Show the optional arguments

[rbdr/lyricli] / Sources / main.swift

diff --git a/Sources/main.swift b/Sources/main.swift
index 47720ad3a631b15d7feed0637520a729bf3c8662..42d485588fabfcb72c064c0f8748811d9e7fe334 100644 (file)
--- a/Sources/main.swift
+++ b/Sources/main.swift
@@ -21,6 +21,21 @@ func createParser() -> ([String:Option], CommandLineKit) {
 
     parser.addOptions(Array(flags.values))
 
+    parser.formatOutput = {parseString, type in
+
+        var formattedString: String
+
+        switch(type) {
+        case .About:
+            formattedString = "\(parseString) [<artist_name> <song_name>]"
+            break
+        default:
+            formattedString = parseString
+        }
+
+        return parser.defaultFormat(formattedString, type: type)
+    }
+
     return (flags, parser)
 }
 
@@ -80,10 +95,14 @@ func main() {
 
     if let titleFlag = flags["title"] as? BoolOption {
         if titleFlag.value == true {
-            Lyricli.printTitle()
+            Lyricli.showTitle = true
         }
     }
 
+    // Remove any flags so anyone after this gets the unprocessed values
+    let programName: [String] = [CommandLine.arguments[0]]
+    CommandLine.arguments = programName + parser.unparsedArguments
+
     Lyricli.printLyrics()
 }