wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use filtered list for ext storage list mounts API

Browse source 
Now the external storage correctly returns the mount points visible only
for the current user by using the method getAbsoluteMountPoints() which
is already filtered.

Since that call was missing the backend name which is important for the
UI, this one was added as well.
This commit is contained in:
Vincent Petry 2014-06-30 12:33:11 +02:00
parent 589f68ebf6
commit 8977a68548
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/files_external/lib/api.php
View file

@ -27,27 +27,32 @@ class Api {
/**
* Formats the given mount config to a mount entry.
*
* @param bool $isSystemMount true for system mount, false
* for personal mount
* @param string $mountPoint mount point name, relative to the data dir
* @param array $mountConfig mount config to format
*
* @return array entry
*/
private static function formatMount($mountConfig, $isSystemMount = false) {
// split user name from mount point
$path = dirname($mountConfig['mountpoint']);
private static function formatMount($mountPoint, $mountConfig) {
// strip "/$user/files" from mount point
$mountPoint = explode('/', trim($mountPoint, '/'), 3);
$mountPoint = $mountPoint[2];
// split path from mount point
$path = dirname($mountPoint);
if ($path === '.') {
$path = '';
}
$isSystemMount = !$mountConfig['personal'];
$permissions = \OCP\PERMISSION_READ;
// personal mounts can be deleted
if (!$isSystemMount) {
$permissions |= \OCP\PERMISSION_DELETE;
}
// TODO: add storageType, might need to use another OC_Mount_Config method
$entry = array(
'name' => basename($mountConfig['mountpoint']),
'name' => basename($mountPoint),
'path' => $path,
'type' => 'dir',
'backend' => $mountConfig['backend'],
@ -67,15 +72,9 @@ class Api {
$entries = array();
$user = \OC_User::getUser();
$personalMounts = \OC_Mount_Config::getPersonalMountPoints();
$systemMounts = \OC_Mount_Config::getSystemMountPoints();
foreach ($systemMounts as $mountConfig) {
$entries[] = self::formatMount($mountConfig, true);
}
foreach ($personalMounts as $mountConfig) {
$entries[] = self::formatMount($mountConfig, false);
$mounts = \OC_Mount_Config::getAbsoluteMountPoints($user);
foreach($mounts as $mountPoint => $mount) {
$entries[] = self::formatMount($mountPoint, $mount);
}
return new \OC_OCS_Result($entries);

5
apps/files_external/lib/config.php
View file

@ -156,6 +156,7 @@ class OC_Mount_Config {
if ( (!isset($mountPoints[$mountPoint]))
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority']) ) {
$options['priority_type'] = self::MOUNT_TYPE_GLOBAL;
$options['backend'] = $backends[$options['class']]['backend'];
$mountPoints[$mountPoint] = $options;
}
}
@ -177,6 +178,7 @@ class OC_Mount_Config {
if ( (!isset($mountPoints[$mountPoint]))
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority']) ) {
$options['priority_type'] = self::MOUNT_TYPE_GLOBAL;
$options['backend'] = $backends[$options['class']]['backend'];
$mountPoints[$mountPoint] = $options;
}
}
@ -201,6 +203,7 @@ class OC_Mount_Config {
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority'])
|| ($mountPoints[$mountPoint]['priority_type'] !== self::MOUNT_TYPE_GROUP) ) {
$options['priority_type'] = self::MOUNT_TYPE_GROUP;
$options['backend'] = $backends[$options['class']]['backend'];
$mountPoints[$mountPoint] = $options;
}
}
@ -227,6 +230,7 @@ class OC_Mount_Config {
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority'])
|| ($mountPoints[$mountPoint]['priority_type'] !== self::MOUNT_TYPE_USER) ) {
$options['priority_type'] = self::MOUNT_TYPE_USER;
$options['backend'] = $backends[$options['class']]['backend'];
$mountPoints[$mountPoint] = $options;
}
}
@ -243,6 +247,7 @@ class OC_Mount_Config {
// Always override previous config
$options['priority_type'] = self::MOUNT_TYPE_PERSONAL;
$options['backend'] = $backends[$options['class']]['backend'];
$mountPoints[$mountPoint] = $options;
}
}