Support http in addition to https

[nimcoon.git] / src / nimcoon.nim

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index 5ddcfcc78575cd7bd0e75ce9b41d1fb6ae1d62a4..3844d4095de6f043349f9527d586948f89420221 100644 (file)
--- a/src/nimcoon.nim
+++ b/src/nimcoon.nim
@@ -1,7 +1,5 @@
 import
-  os,
   parseopt,
-  std/[terminal],
   strformat,
   strutils,
   tables
@@ -27,18 +25,17 @@ proc parseArguments(): CommandLineOptions =
       of "d", "download": options["download"] = true
     of cmdEnd: discard
 
-  return (searchQuery, options)
+  (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
@@ -48,63 +45,16 @@ 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 = extractTitlesAndUrls(getYoutubePage(searchQuery))
 
-  # Currently available range to choose from depending on pagination
-  var selectionRange: SelectionRange = (0, limit-1) # Nim decided to deviate from Python ranges here
-
-  proc offerSelection(): string =
-    if options["feelingLucky"]: "0"
-    else:
-      presentVideoOptions(searchResults[selectionRange.begin .. selectionRange.until])
-      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
-
-  proc handleUserInput(selection: int) =
-    if options["download"]:
-      if options["musicOnly"]:
-        download(buildMusicDownloadArgs(searchResults[selection].url), searchResults[selection].title)
-      else:
-        download(buildVideoDownloadArgs(searchResults[selection].url), searchResults[selection].title)
-    else:
-      play(player, buildPlayerArgs(selection), searchResults[selection].title)
-
-
-  while(true):
-    let userInput = offerSelection()
-
-    case userInput
-    of "all":
-      for selection in selectionRange.begin .. selectionRange.until:
-        # TODO `spawn` this?
-        handleUserInput(selection)
-    of "n":
-      if selectionRange.until + 1 < len(searchResults):
-        selectionRange = (selectionRange.until + 1, min(len(searchResults) - 1, selectionRange.until + limit))
-      continue
-    # of "p":
-    of "q":
-      quit(0)
-
-    # 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: