Bump version and update changelog

[nimcoon.git] / src / nimcoon.nim

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index 2ddafc94d4384968048b25f2665ea83eb7d413bd..cc0bd7eb5acbee62703806c8f1f345fa17b4eb00 100644 (file)
--- a/src/nimcoon.nim
+++ b/src/nimcoon.nim
@@ -1,7 +1,5 @@
 import
-  os,
   parseopt,
-  std/[terminal],
   strformat,
   strutils,
   tables
@@ -32,14 +30,13 @@ proc parseArguments(): CommandLineOptions =
 
 proc isValidOptions*(options: Options): bool =
   # Check for invalid combinations of options
-  var invalidCombinations = [("musicOnly", "fullScreen")]
+  var invalidCombinations = [("musicOnly", "fullScreen"), ("download", "fullScreen")]
   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
 
-
 proc main() =
   let
     player = selectMediaPlayer()
@@ -49,67 +46,15 @@ proc main() =
     quit(1)
 
   if searchQuery.startswith("https:") or searchQuery.startswith("magnet:"):
-    directPlay(searchQuery, player)
-    quit(0)
-
-  let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))
-
-  proc getUserInput(): string =
-    if options["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 buildPlayerArgs(number: int): seq[string] =
-    var args = @[searchResults[number].url]
-    if options["musicOnly"]: args.add("--no-video")
-    if options["fullScreen"]: args.add("--fullscreen")
-    return args
-
-  func buildMusicDownloadArgs(number: int): seq[string] =
-    {.noSideEffect.}:
-      var args = @["--ignore-errors", "-f", "bestaudio", "--extract-audio", "--audio-format", "mp3", "--audio-quality", "0", "-o"]
-      let downloadLocation = &"'{expandTilde(musicDownloadDirectory)}/{searchResults[number].title}.mp3'"
-      args.add(downloadLocation)
-      args.add(searchResults[number].url)
-      return args
-
-  func buildVideoDownloadArgs(number: int): seq[string] =
-    {.noSideEffect.}:
-      var args = @["-f", "best", "-o"]
-      let downloadLocation = &"'{expandTilde(videoDownloadDirectory)}/%(title)s.%(ext)s'"
-      args.add(downloadLocation)
-      args.add(searchResults[number].url)
-      return args
-
-  proc handleUserInput(number: int) =
     if options["download"]:
-      if options["musicOnly"]:
-        download(buildMusicDownloadArgs(number), searchResults[number].title)
-      else:
-        download(buildVideoDownloadArgs(number), searchResults[number].title)
+      directDownload(sanitizeURL(searchQuery), options["musicOnly"])
     else:
-      play(player, buildPlayerArgs(number), searchResults[number].title)
-
-
-  while(true):
-    let userInput = getUserInput()
-
-    if userInput == "all":
-      for number in 0..(len(searchResults)):
-        # TODO `spawn` this?
-        handleUserInput(number)
+      directPlay(sanitizeURL(searchQuery), player, options["musicOnly"])
+    quit(0)
 
-    if userInput == "q":
-      break
+  let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))
 
-    # Play the video using the preferred/available media player
-    let videoNumber = parseInt(userInput)
-    handleUserInput(videoNumber)
-    if options["feelingLucky"]:
-      break
+  present(searchResults, options, (0, limit-1), player)
 
 
 when isMainModule: