Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-20 09:55:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Piwigo derivative dir for parallel test workspace

Browse Source
This commit is contained in:
Terranom674
2026-08-20 14:24:53 +02:00
parent 0ea01d9a26
commit 57eec81801
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
webdav-derivative-test.php
View File

@@ -48,13 +48,13 @@ function bratonien_tools_webdav_derivative_test_source_info($image_id, array $im
$absolute = $path; $absolute = $path;
if (strpos($absolute, '/') !== 0) if (strpos($absolute, '/') !== 0)
{ {
$absolute = PHPWG_ROOT_PATH.ltrim(preg_replace('#^\./#', '', $absolute), '/'); $absolute = PHPWG_ROOT_PATH.ltrim(preg_replace('#^\\./#', '', $absolute), '/');
} }
$resolved = realpath($absolute); $resolved = realpath($absolute);
if ($resolved === false) return null; if ($resolved === false) return null;
$normalized = str_replace('\\', '/', $resolved); $normalized = str_replace('\\\\', '/', $resolved);
if (!preg_match('#/nc-webdav-source/connection-([0-9]+)/root-([0-9]+)/(.*)$#', $normalized, $match)) if (!preg_match('#/nc-webdav-source/connection-([0-9]+)/root-([0-9]+)/(.*)$#', $normalized, $match))
{ {
return null; return null;
@@ -300,14 +300,15 @@ if (!$source)
bratonien_tools_webdav_derivative_test_abort(404, 'Keine WebDAV-Quelle fuer dieses Bild gefunden.'); bratonien_tools_webdav_derivative_test_abort(404, 'Keine WebDAV-Quelle fuer dieses Bild gefunden.');
} }
$test_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/webdav-derivative-test'; $test_rel_dir = trim(PWG_DERIVATIVE_DIR, '/').'/bratonien-webdav-test';
$test_root = PHPWG_ROOT_PATH.$test_rel_dir;
if (!is_dir($test_root) && !@mkdir($test_root, 0755, true)) if (!is_dir($test_root) && !@mkdir($test_root, 0755, true))
{ {
bratonien_tools_webdav_derivative_test_abort(500, 'Paralleler Testbereich konnte nicht angelegt werden.'); bratonien_tools_webdav_derivative_test_abort(500, 'Paralleler Testbereich konnte nicht angelegt werden: '.$test_root);
} }
if (!is_writable($test_root)) if (!is_writable($test_root))
{ {
bratonien_tools_webdav_derivative_test_abort(500, 'Paralleler Testbereich ist fuer PHP nicht beschreibbar.'); bratonien_tools_webdav_derivative_test_abort(500, 'Paralleler Testbereich ist fuer PHP nicht beschreibbar: '.$test_root);
} }
$lock_path = $test_root.'/image-'.$image_id.'.lock'; $lock_path = $test_root.'/image-'.$image_id.'.lock';
@@ -327,7 +328,7 @@ if (!in_array($extension, array('jpg', 'jpeg', 'png', 'gif', 'webp'), true))
$token = getmypid().'-'.bin2hex(random_bytes(6)); $token = getmypid().'-'.bin2hex(random_bytes(6));
$source_filename = 'source-'.$image_id.'-'.$token.'.'.$extension; $source_filename = 'source-'.$image_id.'-'.$token.'.'.$extension;
$source_path = $test_root.'/'.$source_filename; $source_path = $test_root.'/'.$source_filename;
$source_rel = './_data/bratonien-tools/webdav-derivative-test/'.$source_filename; $source_rel = './'.$test_rel_dir.'/'.$source_filename;
$temp_image_id = 0; $temp_image_id = 0;
$derivative_path = ''; $derivative_path = '';
$cleaned = false; $cleaned = false;