From: Joseph Nuthalapati Date: Wed, 4 Dec 2019 18:47:52 +0000 (+0530) Subject: strformat everywhere! 🥳 X-Git-Tag: 0.1.0~47 X-Git-Url: https://njoseph.me/gitweb/nimcoon.git/commitdiff_plain/b40b72435a3fdde4d9c12838dbf3377dc09d1023 strformat everywhere! 🥳 --- diff --git a/clitube.nim b/clitube.nim index 121b3d4..89e863c 100644 --- a/clitube.nim +++ b/clitube.nim @@ -3,6 +3,7 @@ import httpClient import os import osproc import sequtils, sugar +import strformat import std/[terminal] import strtabs import strutils @@ -20,7 +21,7 @@ type SearchResult = tuple[title: string, url: string] proc selectMediaPlayer(): string = let availablePlayers = filterIt(supportedPlayers, execProcess("which " & it).len != 0) if len(availablePlayers) == 0: - stderr.writeLine "Please install one of the supported media players: ", $supportedPlayers + stderr.writeLine &"Please install one of the supported media players: {supportedPlayers}" raise newException(OSError, "No supported media player found") else: return availablePlayers[0] @@ -28,7 +29,7 @@ proc selectMediaPlayer(): string = proc getYoutubePage(searchQuery: string): string = let queryParam = encodeUrl(searchQuery) let client = newHttpClient() - let response = get(client, "https://www.youtube.com/results?hl=en&search_query=" & queryParam) + let response = get(client, &"https://www.youtube.com/results?hl=en&search_query={queryParam}") return $response.body proc extractTitlesAndUrls(htmlFile: string): seq[SearchResult] = @@ -45,7 +46,7 @@ let input = paramStr(1) let player = selectMediaPlayer() if "https://www.youtube.com" in input: - discard execProcess(player & " " & input) + discard execProcess(&"{player} {input}") quit(0) let searchResults = extractTitlesAndUrls(getYoutubePage(input)) @@ -58,4 +59,4 @@ let number: int = parseInt(readLine(stdin)) styledEcho "\n", fgGreen, "Playing ", styleBright, fgMagenta, searchResults[number].title # Play the video using the preferred/available media player -discard execProcess(player & " " & searchResults[number].url) +discard execProcess(&"{player} {searchResults[number].url}")