From 86e6cb72964db0443c6b5527892f49721079f72a Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Tue, 16 Jun 2020 07:26:22 +0530 Subject: [PATCH] Minor formatting changes --- src/lib.nim | 7 +++---- src/nimcoon.nim | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lib.nim b/src/lib.nim index ccd1a39..d36e2c2 100644 --- a/src/lib.nim +++ b/src/lib.nim @@ -27,9 +27,8 @@ type SelectionRange* = tuple[begin: int, until: int] -# poEchoCmd can be added to options for debugging let - processOptions = {poStdErrToStdOut, poUsePath} + processOptions = {poStdErrToStdOut, poUsePath} # poEchoCmd can be added to options for debugging PEERTUBE_REGEX = re"videos\/watch\/[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}" @@ -54,7 +53,7 @@ proc getYoutubePage*(searchQuery: string): string = proc getPeerTubeMagnetLink(url: string): string = - # Gets the magnet link of the best possible resolutino from PeerTube + ## Gets the magnet link of the best possible resolution from PeerTube let uuid = url.substr(find(url, PEERTUBE_REGEX) + "videos/watch/".len) let domainName = url.substr(8, find(url, '/', start=8) - 1) let apiURL = &"https://{domainName}/api/v1/videos/{uuid}" @@ -74,7 +73,7 @@ func extractTitlesAndUrls*(html: string): SearchResults = proc presentVideoOptions*(searchResults: SearchResults) = eraseScreen() for index, (title, url) in searchResults: - styledEcho $index, ". ", styleBright, fgMagenta, title, "\n", resetStyle, fgCyan, url, "\n" + styledEcho $index, ". ", styleBright, fgMagenta, title, "\n", resetStyle, fgCyan, " ", url, "\n" func isPlaylist(url: string): bool = diff --git a/src/nimcoon.nim b/src/nimcoon.nim index 20b9280..265409d 100644 --- a/src/nimcoon.nim +++ b/src/nimcoon.nim @@ -31,11 +31,11 @@ proc parseArguments(): CommandLineOptions = proc isValidOptions*(options: Options): bool = # Check for invalid combinations of options var invalidCombinations = [("musicOnly", "fullScreen"), ("download", "fullScreen")] + result = true for combination in invalidCombinations: if options[combination[0]] and options[combination[1]]: stderr.writeLine fmt"Incompatible options provided: {combination[0]} and {combination[1]}" - return false - true + result = false proc main() = let -- 2.43.0