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

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index 8b1ba59..9b3c6af 100644
--- a/src/nimcoon.nim
+++ b/src/nimcoon.nim
@@ -1,73 +1,82 @@
 import
   parseopt,
-  std/[terminal],
-  strutils
+  strutils,
+  tables
 
-import config
-import lib
+import
+  config,
+  lib,
+  types,
+  youtube
+
+
+proc parseArguments(): CommandLineOptions =
 
-proc parseOptions(): CommandLineOptions =
   var
     searchQuery = ""
-    musicOnly = false
-    feelingLucky = false
-    fullScreen = 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:
       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 "n", "non-interactive": options["nonInteractive"] = true
+      of "a", "auto-play": options["autoPlay"] = true
+    of cmdEnd: discard
+
+  if searchQuery == "":
+    stderr.writeLine "Nimcoon doesn't permit browsing. You must provide a search query."
+    quit(1)
 
-  return (searchQuery, musicOnly, feelingLucky, fullScreen)
+  (searchQuery, options)
 
 
 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)
+  if searchQuery.startswith("http") or searchQuery.startswith("magnet"):
+    if options["download"]:
+      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)
 
-  proc getUserInput(): string =
-    if feelingLucky: "0"
-    else:
-      presentVideoOptions(searchResults[..(limit-1)])
-      stdout.styledWrite(fgYellow, "Choose video number: ")
-      readLine(stdin)
-
-  # 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")
-    return args
-
-  while(true):
-    let userInput = getUserInput()
-
-    if userInput == "all":
-      for number in 0..(len(searchResults)):
-        play(player, buildArgs(number), searchResults[number].title)
-
-    if userInput == "q":
-      break
-
-    # Play the video using the preferred/available media player
-    let videoNumber = parseInt(userInput)
-    play(player, buildArgs(videoNumber), searchResults[videoNumber].title)
-    if feelingLucky:
-      break
+  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)
 
 
 when isMainModule: