aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-08-22 18:29:51 -0700
committerzotlabs <mike@macgirvin.com>2017-08-22 18:29:51 -0700
commit9f37dbc6dc1798b9b56a683ed1975adc318ff931 (patch)
treed64c789016058cde0fd1ecbb9a0a23bd81b5119a /util
parent33528c616ae976891df7a778ce9360ceb56571f4 (diff)
downloadvolse-hubzilla-9f37dbc6dc1798b9b56a683ed1975adc318ff931.tar.gz
volse-hubzilla-9f37dbc6dc1798b9b56a683ed1975adc318ff931.tar.bz2
volse-hubzilla-9f37dbc6dc1798b9b56a683ed1975adc318ff931.zip
util/dcp - support recursion and folders full of photos by importing files singly in separate processes - not yet tested
Diffstat (limited to 'util')
-rwxr-xr-xutil/dcp89
1 files changed, 64 insertions, 25 deletions
diff --git a/util/dcp b/util/dcp
index e38725aa1..672117f4e 100755
--- a/util/dcp
+++ b/util/dcp
@@ -15,15 +15,15 @@ cli_startup();
if($argc <= 3) {
- echo "Usage: " . $argv[0] . ' source destination' . "\n";
+ echo "Usage: " . $argv[0] . ' src dstdir' . "\n";
echo 'Always run from the toplevel web directory.' . "\n";
echo 'destination should begin with store/$nickname/desired/path or $nickname/desired/path' . "\n";
- echo 'Example: util/dcp /etc/motd store/joe/etc/motd' . "\n";
+ echo 'Example: util/dcp /etc/motd store/joe/etc' . "\n";
exit;
}
- $dstfile = $argv[$argc - 1];
-
+ $recursive = false;
+ $dstfile = $argv[$argc - 1];
if(strpos($dstfile,'store/') === 0)
$dstfile = substr($dstfile,6);
@@ -45,6 +45,7 @@ if($argc <= 3) {
if($r && $r[0]['is_dir']) {
$isadir = true;
+ $basepath = $dstfile;
$folder = $r[0]['hash'];
}
else {
@@ -64,29 +65,67 @@ if($argc <= 3) {
}
}
-
for($x = 1; $x < ($argc - 1); $x ++) {
- $srcfile = $argv[$x];
-
- $hash = random_string();
+ if(($argv[$x] === '-r') || ($argv[$x] === '-R')) {
+ $recursive = true;
+ continue;
+ }
- $arr = [
- 'src' => $srcfile,
- 'filename' => basename($srcfile),
- 'hash' => $hash,
- 'allow_cid' => $channel['channel_allow_cid'],
- 'allow_gid' => $channel['channel_allow_gid'],
- 'deny_cid' => $channel['channel_deny_cid'],
- 'deny_gid' => $channel['channel_deny_gid'],
- 'preserve_original' => true,
- ];
+ if(is_dir($argv[$x])) {
+ if($recursive) {
+ dcp_recurse($channel,$argv[$x],$basepath,$folder);
+ }
+ else {
+ continue;
+ }
+ }
+ else {
+ $dstname = (($isadir) ? '' : basename($dstfile));
+ $cmd = [ 'Importfile', $channel['channel_id'], $argv[$x], $folder, $dstname ];
+ \Zotlabs\Daemon\Master::Summon($cmd);
+ }
+ }
- if($folder)
- $arr['folder'] = $folder;
-
- attach_store($channel,$channel['channel_hash'],'import',$arr);
- $sync = attach_export_data($channel,$hash);
- if($sync)
- build_sync_packet($channel['channel_id'],array('file' => array($sync)));
+ function dcp_recurse($channel,$src,$basepath,$folder) {
+ $dir = opendir($src);
+ if($dir) {
+ while(($entry = readdir($dir)) !== false) {
+ if($entry === '.' || $entry === '..')
+ continue;
+ $dstfile = $basepath . '/' . $entry;
+ if(is_dir($src . '/' . $entry)) {
+ $r = q("select * from attach where display_path = '%s' and uid = %d limit 1",
+ dbesc($dstfile),
+ intval($channel['channel_id'])
+ );
+
+ if($r && $r[0]['is_dir']) {
+ $folder = $r[0]['hash'];
+ }
+ else {
+
+ $arr = [
+ 'pathname' => $dstfile,
+ 'allow_cid' => $channel['channel_allow_cid'],
+ 'allow_gid' => $channel['channel_allow_gid'],
+ 'deny_cid' => $channel['channel_deny_cid'],
+ 'deny_gid' => $channel['channel_deny_gid'],
+ ];
+
+ $folder = '';
+ $x = attach_mkdirp($channel,$channel['channel_hash'],$arr);
+ if($x['success'])
+ $folder = $x['data']['hash'];
+ }
+ $basepath = $dstfile;
+ dcp_recurse($channel,$src . '/' . $entry,$basepath,$folder);
+ }
+ else {
+ $cmd = [ 'Importfile', $channel['channel_id'], $src . '/' . $entry, $folder ];
+ \Zotlabs\Daemon\Master::Summon($cmd);
+ }
+ }
+ closedir($dir);
+ }
}