Fix all recent bugs. Shift to Invidious API.

[nimcoon.git] / src / nimcoon.nim

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index cc0bd7eb5acbee62703806c8f1f345fa17b4eb00..45fca1748c1f280e51c19dd5b65f327c4c441035 100644 (file)
--- a/src/nimcoon.nim
+++ b/src/nimcoon.nim
@@ -4,14 +4,24 @@ import
   strutils,
   tables
 
-import config
-import lib
+import
+  config,
+  lib,
+  types,
+  youtube
 
 
 proc parseArguments(): CommandLineOptions =
+
   var
     searchQuery = ""
-    options = to_table({"musicOnly": false, "feelingLucky": false, "fullScreen": false, "download": false})
+    options = to_table({
+      "musicOnly": false,
+      "feelingLucky": false,
+      "fullScreen": false,
+      "download": false,
+      "non-interactive": false
+    })
 
   for kind, key, value in getopt():
     case kind
@@ -23,19 +33,25 @@ proc parseArguments(): CommandLineOptions =
       of "l", "lucky": options["feelingLucky"] = true
       of "f", "full-screen": options["fullScreen"] = true
       of "d", "download": options["download"] = true
+      of "n", "non-interactive": options["non-interactive"] = true
     of cmdEnd: discard
 
-  return (searchQuery, options)
+  if searchQuery == "":
+    stderr.writeLine "NimCoon doesn't permit browsing. You must provide a search query."
+    quit(1)
+
+  (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,16 +61,24 @@ 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 = getSearchResults(searchQuery)
+  if options["non-interactive"]:
+    for index, (title, url) in searchResults:
+      echo title
+      echo url
+      echo ""
     quit(0)
 
-  let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))
+  let numResults = min(limit, len(searchResults))
 
-  present(searchResults, options, (0, limit-1), player)
+  present(searchResults, options, (0, numResults-1), player)
 
 
 when isMainModule: