X-Git-Url: https://njoseph.me/gitweb/nimcoon.git/blobdiff_plain/86e6cb72964db0443c6b5527892f49721079f72a..fabf02942a6fbc3004f6fe5894a489cbbe84fe42:/src/nimcoon.nim

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index 265409d..4f75d82 100644
--- a/src/nimcoon.nim
+++ b/src/nimcoon.nim
@@ -4,14 +4,17 @@ 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,8 +26,13 @@ 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
 
+  if searchQuery == "":
+    stderr.writeLine "NimCoon doesn't permit browsing. You must provide a search query."
+    quit(1)
+
   (searchQuery, options)
 
 
@@ -45,16 +53,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)
     quit(0)
 
-  let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))
+  let searchResults = getSearchResults(searchQuery)
+  if options["non-interactive"]:
+    for index, (title, url) in searchResults:
+      echo title
+      echo url
+      echo ""
+    quit(0)
+
+  let numResults = min(limit, len(searchResults))
 
-  present(searchResults, options, (0, limit-1), player)
+  present(searchResults, options, (0, numResults-1), player)
 
 
 when isMainModule: