X-Git-Url: https://njoseph.me/gitweb/nimcoon.git/blobdiff_plain/13a4017d99baaf7919263edaf05b13063e91cb8d..25f5a0342dbd064790637fc5c05d8058d4da25f2:/src/nimcoon.nim

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index cc0bd7e..3844d40 100644
--- a/src/nimcoon.nim
+++ b/src/nimcoon.nim
@@ -25,17 +25,17 @@ proc parseArguments(): CommandLineOptions =
       of "d", "download": options["download"] = true
     of cmdEnd: discard
 
-  return (searchQuery, options)
+  (searchQuery, options)
 
 
 proc isValidOptions*(options: Options): bool =
   # Check for invalid combinations of options
   var invalidCombinations = [("musicOnly", "fullScreen"), ("download", "fullScreen")]
+  result = true
   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
+     result = false
 
 proc main() =
   let
@@ -45,11 +45,11 @@ proc main() =
   if(not isValidOptions(options)):
     quit(1)
 
-  if searchQuery.startswith("https:") or searchQuery.startswith("magnet:"):
+  if searchQuery.startswith("http") or searchQuery.startswith("magnet"):
     if options["download"]:
       directDownload(sanitizeURL(searchQuery), options["musicOnly"])
     else:
-      directPlay(sanitizeURL(searchQuery), player, options["musicOnly"])
+      directPlay(sanitizeURL(searchQuery), player, options)
     quit(0)
 
   let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))