external-repos/pictshare
1
0
Fork 0
mirror of https://github.com/HaschekSolutions/pictshare.git synced 2025-11-14 20:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed dev output

Browse Source
This commit is contained in:
Chris
2020-01-12 13:38:27 +01:00
parent 6c556e921f
commit 6ec765024e
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage-controllers/ftp.controller.php
View File

@@ -54,7 +54,7 @@ class FTPStorage implements StorageController
function getItems($dev=false) function getItems($dev=false)
{ {
if(!$this->connect()) return false; if(!$this->connect()) return false;
return $this->ftp_list_files_recursive(FTP_BASEDIR); return $this->ftp_list_files_recursive(FTP_BASEDIR,$dev);
} }
function pullFile($hash,$location) function pullFile($hash,$location)
@@ -106,7 +106,7 @@ class FTPStorage implements StorageController
} }
} }
function ftp_list_files_recursive($path) function ftp_list_files_recursive($path,$dev=false)
{ {
if(!$this->connect()) return false; if(!$this->connect()) return false;
$items = ftp_mlsd($this->connection, $path); $items = ftp_mlsd($this->connection, $path);
@@ -122,13 +122,15 @@ class FTPStorage implements StorageController
if ($type == 'dir') if ($type == 'dir')
{ {
$result = $result =
array_merge($result, $this->ftp_list_files_recursive($filepath)); array_merge($result, $this->ftp_list_files_recursive($filepath,$dev));
} }
else if(mightBeAHash($name) || endswith($name,'.enc')) else if(mightBeAHash($name) || endswith($name,'.enc'))
{ {
$result[] = $name; $result[] = $name;
if($dev===true) echo " Got $name \r";
} }
} }
return $result; return $result;
} }
} }

4
storage-controllers/s3.controller.php
View File

@@ -57,13 +57,11 @@ class S3Storage implements StorageController
++$count; ++$count;
foreach ($objects['Contents'] as $object){ foreach ($objects['Contents'] as $object){
//echo $count." {$object['Key']}\n";
$lastkey = $object['Key']; $lastkey = $object['Key'];
$items[] = $lastkey; $items[] = $lastkey;
} }
if($dev===true) if($dev===true) echo " Got ".($count*$keys)." files \r";
echo "Got ".($count*$keys)." files \r";
$KeyCount = $objects['KeyCount']; $KeyCount = $objects['KeyCount'];
} }

4
tools/storagecontroller-sync.php
View File

@@ -52,9 +52,9 @@ if(!in_array('p2',$argv))
foreach($controllers as $contr) foreach($controllers as $contr)
{ {
echo " [P1] Collecting list of items from ".get_class($contr).".."; echo " [P1] Collecting list of items from ".get_class($contr)."..\n";
$controllerfiles = $contr->getItems(true); $controllerfiles = $contr->getItems(true);
echo " done. Got ".count($controllerfiles)." files\n"; echo "\n done. Got ".count($controllerfiles)." files\n";
if($controllerfiles) if($controllerfiles)
foreach($controllerfiles as $cfile) foreach($controllerfiles as $cfile)
{ {