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

0.9.7.2: WebDAV-Sync nicht-destruktiv machen

Browse Source
This commit is contained in:
Terranom674
2026-08-19 20:51:23 +02:00
parent fc3d855e5e
commit 9aaa1a47b3
1 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/nc_productive_ws.inc.php
View File

@@ -56,7 +56,6 @@ function bratonien_tools_nc_find_album($parent_id, $dir, $name, $excluded_site_i
SELECT id, dir, name SELECT id, dir, name
FROM '.CATEGORIES_TABLE.' FROM '.CATEGORIES_TABLE.'
WHERE '.$where_parent.' WHERE '.$where_parent.'
AND (site_id IS NULL OR site_id <> '.(int)$excluded_site_id.')
AND ( AND (
dir = \''.$dir_sql.'\' dir = \''.$dir_sql.'\'
OR LOWER(name) = LOWER(\''.$name_sql.'\') OR LOWER(name) = LOWER(\''.$name_sql.'\')
@@ -122,10 +121,9 @@ function bratonien_tools_nc_managed_images($basedir)
function bratonien_tools_nc_remove_storage_categories($site_id) function bratonien_tools_nc_remove_storage_categories($site_id)
{ {
$ids = query2array('SELECT id FROM '.CATEGORIES_TABLE.' WHERE site_id='.(int)$site_id.' AND dir IS NOT NULL', null, 'id'); // Bestehende Piwigo-Alben gehoeren nicht automatisch dem Connector.
if (!$ids) return 0; // Ohne eindeutige Connector-Eigentumsmarkierung darf hier nichts geloescht werden.
delete_categories(array_map('intval', $ids)); return 0;
return count($ids);
} }
function bratonien_tools_ws_nc_sync_productive($params, &$service) function bratonien_tools_ws_nc_sync_productive($params, &$service)
@@ -169,8 +167,6 @@ function bratonien_tools_ws_nc_sync_productive($params, &$service)
try try
{ {
$counts['removed_duplicate_categories'] = bratonien_tools_nc_remove_storage_categories($site_id);
list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW()')); list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW()'));
$fs_dirs = $site_reader->get_full_directories($basedir); $fs_dirs = $site_reader->get_full_directories($basedir);
usort($fs_dirs, function($a, $b) usort($fs_dirs, function($a, $b)
@@ -199,20 +195,10 @@ function bratonien_tools_ws_nc_sync_productive($params, &$service)
$db_elements = bratonien_tools_nc_managed_images($basedir); $db_elements = bratonien_tools_nc_managed_images($basedir);
$db_by_path = array_flip($db_elements); $db_by_path = array_flip($db_elements);
$to_delete = array(); // Nicht-destruktiver Schutz: Bestehende Piwigo-Bilder werden niemals allein
foreach ($db_elements as $id=>$path) // deshalb geloescht, weil sie im aktuellen WebDAV-Scan nicht vorkommen.
{ // Das Entfernen ist erst wieder zulaessig, wenn Connector-Eigentum eindeutig
if (!array_key_exists($path, $fs)) $to_delete[] = (int)$id; // und verbindungsbezogen gespeichert wird.
}
if ($to_delete)
{
delete_elements($to_delete, false);
$counts['del_elements'] = count($to_delete);
foreach ($to_delete as $id)
{
if (isset($db_elements[$id])) unset($db_by_path[$db_elements[$id]], $db_elements[$id]);
}
}
$next_element_id = pwg_db_nextval('id', IMAGES_TABLE); $next_element_id = pwg_db_nextval('id', IMAGES_TABLE);
$image_inserts = array(); $image_inserts = array();
@@ -232,13 +218,9 @@ function bratonien_tools_ws_nc_sync_productive($params, &$service)
if (isset($db_by_path[$path])) if (isset($db_by_path[$path]))
{ {
$id = (int)$db_by_path[$path]; // Altbestand niemals umhaengen. Vorhandene Bild-Album-Zuordnungen bleiben
$all_ids[] = $id; // exakt bestehen; der Connector darf nur neue Datensaetze ergaenzen.
pwg_query('DELETE FROM '.IMAGE_CATEGORY_TABLE.' WHERE image_id='.$id); $all_ids[] = (int)$db_by_path[$path];
if ($category_id !== null)
{
single_insert(IMAGE_CATEGORY_TABLE, array('image_id'=>$id, 'category_id'=>$category_id));
}
continue; continue;
} }
@@ -276,8 +258,10 @@ function bratonien_tools_ws_nc_sync_productive($params, &$service)
$counts['new_elements'] = count($new_ids); $counts['new_elements'] = count($new_ids);
} }
// Bestehende Bilder werden nicht durch den Connector aktualisiert. Nur neu
// angelegte Connector-Bilder erhalten die aus der Quelle ermittelten Attribute.
$updates = array(); $updates = array();
foreach ($all_ids as $id) foreach ($new_ids as $id)
{ {
$path_result = pwg_query('SELECT path FROM '.IMAGES_TABLE.' WHERE id='.(int)$id.' LIMIT 1'); $path_result = pwg_query('SELECT path FROM '.IMAGES_TABLE.' WHERE id='.(int)$id.' LIMIT 1');
if (!pwg_db_num_rows($path_result)) continue; if (!pwg_db_num_rows($path_result)) continue;