From fe1a5856767d3a6873963b4f66f48296f0aac26b Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Sun, 12 Jan 2020 12:23:33 +0530 Subject: [PATCH] More elegant handling of playing URLs directly Signed-off-by: Joseph Nuthalapati --- lib.nim | 9 +++++---- tests.nim | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib.nim b/lib.nim index 25669a3..fc00385 100644 --- a/lib.nim +++ b/lib.nim @@ -56,7 +56,8 @@ func sanitizeURL*(url: string): string = urlLongen(stripZshEscaping(url)) proc directPlay*(searchQuery: string, player: string) = - if "watch?" in searchQuery or "videos/watch" in searchQuery or "soundcloud.com" in searchQuery: - play(player, args=[sanitizeURL(searchQuery)]) - elif searchQuery.startswith("magnet:"): - play("peerflix", args=[searchQuery, &"--{player}"]) + let url = sanitizeURL(searchQuery) + if searchQuery.startswith("magnet:"): + play("peerflix", args=[url, &"--{player}"]) + else: + play(player, args=[url]) diff --git a/tests.nim b/tests.nim index f24eb18..a218596 100644 --- a/tests.nim +++ b/tests.nim @@ -5,7 +5,6 @@ import lib suite "Playing direct links": test "sanitize URL": - # give up and stop if this fails let expected = "https://www.youtube.com/watch?v=QOEMv0S8AcA" check(sanitizeURL("https://youtu.be/QOEMv0S8AcA") == expected) check(sanitizeURL("https://www.youtube.com/watch\\?v\\=QOEMv0S8AcA") == expected) -- 2.43.0