Make options a dictionary and add validation

Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>

diff --git a/src/lib.nim b/src/lib.nim
index c737f0242ef157c4d6560865f2979a1a201e24a1..83154737295ab7f25e9d5957245591cd3f550a7e 100644 (file)
--- a/src/lib.nim
+++ b/src/lib.nim
@@ -8,6 +8,7 @@ import
   std/[terminal],
   strtabs,
   strutils,
+  tables,
   uri,
   xmltree
 
@@ -15,7 +16,8 @@ import config
 
 type
   SearchResult* = tuple[title: string, url: string]
-  CommandLineOptions* = tuple[searchQuery: string, musicOnly: bool, feelingLucky: bool, fullScreen: bool]
+  Options* = Table[string, bool]
+  CommandLineOptions* = tuple[searchQuery: string, options: Options]
 
 let processOptions = {poStdErrToStdOut, poUsePath}
 

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index 8b1ba591f166a0545053cc420ecf12149c5847ab..2143c12ad6c9d990e15e379b65dd701fc5e32098 100644 (file)
--- a/src/nimcoon.nim
+++ b/src/nimcoon.nim
@@ -1,17 +1,18 @@
 import
   parseopt,
   std/[terminal],
-  strutils
+  strformat,
+  strutils,
+  tables
 
 import config
 import lib
 
-proc parseOptions(): CommandLineOptions =
+
+proc parseArguments(): CommandLineOptions =
   var
     searchQuery = ""
-    musicOnly = false
-    feelingLucky = false
-    fullScreen = false
+    options = to_table({"musicOnly": false, "feelingLucky": false, "fullScreen": false, "download": false})
 
   for kind, key, value in getopt():
     case kind
@@ -19,19 +20,32 @@ proc parseOptions(): CommandLineOptions =
       searchQuery = key
     of cmdShortOption, cmdLongOption:
       case key
-      of "m", "music": musicOnly = true
-      of "l", "lucky": feelingLucky = true
-      of "f", "full-screen": fullScreen = true
-    of cmdEnd:
-      discard
+      of "m", "music": options["musicOnly"] = true
+      of "l", "lucky": options["feelingLucky"] = true
+      of "f", "full-screen": options["fullScreen"] = true
+      of "d", "download": options["download"] = true
+    of cmdEnd: discard
+
+  return (searchQuery, options)
 
-  return (searchQuery, musicOnly, feelingLucky, fullScreen)
+
+proc isValidOptions*(options: Options): bool =
+  # Check for invalid combinations of options
+  var invalidCombinations = [("musicOnly", "fullScreen")]
+  for combination in invalidCombinations:
+    if options[combination[0]] and options[combination[1]]:
+     stderr.writeLine fmt"Incompatible options provided: {combination[0]} and {combination[1]}"
+     return false
+  return true
 
 
 proc main() =
   let
     player = selectMediaPlayer()
-    (searchQuery, musicOnly, feelingLucky, fullScreen) = parseOptions()
+    (searchQuery, options) = parseArguments()
+
+  if(not isValidOptions(options)):
+    quit(1)
 
   if searchQuery.startswith("https:") or searchQuery.startswith("magnet:"):
     directPlay(searchQuery, player)
@@ -40,7 +54,7 @@ proc main() =
   let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))
 
   proc getUserInput(): string =
-    if feelingLucky: "0"
+    if options["feelingLucky"]: "0"
     else:
       presentVideoOptions(searchResults[..(limit-1)])
       stdout.styledWrite(fgYellow, "Choose video number: ")
@@ -49,8 +63,8 @@ proc main() =
   # This is a pure function with no side effects
   func buildArgs(number: int): seq[string] =
     var args = @[searchResults[number].url]
-    if musicOnly: args.add("--no-video")
-    if fullScreen: args.add("--fullscreen")
+    if options["musicOnly"]: args.add("--no-video")
+    if options["fullScreen"]: args.add("--fullscreen")
     return args
 
   while(true):
@@ -66,7 +80,7 @@ proc main() =
     # Play the video using the preferred/available media player
     let videoNumber = parseInt(userInput)
     play(player, buildArgs(videoNumber), searchResults[videoNumber].title)
-    if feelingLucky:
+    if options["feelingLucky"]:
       break
 
 

diff --git a/tests/tests.nim b/tests/tests.nim
index a218596fd0543225f806a5afebb599b4449a7879..dad726cdd28268341a70c394fb96d9447a54db46 100644 (file)
--- a/tests/tests.nim
+++ b/tests/tests.nim
@@ -1,6 +1,9 @@
-import unittest
+import
+  tables,
+  unittest
 
 import lib
+import nimcoon
 
 suite "Playing direct links":
 
@@ -8,3 +11,9 @@ suite "Playing direct links":
     let expected = "https://www.youtube.com/watch?v=QOEMv0S8AcA"
     check(sanitizeURL("https://youtu.be/QOEMv0S8AcA") == expected)
     check(sanitizeURL("https://www.youtube.com/watch\\?v\\=QOEMv0S8AcA") == expected)
+
+  test "validate options":
+      let invalidOptions = to_table({"musicOnly": true, "feelingLucky": false, "fullScreen": true, "download": false})
+      check(not isValidOptions(invalidOptions))
+      let validOptions = to_table({"musicOnly": false, "feelingLucky": true, "fullScreen": true, "download": true})
+      check(isValidOptions(validOptions))