Offer youtube-dlc as an alternative to youtube-dl #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FelixMcFelix
requested changes
Nov 13, 2020
| @@ -135,6 +136,8 @@ driver = [ | |||
| "url", | |||
| "xsalsa20poly1305", | |||
| ] | |||
| youtube-dl = [] | |||
| youtube-dlc = [] | |||
There was a problem hiding this comment.
I think just youtube-dlc will suffice: see below.
build.rs
Outdated
| If you are unsure, go with `youtube-dl`, however, if you encounter any errors with `youtube-dl`, | ||
| such as tracks ending immedietly when they are queued/played, try 'youtube-dlc'." | ||
| ); | ||
|
|
There was a problem hiding this comment.
If you add only one new feature (youtube-dl), this check can be avoided.
In general, it's better to avoid adding in feature traps/incompatibilities where you can.
src/input/ytdl_src.rs
Outdated
| #[cfg(feature = "youtube-dl")] | ||
| const YOUTUBE_DL_COMMAND: &str = "youtube-dl"; | ||
| #[cfg(feature = "youtube-dlc")] | ||
| const YOUTUBE_DL_COMMAND: &str = "youtube-dlc"; |
There was a problem hiding this comment.
Can you make this so that the default is "youtube-dl", and the youtube-dlc feature changes this?
E.g., constant computation allows constructs such as:
const TEST: &str = if cfg!(feature = "") {
"A"
} else {
"B"
};
src/input/ytdl_src.rs
Outdated
| /// Creates a streamed audio source with `youtube-dl` and `ffmpeg`. | ||
| #[cfg(any(feature = "youtube-dl", feature = "youtube-dlc"))] |
There was a problem hiding this comment.
With one override feature, this check is unnecessary. This also stops Restartable sources from failing to compile.
src/input/ytdl_src.rs
Outdated
| @@ -102,6 +108,7 @@ pub(crate) async fn _ytdl(uri: &str, pre_args: &[&str]) -> Result<Input> { | |||
|
|
|||
| /// Creates a streamed audio source from YouTube search results with `youtube-dl`,`ffmpeg`, and `ytsearch`. | |||
| /// Takes the first video listed from the YouTube search. | |||
| #[cfg(any(feature = "youtube-dl", feature = "youtube-dlc"))] | |||
There was a problem hiding this comment.
See the previous instance,
added 2 commits
November 13, 2020 17:08
FelixMcFelix
approved these changes
Nov 13, 2020
|
Lgtm. Thanks! |
Merged
GnomedDev
pushed a commit
to GnomedDev/songbird
that referenced
this pull request
May 26, 2022
Update to next + fix queue + fix clippy
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
serenity-rs/serenity#1076