pagination: "n" takes to next page of results

Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>

diff --git a/src/lib.nim b/src/lib.nim
index dd8dcf49f63ddb776d463310a8e94b6568505485..54259e2d9f7d08237c3bb73ec51e30fb9751167a 100644 (file)
--- a/src/lib.nim
+++ b/src/lib.nim
@@ -20,6 +20,7 @@ type
   Options* = Table[string, bool]
   SearchResult* = tuple[title: string, url: string]
   CommandLineOptions* = tuple[searchQuery: string, options: Options]
+  SelectionRange* = tuple[begin: int, until: int]
 
 # poEchoCmd can be added to options for debugging
 let processOptions = {poStdErrToStdOut, poUsePath}

diff --git a/src/nimcoon.nim b/src/nimcoon.nim
index 0624bad087bd69f6febc0f91b24082cf1445a79f..5ddcfcc78575cd7bd0e75ce9b41d1fb6ae1d62a4 100644 (file)
--- a/src/nimcoon.nim
+++ b/src/nimcoon.nim
@@ -57,10 +57,13 @@ proc main() =
 
   let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))
 
-  proc getUserInput(): string =
+  # 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[..(limit-1)])
+      presentVideoOptions(searchResults[selectionRange.begin .. selectionRange.until])
       stdout.styledWrite(fgYellow, "Choose video number: ")
       readLine(stdin)
 
@@ -71,26 +74,31 @@ proc main() =
     if options["fullScreen"]: args.add("--fullscreen")
     return args
 
-  proc handleUserInput(number: int) =
+  proc handleUserInput(selection: int) =
     if options["download"]:
       if options["musicOnly"]:
-        download(buildMusicDownloadArgs(searchResults[number].url), searchResults[number].title)
+        download(buildMusicDownloadArgs(searchResults[selection].url), searchResults[selection].title)
       else:
-        download(buildVideoDownloadArgs(searchResults[number].url), searchResults[number].title)
+        download(buildVideoDownloadArgs(searchResults[selection].url), searchResults[selection].title)
     else:
-      play(player, buildPlayerArgs(number), searchResults[number].title)
+      play(player, buildPlayerArgs(selection), searchResults[selection].title)
 
 
   while(true):
-    let userInput = getUserInput()
+    let userInput = offerSelection()
 
-    if userInput == "all":
-      for number in 0..(limit-1): # Nim decided to deviate from Python ranges here
+    case userInput
+    of "all":
+      for selection in selectionRange.begin .. selectionRange.until:
         # TODO `spawn` this?
-        handleUserInput(number)
-
-    if userInput == "q":
-      break
+        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)