mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-28 13:59:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add directory check for rsync rename optimization and suppress stderr from stat commands

Browse Source
This commit is contained in:
mgutt
2025-10-19 20:02:14 +02:00
parent 0b70940e15
commit 42d6622dea
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emhttp/plugins/dynamix/nchan/file_manager
+10 -4
View File
@@ -210,9 +210,9 @@ while (true) {
while (!file_exists($target_for_stat) && $target_for_stat != '/') {
$target_for_stat = dirname($target_for_stat);
}
$stat_cmd = "stat -c %m -- ".escapeshellarg($target_for_stat);
exec("$stat_cmd 2>&1", $target_mount_point, $rc);
exec("stat -c %m -- ".escapeshellarg($target_for_stat)." 2>/dev/null", $target_mount_point);
// check all source paths
if (!empty($target_mount_point)) {
$use_rsync_rename = true; // assume we can use it, then check for disqualifying conditions
@@ -227,8 +227,8 @@ while (true) {
// mount points of source and target must be equal
$source_mount_point = [];
exec("stat -c %m -- ".escapeshellarg($valid_source_path)."", $source_mount_point);
if ($source_mount_point[0] != $target_mount_point[0]) {
exec("stat -c %m -- ".escapeshellarg($valid_source_path)." 2>/dev/null", $source_mount_point);
if (empty($source_mount_point) || $source_mount_point[0] != $target_mount_point[0]) {
$use_rsync_rename = false;
break;
}
@@ -240,6 +240,12 @@ while (true) {
}
$last_dirname = dirname($valid_source_path);
// target must be a directory
if (!is_dir(rtrim($target,'/'))) {
$use_rsync_rename = false;
break;
}
// selected source files and directories must not exist on target when "Overwrite existing files" is not set
if (!empty($exist)) { // would add "--ignore-existing" to rsync
$target_item = rtrim($target, '/') . '/' . basename($valid_source_path);