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

fix some edge cases while scanning the root of a storage

Browse source
This commit is contained in:
Robin Appelman 2012-12-02 03:43:51 +01:00
parent 72b6faa69d
commit 01eb5d2790
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/files/cache/scanner.php vendored
View file

@ -71,7 +71,7 @@ class Scanner {
\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId));
$data = $this->getData($file);
if ($data) {
if ($file !== '') {
if ($file) {
$parent = dirname($file);
if ($parent === '.') {
$parent = '';
@ -101,7 +101,7 @@ class Scanner {
if ($dh = $this->storage->opendir($path)) {
while ($file = readdir($dh)) {
if ($file !== '.' and $file !== '..') {
$child = ($path !== '') ? $path . '/' . $file : $file;
$child = ($path) ? $path . '/' . $file : $file;
$data = $this->scanFile($child);
if ($data) {
if ($data['mimetype'] === 'httpd/unix-directory') {

4
lib/files/filesystem.php
View file

@ -143,8 +143,8 @@ class Filesystem {
* @return string
*/
static public function getMountPoint($path) {
\OC_Hook::emit(self::CLASSNAME, 'get_mountpoint', array('path' => $path));
$path = self::normalizePath($path) . '/';
\OC_Hook::emit(self::CLASSNAME, 'get_mountpoint', array('path' => $path));
$foundMountPoint = '';
$mountPoints = array_keys(self::$mounts);
foreach ($mountPoints as $mountpoint) {
@ -205,7 +205,7 @@ class Filesystem {
$mountpoint = self::getMountPoint($path);
if ($mountpoint) {
$storage = self::getStorage($mountpoint);
if ($mountpoint === $path) {
if ($mountpoint === $path or $mountpoint . '/' === $path) {
$internalPath = '';
} else {
$internalPath = substr($path, strlen($mountpoint));