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

hubzilla issue #680, implement IMoveTarget and recursive file/directory move/rename

Browse Source
This commit is contained in:
zotlabs 2017-12-06 16:07:40 -08:00
parent 4c08d7c480
commit d326e7a75c
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Zotlabs/Storage/Directory.php
View File

@ -16,7 +16,7 @@ use Sabre\DAV;
* @link http://github.com/friendica/red * @link http://github.com/friendica/red
* @license http://opensource.org/licenses/mit-license.php The MIT License (MIT) * @license http://opensource.org/licenses/mit-license.php The MIT License (MIT)
*/ */
class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMoveTarget {
/** /**
* @brief The path inside /cloud * @brief The path inside /cloud
@ -457,6 +457,22 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
return false; return false;
} }
public function moveInto($targetName,$sourcePath, DAV\INode $sourceNode) {
if(! $this->auth->owner_id) {
return false;
}
if(! ($sourceNode->data && $sourceNode->data->hash)) {
return false;
}
return attach_move($this->auth->owner_id, $sourceNode->data->hash, $this->folder_hash);
}
/** /**
* @todo add description of what this function does. * @todo add description of what this function does.
* *

23
include/attach.php
View File

@ -2234,7 +2234,7 @@ function copy_folder_to_cloudfiles($channel, $observer_hash, $srcpath, $cloudpat
function attach_move($channel_id, $resource_id, $new_folder_hash) { function attach_move($channel_id, $resource_id, $new_folder_hash) {
$c = channelx_by_n($channel_id); $c = channelx_by_n($channel_id);
if(! $c) if(! ($c && $resource_id))
return false; return false;
$r = q("select * from attach where hash = '%s' and uid = %d limit 1", $r = q("select * from attach where hash = '%s' and uid = %d limit 1",
@ -2246,13 +2246,32 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) {
$oldstorepath = dbunescbin($r[0]['content']); $oldstorepath = dbunescbin($r[0]['content']);
if($r[0]['is_dir']) {
$move_success = true;
$x = q("select hash from attach where folder = '%s' and uid = %d",
dbesc($r[0]['hash']),
intval($channel_id)
);
if($x) {
foreach($x as $xv) {
$rs = attach_move($channel_id,$xv['hash'],$r[0]['hash']);
if(! $rs) {
$move_success = false;
break;
}
}
}
return $move_success;
}
if($new_folder_hash) { if($new_folder_hash) {
$n = q("select * from attach where hash = '%s' and uid = %d and is_dir = 1 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)
); );
if(! $n) if(! $n)
return; return false;
$newdirname = $n[0]['filename']; $newdirname = $n[0]['filename'];
$newstorepath = dbunescbin($n[0]['content']) . '/' . $resource_id; $newstorepath = dbunescbin($n[0]['content']) . '/' . $resource_id;