From e6561dc98ae9f83c63ebf3e14fbefbd6e5264f5d Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Fri, 17 Apr 2020 20:01:15 +0530 Subject: [PATCH] pagination: "n" takes to next page of results Signed-off-by: Joseph Nuthalapati --- src/lib.nim | 1 + src/nimcoon.nim | 34 +++++++++++++++++++++------------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/lib.nim b/src/lib.nim index dd8dcf4..54259e2 100644 --- 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 0624bad..5ddcfcc 100644 --- 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) -- 2.43.0