X-Git-Url: http://njoseph.me/gitweb/nimcoon.git/blobdiff_plain/fac67037b78972c2e7960e9db213ba2bb838051e..81fb030b66879a978387ce2e45530318eb4eaa60:/src/nimcoon.nim

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index e860ebe..9b3c6af 100644
--- a/src/nimcoon.nim
+++ b/src/nimcoon.nim
@@ -1,18 +1,29 @@
 import
   parseopt,
-  strformat,
   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,
+      "nonInteractive": false,
+      "autoPlay": false
+    })
 
+  # Non-interactive/Global options
   for kind, key, value in getopt():
     case kind
     of cmdArgument:
@@ -23,19 +34,16 @@ 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["nonInteractive"] = true
+      of "a", "auto-play": options["autoPlay"] = true
     of cmdEnd: discard
 
-  (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]}"
-     result = false
 
 proc main() =
   let
@@ -47,12 +55,25 @@ proc main() =
 
   if searchQuery.startswith("http") or searchQuery.startswith("magnet"):
     if options["download"]:
-      directDownload(sanitizeURL(searchQuery), options["musicOnly"])
+      directDownload(sanitizeURL(searchQuery), options)
     else:
       directPlay(sanitizeURL(searchQuery), player, options)
     quit(0)
 
-  let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))
+  # Take a shortcut and search directly with youtube-dl
+  if options["feelingLucky"]:
+    if options["download"]: luckyDownload(searchQuery, options)
+    else: luckyPlay(searchQuery, player, options)
+    quit(0)
+
+  let searchResults = getSearchResults(searchQuery)
+  if options["nonInteractive"]: # Present in machine-readable format
+    for index, (title, url) in searchResults:
+      echo title
+      echo url
+      echo ""
+    quit(0)
+
   let numResults = min(limit, len(searchResults))
 
   present(searchResults, options, (0, numResults-1), player)