From 13a4017d99baaf7919263edaf05b13063e91cb8d Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Fri, 17 Apr 2020 21:18:29 +0530 Subject: [PATCH] Refactoring to be more functional Signed-off-by: Joseph Nuthalapati --- src/lib.nim | 57 +++++++++++++++++++++++++++++++++++++++++++++++-- src/nimcoon.nim | 55 +---------------------------------------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/lib.nim b/src/lib.nim index 54259e2..3d3f515 100644 --- a/src/lib.nim +++ b/src/lib.nim @@ -19,6 +19,7 @@ import config type Options* = Table[string, bool] SearchResult* = tuple[title: string, url: string] + SearchResults* = seq[tuple[title: string, url: string]] CommandLineOptions* = tuple[searchQuery: string, options: Options] SelectionRange* = tuple[begin: int, until: int] @@ -39,13 +40,13 @@ proc getYoutubePage*(searchQuery: string): string = let response = get(client, &"https://www.youtube.com/results?hl=en&search_query={queryParam}") return $response.body -func extractTitlesAndUrls*(html: string): seq[SearchResult] = +func extractTitlesAndUrls*(html: string): SearchResults = {.noSideEffect.}: parseHtml(html).findAll("a"). filter(a => "watch" in a.attrs["href"] and a.attrs.hasKey "title"). map(a => (a.attrs["title"], "https://www.youtube.com" & a.attrs["href"])) -proc presentVideoOptions*(searchResults: seq[SearchResult]) = +proc presentVideoOptions*(searchResults: SearchResults) = eraseScreen() for index, (title, url) in searchResults: styledEcho $index, ". ", styleBright, fgMagenta, title, "\n", resetStyle, fgCyan, url, "\n" @@ -103,3 +104,55 @@ proc directDownload*(url: string, musicOnly: bool) = if musicOnly: buildMusicDownloadArgs(url) else: buildVideoDownloadArgs(url) discard execShellCmd(&"youtube-dl {args.join(\" \")}") + +proc offerSelection(searchResults: SearchResults, options: Table[string, bool], selectionRange: SelectionRange): 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(searchResult: SearchResult, options: Table[string, bool]): seq[string] = + var args = @[searchResult.url] + if options["musicOnly"]: args.add("--no-video") + if options["fullScreen"]: args.add("--fullscreen") + return args + +proc handleUserInput(searchResult: SearchResult, options: Table[string, bool], player: string) = + if options["download"]: + if options["musicOnly"]: + download(buildMusicDownloadArgs(searchResult.url), searchResult.title) + else: + download(buildVideoDownloadArgs(searchResult.url), searchResult.title) + else: + play(player, buildPlayerArgs(searchResult, options), searchResult.title) + +proc present*(searchResults: SearchResults, options: Table[string, bool], selectionRange: SelectionRange, player: string) = + #[ Continuously present options till the user quits the application + selectionRange: Currently available range to choose from depending on pagination + ]# + + let userInput = offerSelection(searchResults, options, selectionRange) + + case userInput + of "all": + for selection in selectionRange.begin .. selectionRange.until: + handleUserInput(searchResults[selection], options, player) + quit(0) + of "n": + if selectionRange.until + 1 < len(searchResults): + let newSelectionRange = (selectionRange.until + 1, min(len(searchResults) - 1, selectionRange.until + limit)) + present(searchResults, options, newSelectionRange, player) + of "p": + if selectionRange.begin > 0: + let newSelectionRange = (selectionRange.begin - limit, selectionRange.until - limit) + present(searchResults, options, newSelectionRange, player) + of "q": + quit(0) + else: + handleUserInput(searchResults[parseInt(userInput)], options, player) + if options["feelingLucky"]: + quit(0) + else: + present(searchResults, options, selectionRange, player) diff --git a/src/nimcoon.nim b/src/nimcoon.nim index 81db732..cc0bd7e 100644 --- a/src/nimcoon.nim +++ b/src/nimcoon.nim @@ -1,7 +1,5 @@ import - os, parseopt, - std/[terminal], strformat, strutils, tables @@ -39,7 +37,6 @@ proc isValidOptions*(options: Options): bool = return false return true - proc main() = let player = selectMediaPlayer() @@ -57,57 +54,7 @@ proc main() = 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: -- 2.43.0