Skip to content

yt-dlp: self heal when binary lost exec bit #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexanderadam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

yt-dlp: self heal when binary lost exec bit #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions plugin/Utils.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,30 +75,31 @@ sub yt_dlp_binary {
sub yt_dlp_bin {
my $bin = shift || yt_dlp_binary();
state $init;

# add extra path
state $base;

# add extra path. the plugin ships its yt-dlp binaries in Bin/,
# which LMS doesn't include in getBinPaths by default, so add it.
unless ($init) {
my $base = catdir(Slim::Utils::PluginManager->allPlugins->{'YouTube'}->{'basedir'}, 'Bin');
Slim::Utils::Misc::addFindBinPaths(
# catdir($base, 'armv7l'),
);
$base = catdir(Slim::Utils::PluginManager->allPlugins->{'YouTube'}->{'basedir'}, 'Bin');
Slim::Utils::Misc::addFindBinPaths($base);
$init = 1;
}

my ($exec) = grep { -e "$_/$bin" } Slim::Utils::Misc::getBinPaths;
$exec = catdir($exec, $bin);

if (!-x $exec) {
$log->warn("$exec not executable - correcting");
chmod (0555, $exec);
}

# self heal: if the shipped binary lost its exec bit (unpacking with
# unzip etc. drops permissions) findbin wont return it, and the old
# code chmod'd the wrong path. resolve against the Bin/ dir first.
my $shipped = catdir($base, $bin);
if (-e $shipped && !-x $shipped) {
$log->warn("$shipped not executable, fixing");
chmod(0555, $shipped);
}

# use findbin in case there are other places
$bin = Slim::Utils::Misc::findbin($bin);
$bin = Slim::Utils::OSDetect::getOS->decodeExternalHelperPath($bin);

return $bin;
}
}

sub yt_dlp_binaries {
return qw ( yt-dlp_linux yt-dlp_linux_aarch64 yt-dlp_linux_armv7l yt-dlp_freebsd14 yt-dlp_macos yt-dlp.exe yt-dlp);
Expand Down