From 6ff2dbac3053f8c849caf02c4947dd782ce6227f Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Tue, 24 Dec 2019 09:23:09 +0530 Subject: [PATCH] Fix YouTube pattern - Some manual refactoring. Couldn't get nimfmt to work Signed-off-by: Joseph Nuthalapati --- clitube.nim | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/clitube.nim b/clitube.nim index 1c30b92..a9792c4 100644 --- a/clitube.nim +++ b/clitube.nim @@ -1,14 +1,16 @@ -import htmlparser -import httpClient -import parseopt -import osproc -import sequtils, sugar -import strformat -import std/[terminal] -import strtabs -import strutils -import uri -import xmltree +import + htmlparser, + httpClient, + parseopt, + osproc, + sequtils, + sugar, + strformat, + std/[terminal], + strtabs, + strutils, + uri, + xmltree import preferences @@ -55,22 +57,17 @@ for kind, key, value in getopt(): of cmdEnd: discard - -if "?watch" in searchQuery or "videos/watch" in searchQuery : +if "watch?" in searchQuery or "videos/watch" in searchQuery : discard execProcess(&"{player} {searchQuery}") quit(0) - - -if searchQuery.startswith("magnet:"): +elif searchQuery.startswith("magnet:"): discard execProcess(&"peerflix \"{searchQuery}\" --{player}") quit(0) - let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery)) let number = - if feelingLucky: - 0 + if feelingLucky: 0 else: presentVideoOptions(searchResults) stdout.styledWrite(fgYellow, "Choose video number: ") -- 2.43.0