From b40b72435a3fdde4d9c12838dbf3377dc09d1023 Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Thu, 5 Dec 2019 00:17:52 +0530 Subject: [PATCH] =?utf8?q?strformat=20everywhere!=20=F0=9F=A5=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- clitube.nim | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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}") -- 2.43.0