mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4427 from owncloud/fix_4425 

use OC files API to create missing directory
This commit is contained in:
Morris Jobke 2013-08-17 08:09:07 -07:00
parent a1128aadd0 f28f528431
commit 6ae6dc00e5
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/files_versions/lib/versions.php
View File

@ -109,11 +109,7 @@ class Storage {
} }
// create all parent folders // create all parent folders
$info=pathinfo($filename); self::createMissingDirectories($filename, $users_view);
$versionsFolderName=$versions_view->getLocalFolder('');
if(!file_exists($versionsFolderName.'/'.$info['dirname'])) {
mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true);
}
$versionsSize = self::getVersionsSize($uid); $versionsSize = self::getVersionsSize($uid);
if ( $versionsSize === false || $versionsSize < 0 ) { if ( $versionsSize === false || $versionsSize < 0 ) {
@ -182,13 +178,12 @@ class Storage {
self::expire($newpath); self::expire($newpath);
$abs_newpath = $versions_view->getLocalFile($newpath);
if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) { if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) {
$versions_view->rename($oldpath, $newpath); $versions_view->rename($oldpath, $newpath);
} else if ( ($versions = Storage::getVersions($uid, $oldpath)) ) { } else if ( ($versions = Storage::getVersions($uid, $oldpath)) ) {
$info=pathinfo($abs_newpath); // create missing dirs if necessary
if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true); self::createMissingDirectories($newpath, new \OC\Files\View('/'. $uidn));
foreach ($versions as $v) { foreach ($versions as $v) {
$versions_view->rename($oldpath.'.v'.$v['version'], $newpath.'.v'.$v['version']); $versions_view->rename($oldpath.'.v'.$v['version'], $newpath.'.v'.$v['version']);
} }
@ -567,4 +562,21 @@ class Storage {
return $size; return $size;
} }
/**
* @brief create recursively missing directories
* @param string $filename $path to a file
* @param \OC\Files\View $view view on data/user/
*/
private static function createMissingDirectories($filename, $view) {
$dirname = \OC_Filesystem::normalizePath(dirname($filename));
$dirParts = explode('/', $dirname);
$dir = "/files_versions";
foreach ($dirParts as $part) {
$dir = $dir . '/' . $part;
if (!$view->file_exists($dir)) {
$view->mkdir($dir);
}
}
}
} }