harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

synchronise an attach_move operation to clones

Browse Source
This commit is contained in:
zotlabs 2017-12-06 14:20:17 -08:00
parent 157966eb11
commit ffaab27e77
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zotlabs/Module/Photos.php
View File

@ -202,6 +202,11 @@ class Photos extends \Zotlabs\Web\Controller {
); );
if(($m) && ($m[0]['folder'] != $_POST['move_to_album'])) { if(($m) && ($m[0]['folder'] != $_POST['move_to_album'])) {
attach_move($page_owner_uid,argv(2),$_POST['move_to_album']); attach_move($page_owner_uid,argv(2),$_POST['move_to_album']);
$sync = attach_export_data(\App::$data['channel'],argv(2),true);
if($sync)
build_sync_packet($page_owner_uid,array('file' => array($sync)));
if(! ($_POST['desc'] && $_POST['newtag'])) if(! ($_POST['desc'] && $_POST['newtag']))
goaway(z_root() . '/' . $_SESSION['photo_return']); goaway(z_root() . '/' . $_SESSION['photo_return']);
} }

6
include/attach.php
View File

@ -276,6 +276,8 @@ function attach_by_hash($hash, $observer_hash, $rev = 0) {
return $ret; return $ret;
} }
$r[0]['content'] = dbunescbin($r[0]['content']);
if($r[0]['folder']) { if($r[0]['folder']) {
$x = attach_can_view_folder($r[0]['uid'],$observer_hash,$r[0]['folder']); $x = attach_can_view_folder($r[0]['uid'],$observer_hash,$r[0]['folder']);
if(! $x) { if(! $x) {
@ -2037,6 +2039,7 @@ function attach_export_data($channel, $resource_id, $deleted = false) {
if($hash_ptr === $resource_id) { if($hash_ptr === $resource_id) {
$attach_ptr = $r[0]; $attach_ptr = $r[0];
} }
$r[0]['content'] = dbunescbin($r[0]['content']);
$hash_ptr = $r[0]['folder']; $hash_ptr = $r[0]['folder'];
$paths[] = $r[0]; $paths[] = $r[0];
@ -2222,7 +2225,6 @@ function copy_folder_to_cloudfiles($channel, $observer_hash, $srcpath, $cloudpat
* the attach.hash of the new parent folder, which must already exist. If $new_folder_hash is blank or empty, * the attach.hash of the new parent folder, which must already exist. If $new_folder_hash is blank or empty,
* the file is relocated to the root of the channel's storage area. * the file is relocated to the root of the channel's storage area.
* *
* @fixme: this operation is currently not synced to clones !!
* *
* @param int $channel_id * @param int $channel_id
* @param int $resource_id * @param int $resource_id
@ -2245,7 +2247,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) {
$oldstorepath = dbunescbin($r[0]['content']); $oldstorepath = dbunescbin($r[0]['content']);
if($new_folder_hash) { if($new_folder_hash) {
$n = q("select * from attach where hash = '%s' and uid = %d limit 1", $n = q("select * from attach where hash = '%s' and uid = %d and is_dir = 1 limit 1",
dbesc($new_folder_hash), dbesc($new_folder_hash),
intval($channel_id) intval($channel_id)
); );

9
include/import.php
View File

@ -1081,6 +1081,7 @@ function sync_files($channel, $files) {
logger('sync_files duplicate check: attach_by_hash() returned ' . print_r($x,true), LOGGER_DEBUG); logger('sync_files duplicate check: attach_by_hash() returned ' . print_r($x,true), LOGGER_DEBUG);
if($x['success']) { if($x['success']) {
$orig_attach = $x[0];
$attach_exists = true; $attach_exists = true;
$attach_id = $x[0]['id']; $attach_id = $x[0]['id'];
} }
@ -1145,12 +1146,18 @@ function sync_files($channel, $files) {
// If the hash ever contains any escapable chars this could cause // If the hash ever contains any escapable chars this could cause
// problems. Currently it does not. // problems. Currently it does not.
/// @TODO implement os_path
if(!isset($att['os_path'])) if(!isset($att['os_path']))
$att['os_path'] = ''; $att['os_path'] = '';
if($attach_exists) { if($attach_exists) {
logger('sync_files attach exists: ' . print_r($att,true), LOGGER_DEBUG); logger('sync_files attach exists: ' . print_r($att,true), LOGGER_DEBUG);
// process/sync a remote rename/move operation
if($orig_attach['content'] !== $newfname) {
rename($orig_attach['content'],$newfname);
}
if(! dbesc_array($att)) if(! dbesc_array($att))
continue; continue;