forkless/Piperless
1
0
Fork 0
mirror of https://github.com/forkless/Piperless.git synced 2026-08-16 08:56:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: FFmpeg path detection uses is_executable instead of is_dir to work under open_basedir

Browse Source
This commit is contained in:
Forkless
2026-05-10 18:27:24 +02:00
parent 916a8a4396
commit ecdaecc5a0
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/class-cache-manager.php
+13 -8
View File
@@ -436,19 +436,24 @@ class Cache_Manager {
$custom = $settings['piper_ffmpeg_binary'] ?? '';
if ( '' !== $custom ) {
// Support both full binary path and directory-only path.
if ( @is_dir( $custom ) ) {
$custom = rtrim( $custom, '/' ) . '/ffmpeg';
// Support both full binary path AND directory-only path.
// `@is_dir` can return false under open_basedir, so we also
// try appending /ffmpeg if the raw path is not executable.
if ( ! @is_executable( $custom ) ) {
$candidate = rtrim( $custom, '/' ) . '/ffmpeg';
if ( @is_executable( $candidate ) ) {
$custom = $candidate;
$this->logger->info( 'FFmpeg path is a directory, resolved to: {path}', [ 'path' => $custom ] );
}
}
if ( @file_exists( $custom ) && @is_executable( $custom ) ) {
if ( @is_executable( $custom ) ) {
$cached = true;
$resolved_path = $custom;
$this->logger->info( 'Found ffmpeg at configured path: {path}', [ 'path' => $custom ] );
return $resolved_path;
}
$this->logger->warning(
'Configured ffmpeg binary not found or not executable: {path}. Trying auto-detection.',
[ 'path' => $custom ]
);
$this->logger->warning( 'ffmpeg not found or not executable at configured path: {path}', [ 'path' => $original ] );
$this->logger->warning( 'Trying auto-detection.' );
}
$candidates = apply_filters(