Skip to content

Commit

Permalink
Eslint fix
Browse files Browse the repository at this point in the history
Signed-off-by: Arne Hamann <[email protected]>
  • Loading branch information
tacruc committed Aug 31, 2023
1 parent 2bb195d commit ac75935
Showing 1 changed file with 21 additions and 20 deletions.
41 changes: 21 additions & 20 deletions lib/Mount/GroupFolderPropagator.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

namespace OCA\GroupFolders\Mount;

use OC\Files\Cache\Propagator;
Expand Down Expand Up @@ -64,21 +65,21 @@ public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $c
*/
protected function getParents($pathOrigin) {
$groupFolderPath = $this->getGroupFolderMountPoint($this->folderId);
if(!strstr($pathOrigin,$groupFolderPath)){
$path=str_replace('//','/',$groupFolderPath.'/'.$pathOrigin);
}else{
if (!strstr($pathOrigin, $groupFolderPath)) {
$path = str_replace('//', '/', $groupFolderPath . '/' . $pathOrigin);
} else {
$path = $pathOrigin;
}
$parents = parent::getParents($path);
$parentsGroupFolders = $this->getGroupFolderParents();
$fullParents = array_merge($parents,$parentsGroupFolders);
$this->logger->debug('GroupFolders::Propagator',[
'pathOrigin'=>$pathOrigin,
'path'=>$path,
'groupFolderPath'=>$groupFolderPath,
'parents'=>$parents,
'parentsGroupFolders'=>$parentsGroupFolders,
'fullParents'=>$fullParents,
$fullParents = array_merge($parents, $parentsGroupFolders);
$this->logger->debug('GroupFolders::Propagator', [
'pathOrigin' => $pathOrigin,
'path' => $path,
'groupFolderPath' => $groupFolderPath,
'parents' => $parents,
'parentsGroupFolders' => $parentsGroupFolders,
'fullParents' => $fullParents,
]);
return $fullParents;
}
Expand All @@ -88,30 +89,30 @@ protected function getParents($pathOrigin) {
*
* @return array
*/
protected function getGroupFolderParents(){
protected function getGroupFolderParents() {
// Get folder mountpoint
$query = $this->connection->getQueryBuilder();
$query->select('mount_point')
->from('group_folders')
->where($query->expr()->eq('folder_id', $query->createNamedParameter($this->folderId)));
$mountPoint = $query->execute()->fetchOne();
$parentsMountPoints = [];
while($mountPoint != '.'){
while ($mountPoint != '.') {
$parentMountPoint = dirname($mountPoint);
if($parentMountPoint != '.'){
$parentsMountPoints[]=$parentMountPoint;
if ($parentMountPoint != '.') {
$parentsMountPoints[] = $parentMountPoint;
}
$mountPoint = $parentMountPoint;
}
$query->select('folder_id')
->from('group_folders')
->where($query->expr()->in('mount_point',$query->createNamedParameter($parentsMountPoints, IQueryBuilder::PARAM_STR_ARRAY)));
->where($query->expr()->in('mount_point', $query->createNamedParameter($parentsMountPoints, IQueryBuilder::PARAM_STR_ARRAY)));

$parentsIds = $query->execute()->fetchAll();
return array_map(function($folderId){
return array_map(function ($folderId) {
return $this->getGroupFolderMountPoint($folderId['folder_id']);
}
,$parentsIds);
, $parentsIds);
}

/**
Expand All @@ -120,8 +121,8 @@ protected function getGroupFolderParents(){
* @param int $groupFolderId
* @return string
*/
protected function getGroupFolderMountPoint($groupFolderId){
return '__groupfolders/'.$groupFolderId;
protected function getGroupFolderMountPoint($groupFolderId) {
return '__groupfolders/' . $groupFolderId;
}

}

0 comments on commit ac75935

Please sign in to comment.