Refactoring to be more functional

[nimcoon.git] / src / nimcoon.nim

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index 81db7327645d3cf2711d363436f8974e8413e49a..cc0bd7eb5acbee62703806c8f1f345fa17b4eb00 100644 (file)
--- a/src/nimcoon.nim
+++ b/src/nimcoon.nim
@@ -1,7 +1,5 @@
 import
 import

-  os,

   parseopt,
   parseopt,

-  std/[terminal],

   strformat,
   strutils,
   tables
   strformat,
   strutils,
   tables


@@ -39,7 +37,6 @@ proc isValidOptions*(options: Options): bool =
      return false
   return true
 
      return false
   return true
 

-

 proc main() =
   let
     player = selectMediaPlayer()
 proc main() =
   let
     player = selectMediaPlayer()


@@ -57,57 +54,7 @@ proc main() =
 
   let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))
 
 
   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":
-      if selectionRange.begin > 0:
-        selectionRange = (selectionRange.begin - limit, selectionRange.until - limit)
-      continue
-    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:
 
 
 when isMainModule: