strutils,
tables
-import config
-import lib
+import
+ config,
+ lib,
+ types,
+ youtube
proc parseArguments(): CommandLineOptions =
of "d", "download": options["download"] = true
of cmdEnd: discard
- return (searchQuery, options)
+ (searchQuery, options)
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
- return true
+ result = false
proc main() =
let
if(not isValidOptions(options)):
quit(1)
- if searchQuery.startswith("https:") or searchQuery.startswith("magnet:"):
+ if searchQuery.startswith("http") or searchQuery.startswith("magnet"):
if options["download"]:
directDownload(sanitizeURL(searchQuery), options["musicOnly"])
else:
- directPlay(sanitizeURL(searchQuery), player, options["musicOnly"])
+ directPlay(sanitizeURL(searchQuery), player, options)
quit(0)
- let searchResults = extractTitlesAndUrls(getYoutubePage(searchQuery))
+ let searchResults = getSearchResults(searchQuery)
+ let numResults = min(limit, len(searchResults))
- present(searchResults, options, (0, limit-1), player)
+ present(searchResults, options, (0, numResults-1), player)
when isMainModule: