nextcloud / server

apps/files_versions/lib/Storage.php

Indentation +776 added lines, -776 removed lines

@@ -53,781 +53,781 @@
 
 class Storage {
 
-	const DEFAULTENABLED=true;
-	const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
-	const VERSIONS_ROOT = 'files_versions/';
-
-	const DELETE_TRIGGER_MASTER_REMOVED = 0;
-	const DELETE_TRIGGER_RETENTION_CONSTRAINT = 1;
-	const DELETE_TRIGGER_QUOTA_EXCEEDED = 2;
-
-	// files for which we can remove the versions after the delete operation was successful
-	private static $deletedFiles = array();
-
-	private static $sourcePathAndUser = array();
-
-	private static $max_versions_per_interval = array(
-		//first 10sec, one version every 2sec
-		1 => array('intervalEndsAfter' => 10,      'step' => 2),
-		//next minute, one version every 10sec
-		2 => array('intervalEndsAfter' => 60,      'step' => 10),
-		//next hour, one version every minute
-		3 => array('intervalEndsAfter' => 3600,    'step' => 60),
-		//next 24h, one version every hour
-		4 => array('intervalEndsAfter' => 86400,   'step' => 3600),
-		//next 30days, one version per day
-		5 => array('intervalEndsAfter' => 2592000, 'step' => 86400),
-		//until the end one version per week
-		6 => array('intervalEndsAfter' => -1,      'step' => 604800),
-	);
-
-	/** @var \OCA\Files_Versions\AppInfo\Application */
-	private static $application;
-
-	/**
-	 * get the UID of the owner of the file and the path to the file relative to
-	 * owners files folder
-	 *
-	 * @param string $filename
-	 * @return array
-	 * @throws \OC\User\NoUserException
-	 */
-	public static function getUidAndFilename($filename) {
-		$uid = Filesystem::getOwner($filename);
-		$userManager = \OC::$server->getUserManager();
-		// if the user with the UID doesn't exists, e.g. because the UID points
-		// to a remote user with a federated cloud ID we use the current logged-in
-		// user. We need a valid local user to create the versions
-		if (!$userManager->userExists($uid)) {
-			$uid = User::getUser();
-		}
-		Filesystem::initMountPoints($uid);
-		if ( $uid != User::getUser() ) {
-			$info = Filesystem::getFileInfo($filename);
-			$ownerView = new View('/'.$uid.'/files');
-			try {
-				$filename = $ownerView->getPath($info['fileid']);
-				// make sure that the file name doesn't end with a trailing slash
-				// can for example happen single files shared across servers
-				$filename = rtrim($filename, '/');
-			} catch (NotFoundException $e) {
-				$filename = null;
-			}
-		}
-		return [$uid, $filename];
-	}
-
-	/**
-	 * Remember the owner and the owner path of the source file
-	 *
-	 * @param string $source source path
-	 */
-	public static function setSourcePathAndUser($source) {
-		list($uid, $path) = self::getUidAndFilename($source);
-		self::$sourcePathAndUser[$source] = array('uid' => $uid, 'path' => $path);
-	}
-
-	/**
-	 * Gets the owner and the owner path from the source path
-	 *
-	 * @param string $source source path
-	 * @return array with user id and path
-	 */
-	public static function getSourcePathAndUser($source) {
-
-		if (isset(self::$sourcePathAndUser[$source])) {
-			$uid = self::$sourcePathAndUser[$source]['uid'];
-			$path = self::$sourcePathAndUser[$source]['path'];
-			unset(self::$sourcePathAndUser[$source]);
-		} else {
-			$uid = $path = false;
-		}
-		return array($uid, $path);
-	}
-
-	/**
-	 * get current size of all versions from a given user
-	 *
-	 * @param string $user user who owns the versions
-	 * @return int versions size
-	 */
-	private static function getVersionsSize($user) {
-		$view = new View('/' . $user);
-		$fileInfo = $view->getFileInfo('/files_versions');
-		return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
-	}
-
-	/**
-	 * store a new version of a file.
-	 */
-	public static function store($filename) {
-		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-
-			// if the file gets streamed we need to remove the .part extension
-			// to get the right target
-			$ext = pathinfo($filename, PATHINFO_EXTENSION);
-			if ($ext === 'part') {
-				$filename = substr($filename, 0, strlen($filename) - 5);
-			}
-
-			// we only handle existing files
-			if (! Filesystem::file_exists($filename) || Filesystem::is_dir($filename)) {
-				return false;
-			}
-
-			list($uid, $filename) = self::getUidAndFilename($filename);
-
-			$files_view = new View('/'.$uid .'/files');
-			$users_view = new View('/'.$uid);
-
-			// no use making versions for empty files
-			if ($files_view->filesize($filename) === 0) {
-				return false;
-			}
-
-			// create all parent folders
-			self::createMissingDirectories($filename, $users_view);
-
-			self::scheduleExpire($uid, $filename);
-
-			// store a new version of a file
-			$mtime = $users_view->filemtime('files/' . $filename);
-			$users_view->copy('files/' . $filename, 'files_versions/' . $filename . '.v' . $mtime);
-			// call getFileInfo to enforce a file cache entry for the new version
-			$users_view->getFileInfo('files_versions/' . $filename . '.v' . $mtime);
-		}
-	}
-
-
-	/**
-	 * mark file as deleted so that we can remove the versions if the file is gone
-	 * @param string $path
-	 */
-	public static function markDeletedFile($path) {
-		list($uid, $filename) = self::getUidAndFilename($path);
-		self::$deletedFiles[$path] = array(
-			'uid' => $uid,
-			'filename' => $filename);
-	}
-
-	/**
-	 * delete the version from the storage and cache
-	 *
-	 * @param View $view
-	 * @param string $path
-	 */
-	protected static function deleteVersion($view, $path) {
-		$view->unlink($path);
-		/**
-		 * @var \OC\Files\Storage\Storage $storage
-		 * @var string $internalPath
-		 */
-		list($storage, $internalPath) = $view->resolvePath($path);
-		$cache = $storage->getCache($internalPath);
-		$cache->remove($internalPath);
-	}
-
-	/**
-	 * Delete versions of a file
-	 */
-	public static function delete($path) {
-
-		$deletedFile = self::$deletedFiles[$path];
-		$uid = $deletedFile['uid'];
-		$filename = $deletedFile['filename'];
-
-		if (!Filesystem::file_exists($path)) {
-
-			$view = new View('/' . $uid . '/files_versions');
-
-			$versions = self::getVersions($uid, $filename);
-			if (!empty($versions)) {
-				foreach ($versions as $v) {
-					\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED));
-					self::deleteVersion($view, $filename . '.v' . $v['version']);
-					\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED));
-				}
-			}
-		}
-		unset(self::$deletedFiles[$path]);
-	}
-
-	/**
-	 * Rename or copy versions of a file of the given paths
-	 *
-	 * @param string $sourcePath source path of the file to move, relative to
-	 * the currently logged in user's "files" folder
-	 * @param string $targetPath target path of the file to move, relative to
-	 * the currently logged in user's "files" folder
-	 * @param string $operation can be 'copy' or 'rename'
-	 */
-	public static function renameOrCopy($sourcePath, $targetPath, $operation) {
-		list($sourceOwner, $sourcePath) = self::getSourcePathAndUser($sourcePath);
-
-		// it was a upload of a existing file if no old path exists
-		// in this case the pre-hook already called the store method and we can
-		// stop here
-		if ($sourcePath === false) {
-			return true;
-		}
-
-		list($targetOwner, $targetPath) = self::getUidAndFilename($targetPath);
-
-		$sourcePath = ltrim($sourcePath, '/');
-		$targetPath = ltrim($targetPath, '/');
-
-		$rootView = new View('');
-
-		// did we move a directory ?
-		if ($rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
-			// does the directory exists for versions too ?
-			if ($rootView->is_dir('/' . $sourceOwner . '/files_versions/' . $sourcePath)) {
-				// create missing dirs if necessary
-				self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
-
-				// move the directory containing the versions
-				$rootView->$operation(
-					'/' . $sourceOwner . '/files_versions/' . $sourcePath,
-					'/' . $targetOwner . '/files_versions/' . $targetPath
-				);
-			}
-		} else if ($versions = Storage::getVersions($sourceOwner, '/' . $sourcePath)) {
-			// create missing dirs if necessary
-			self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
-
-			foreach ($versions as $v) {
-				// move each version one by one to the target directory
-				$rootView->$operation(
-					'/' . $sourceOwner . '/files_versions/' . $sourcePath.'.v' . $v['version'],
-					'/' . $targetOwner . '/files_versions/' . $targetPath.'.v'.$v['version']
-				);
-			}
-		}
-
-		// if we moved versions directly for a file, schedule expiration check for that file
-		if (!$rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
-			self::scheduleExpire($targetOwner, $targetPath);
-		}
-
-	}
-
-	/**
-	 * Rollback to an old version of a file.
-	 *
-	 * @param string $file file name
-	 * @param int $revision revision timestamp
-	 * @return bool
-	 */
-	public static function rollback($file, $revision) {
-
-		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			// add expected leading slash
-			$file = '/' . ltrim($file, '/');
-			list($uid, $filename) = self::getUidAndFilename($file);
-			if ($uid === null || trim($filename, '/') === '') {
-				return false;
-			}
-
-			$users_view = new View('/'.$uid);
-			$files_view = new View('/'. User::getUser().'/files');
-
-			$versionCreated = false;
-
-			$fileInfo = $files_view->getFileInfo($file);
-
-			// check if user has the permissions to revert a version
-			if (!$fileInfo->isUpdateable()) {
-				return false;
-			}
-
-			//first create a new version
-			$version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename);
-			if (!$users_view->file_exists($version)) {
-				$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
-				$versionCreated = true;
-			}
-
-			$fileToRestore =  'files_versions' . $filename . '.v' . $revision;
-
-			// Restore encrypted version of the old file for the newly restored file
-			// This has to happen manually here since the file is manually copied below
-			$oldVersion = $users_view->getFileInfo($fileToRestore)->getEncryptedVersion();
-			$oldFileInfo = $users_view->getFileInfo($fileToRestore);
-			$cache = $fileInfo->getStorage()->getCache();
-			$cache->update(
-				$fileInfo->getId(), [
-					'encrypted' => $oldVersion,
-					'encryptedVersion' => $oldVersion,
-					'size' => $oldFileInfo->getSize()
-				]
-			);
-
-			// rollback
-			if (self::copyFileContents($users_view, $fileToRestore, 'files' . $filename)) {
-				$files_view->touch($file, $revision);
-				Storage::scheduleExpire($uid, $file);
-				\OC_Hook::emit('\OCP\Versions', 'rollback', array(
-					'path' => $filename,
-					'revision' => $revision,
-				));
-				return true;
-			} else if ($versionCreated) {
-				self::deleteVersion($users_view, $version);
-			}
-		}
-		return false;
-
-	}
-
-	/**
-	 * Stream copy file contents from $path1 to $path2
-	 *
-	 * @param View $view view to use for copying
-	 * @param string $path1 source file to copy
-	 * @param string $path2 target file
-	 *
-	 * @return bool true for success, false otherwise
-	 */
-	private static function copyFileContents($view, $path1, $path2) {
-		/** @var \OC\Files\Storage\Storage $storage1 */
-		list($storage1, $internalPath1) = $view->resolvePath($path1);
-		/** @var \OC\Files\Storage\Storage $storage2 */
-		list($storage2, $internalPath2) = $view->resolvePath($path2);
-
-		$view->lockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
-		$view->lockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
-
-		// TODO add a proper way of overwriting a file while maintaining file ids
-		if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) {
-			$source = $storage1->fopen($internalPath1, 'r');
-			$target = $storage2->fopen($internalPath2, 'w');
-			list(, $result) = \OC_Helper::streamCopy($source, $target);
-			fclose($source);
-			fclose($target);
-
-			if ($result !== false) {
-				$storage1->unlink($internalPath1);
-			}
-		} else {
-			$result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
-		}
-
-		$view->unlockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
-		$view->unlockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
-
-		return ($result !== false);
-	}
-
-	/**
-	 * get a list of all available versions of a file in descending chronological order
-	 * @param string $uid user id from the owner of the file
-	 * @param string $filename file to find versions of, relative to the user files dir
-	 * @param string $userFullPath
-	 * @return array versions newest version first
-	 */
-	public static function getVersions($uid, $filename, $userFullPath = '') {
-		$versions = array();
-		if (empty($filename)) {
-			return $versions;
-		}
-		// fetch for old versions
-		$view = new View('/' . $uid . '/');
-
-		$pathinfo = pathinfo($filename);
-		$versionedFile = $pathinfo['basename'];
-
-		$dir = Filesystem::normalizePath(self::VERSIONS_ROOT . '/' . $pathinfo['dirname']);
-
-		$dirContent = false;
-		if ($view->is_dir($dir)) {
-			$dirContent = $view->opendir($dir);
-		}
-
-		if ($dirContent === false) {
-			return $versions;
-		}
-
-		if (is_resource($dirContent)) {
-			while (($entryName = readdir($dirContent)) !== false) {
-				if (!Filesystem::isIgnoredDir($entryName)) {
-					$pathparts = pathinfo($entryName);
-					$filename = $pathparts['filename'];
-					if ($filename === $versionedFile) {
-						$pathparts = pathinfo($entryName);
-						$timestamp = substr($pathparts['extension'], 1);
-						$filename = $pathparts['filename'];
-						$key = $timestamp . '#' . $filename;
-						$versions[$key]['version'] = $timestamp;
-						$versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($timestamp);
-						if (empty($userFullPath)) {
-							$versions[$key]['preview'] = '';
-						} else {
-							$versions[$key]['preview'] = \OC::$server->getURLGenerator('files_version.Preview.getPreview', ['file' => $userFullPath, 'version' => $timestamp]);
-						}
-						$versions[$key]['path'] = Filesystem::normalizePath($pathinfo['dirname'] . '/' . $filename);
-						$versions[$key]['name'] = $versionedFile;
-						$versions[$key]['size'] = $view->filesize($dir . '/' . $entryName);
-						$versions[$key]['mimetype'] = \OC::$server->getMimeTypeDetector()->detectPath($versionedFile);
-					}
-				}
-			}
-			closedir($dirContent);
-		}
-
-		// sort with newest version first
-		krsort($versions);
-
-		return $versions;
-	}
-
-	/**
-	 * Expire versions that older than max version retention time
-	 * @param string $uid
-	 */
-	public static function expireOlderThanMaxForUser($uid){
-		$expiration = self::getExpiration();
-		$threshold = $expiration->getMaxAgeAsTimestamp();
-		$versions = self::getAllVersions($uid);
-		if (!$threshold || !array_key_exists('all', $versions)) {
-			return;
-		}
-
-		$toDelete = [];
-		foreach (array_reverse($versions['all']) as $key => $version) {
-			if (intval($version['version'])<$threshold) {
-				$toDelete[$key] = $version;
-			} else {
-				//Versions are sorted by time - nothing mo to iterate.
-				break;
-			}
-		}
-
-		$view = new View('/' . $uid . '/files_versions');
-		if (!empty($toDelete)) {
-			foreach ($toDelete as $version) {
-				\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT));
-				self::deleteVersion($view, $version['path'] . '.v' . $version['version']);
-				\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT));
-			}
-		}
-	}
-
-	/**
-	 * translate a timestamp into a string like "5 days ago"
-	 * @param int $timestamp
-	 * @return string for example "5 days ago"
-	 */
-	private static function getHumanReadableTimestamp($timestamp) {
-
-		$diff = time() - $timestamp;
-
-		if ($diff < 60) { // first minute
-			return  $diff . " seconds ago";
-		} elseif ($diff < 3600) { //first hour
-			return round($diff / 60) . " minutes ago";
-		} elseif ($diff < 86400) { // first day
-			return round($diff / 3600) . " hours ago";
-		} elseif ($diff < 604800) { //first week
-			return round($diff / 86400) . " days ago";
-		} elseif ($diff < 2419200) { //first month
-			return round($diff / 604800) . " weeks ago";
-		} elseif ($diff < 29030400) { // first year
-			return round($diff / 2419200) . " months ago";
-		} else {
-			return round($diff / 29030400) . " years ago";
-		}
-
-	}
-
-	/**
-	 * returns all stored file versions from a given user
-	 * @param string $uid id of the user
-	 * @return array with contains two arrays 'all' which contains all versions sorted by age and 'by_file' which contains all versions sorted by filename
-	 */
-	private static function getAllVersions($uid) {
-		$view = new View('/' . $uid . '/');
-		$dirs = array(self::VERSIONS_ROOT);
-		$versions = array();
-
-		while (!empty($dirs)) {
-			$dir = array_pop($dirs);
-			$files = $view->getDirectoryContent($dir);
-
-			foreach ($files as $file) {
-				$fileData = $file->getData();
-				$filePath = $dir . '/' . $fileData['name'];
-				if ($file['type'] === 'dir') {
-					array_push($dirs, $filePath);
-				} else {
-					$versionsBegin = strrpos($filePath, '.v');
-					$relPathStart = strlen(self::VERSIONS_ROOT);
-					$version = substr($filePath, $versionsBegin + 2);
-					$relpath = substr($filePath, $relPathStart, $versionsBegin - $relPathStart);
-					$key = $version . '#' . $relpath;
-					$versions[$key] = array('path' => $relpath, 'timestamp' => $version);
-				}
-			}
-		}
-
-		// newest version first
-		krsort($versions);
-
-		$result = array();
-
-		foreach ($versions as $key => $value) {
-			$size = $view->filesize(self::VERSIONS_ROOT.'/'.$value['path'].'.v'.$value['timestamp']);
-			$filename = $value['path'];
-
-			$result['all'][$key]['version'] = $value['timestamp'];
-			$result['all'][$key]['path'] = $filename;
-			$result['all'][$key]['size'] = $size;
-
-			$result['by_file'][$filename][$key]['version'] = $value['timestamp'];
-			$result['by_file'][$filename][$key]['path'] = $filename;
-			$result['by_file'][$filename][$key]['size'] = $size;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * get list of files we want to expire
-	 * @param array $versions list of versions
-	 * @param integer $time
-	 * @param bool $quotaExceeded is versions storage limit reached
-	 * @return array containing the list of to deleted versions and the size of them
-	 */
-	protected static function getExpireList($time, $versions, $quotaExceeded = false) {
-		$expiration = self::getExpiration();
-
-		if ($expiration->shouldAutoExpire()) {
-			list($toDelete, $size) = self::getAutoExpireList($time, $versions);
-		} else {
-			$size = 0;
-			$toDelete = [];  // versions we want to delete
-		}
-
-		foreach ($versions as $key => $version) {
-			if ($expiration->isExpired($version['version'], $quotaExceeded) && !isset($toDelete[$key])) {
-				$size += $version['size'];
-				$toDelete[$key] = $version['path'] . '.v' . $version['version'];
-			}
-		}
-
-		return [$toDelete, $size];
-	}
-
-	/**
-	 * get list of files we want to expire
-	 * @param array $versions list of versions
-	 * @param integer $time
-	 * @return array containing the list of to deleted versions and the size of them
-	 */
-	protected static function getAutoExpireList($time, $versions) {
-		$size = 0;
-		$toDelete = array();  // versions we want to delete
-
-		$interval = 1;
-		$step = Storage::$max_versions_per_interval[$interval]['step'];
-		if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {
-			$nextInterval = -1;
-		} else {
-			$nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
-		}
-
-		$firstVersion = reset($versions);
-		$firstKey = key($versions);
-		$prevTimestamp = $firstVersion['version'];
-		$nextVersion = $firstVersion['version'] - $step;
-		unset($versions[$firstKey]);
-
-		foreach ($versions as $key => $version) {
-			$newInterval = true;
-			while ($newInterval) {
-				if ($nextInterval == -1 || $prevTimestamp > $nextInterval) {
-					if ($version['version'] > $nextVersion) {
-						//distance between two version too small, mark to delete
-						$toDelete[$key] = $version['path'] . '.v' . $version['version'];
-						$size += $version['size'];
-						\OCP\Util::writeLog('files_versions', 'Mark to expire '. $version['path'] .' next version should be ' . $nextVersion . " or smaller. (prevTimestamp: " . $prevTimestamp . "; step: " . $step, \OCP\Util::INFO);
-					} else {
-						$nextVersion = $version['version'] - $step;
-						$prevTimestamp = $version['version'];
-					}
-					$newInterval = false; // version checked so we can move to the next one
-				} else { // time to move on to the next interval
-					$interval++;
-					$step = Storage::$max_versions_per_interval[$interval]['step'];
-					$nextVersion = $prevTimestamp - $step;
-					if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {
-						$nextInterval = -1;
-					} else {
-						$nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
-					}
-					$newInterval = true; // we changed the interval -> check same version with new interval
-				}
-			}
-		}
-
-		return array($toDelete, $size);
-	}
-
-	/**
-	 * Schedule versions expiration for the given file
-	 *
-	 * @param string $uid owner of the file
-	 * @param string $fileName file/folder for which to schedule expiration
-	 */
-	private static function scheduleExpire($uid, $fileName) {
-		// let the admin disable auto expire
-		$expiration = self::getExpiration();
-		if ($expiration->isEnabled()) {
-			$command = new Expire($uid, $fileName);
-			\OC::$server->getCommandBus()->push($command);
-		}
-	}
-
-	/**
-	 * Expire versions which exceed the quota
-	 *
-	 * @param string $filename
-	 * @return bool|int|null
-	 */
-	public static function expire($filename) {
-		$config = \OC::$server->getConfig();
-		$expiration = self::getExpiration();
-
-		if($config->getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' && $expiration->isEnabled()) {
-
-			if (!Filesystem::file_exists($filename)) {
-				return false;
-			}
-
-			list($uid, $filename) = self::getUidAndFilename($filename);
-			if (empty($filename)) {
-				// file maybe renamed or deleted
-				return false;
-			}
-			$versionsFileview = new View('/'.$uid.'/files_versions');
-
-			// get available disk space for user
-			$user = \OC::$server->getUserManager()->get($uid);
-			$softQuota = true;
-			$quota = $user->getQuota();
-			if ( $quota === null || $quota === 'none' ) {
-				$quota = Filesystem::free_space('/');
-				$softQuota = false;
-			} else {
-				$quota = \OCP\Util::computerFileSize($quota);
-			}
-
-			// make sure that we have the current size of the version history
-			$versionsSize = self::getVersionsSize($uid);
-
-			// calculate available space for version history
-			// subtract size of files and current versions size from quota
-			if ($quota >= 0) {
-				if ($softQuota) {
-					$files_view = new View('/' . $uid . '/files');
-					$rootInfo = $files_view->getFileInfo('/', false);
-					$free = $quota - $rootInfo['size']; // remaining free space for user
-					if ($free > 0) {
-						$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
-					} else {
-						$availableSpace = $free - $versionsSize;
-					}
-				} else {
-					$availableSpace = $quota;
-				}
-			} else {
-				$availableSpace = PHP_INT_MAX;
-			}
-
-			$allVersions = Storage::getVersions($uid, $filename);
-
-			$time = time();
-			list($toDelete, $sizeOfDeletedVersions) = self::getExpireList($time, $allVersions, $availableSpace <= 0);
-
-			$availableSpace = $availableSpace + $sizeOfDeletedVersions;
-			$versionsSize = $versionsSize - $sizeOfDeletedVersions;
-
-			// if still not enough free space we rearrange the versions from all files
-			if ($availableSpace <= 0) {
-				$result = Storage::getAllVersions($uid);
-				$allVersions = $result['all'];
-
-				foreach ($result['by_file'] as $versions) {
-					list($toDeleteNew, $size) = self::getExpireList($time, $versions, $availableSpace <= 0);
-					$toDelete = array_merge($toDelete, $toDeleteNew);
-					$sizeOfDeletedVersions += $size;
-				}
-				$availableSpace = $availableSpace + $sizeOfDeletedVersions;
-				$versionsSize = $versionsSize - $sizeOfDeletedVersions;
-			}
-
-			foreach($toDelete as $key => $path) {
-				\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED));
-				self::deleteVersion($versionsFileview, $path);
-				\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED));
-				unset($allVersions[$key]); // update array with the versions we keep
-				\OCP\Util::writeLog('files_versions', "Expire: " . $path, \OCP\Util::INFO);
-			}
-
-			// Check if enough space is available after versions are rearranged.
-			// If not we delete the oldest versions until we meet the size limit for versions,
-			// but always keep the two latest versions
-			$numOfVersions = count($allVersions) -2 ;
-			$i = 0;
-			// sort oldest first and make sure that we start at the first element
-			ksort($allVersions);
-			reset($allVersions);
-			while ($availableSpace < 0 && $i < $numOfVersions) {
-				$version = current($allVersions);
-				\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED));
-				self::deleteVersion($versionsFileview, $version['path'] . '.v' . $version['version']);
-				\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED));
-				\OCP\Util::writeLog('files_versions', 'running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'] , \OCP\Util::INFO);
-				$versionsSize -= $version['size'];
-				$availableSpace += $version['size'];
-				next($allVersions);
-				$i++;
-			}
-
-			return $versionsSize; // finally return the new size of the version history
-		}
-
-		return false;
-	}
-
-	/**
-	 * Create recursively missing directories inside of files_versions
-	 * that match the given path to a file.
-	 *
-	 * @param string $filename $path to a file, relative to the user's
-	 * "files" folder
-	 * @param View $view view on data/user/
-	 */
-	private static function createMissingDirectories($filename, $view) {
-		$dirname = 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);
-			}
-		}
-	}
-
-	/**
-	 * Static workaround
-	 * @return Expiration
-	 */
-	protected static function getExpiration(){
-		if (is_null(self::$application)) {
-			self::$application = new Application();
-		}
-		return self::$application->getContainer()->query('Expiration');
-	}
+    const DEFAULTENABLED=true;
+    const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
+    const VERSIONS_ROOT = 'files_versions/';
+
+    const DELETE_TRIGGER_MASTER_REMOVED = 0;
+    const DELETE_TRIGGER_RETENTION_CONSTRAINT = 1;
+    const DELETE_TRIGGER_QUOTA_EXCEEDED = 2;
+
+    // files for which we can remove the versions after the delete operation was successful
+    private static $deletedFiles = array();
+
+    private static $sourcePathAndUser = array();
+
+    private static $max_versions_per_interval = array(
+        //first 10sec, one version every 2sec
+        1 => array('intervalEndsAfter' => 10,      'step' => 2),
+        //next minute, one version every 10sec
+        2 => array('intervalEndsAfter' => 60,      'step' => 10),
+        //next hour, one version every minute
+        3 => array('intervalEndsAfter' => 3600,    'step' => 60),
+        //next 24h, one version every hour
+        4 => array('intervalEndsAfter' => 86400,   'step' => 3600),
+        //next 30days, one version per day
+        5 => array('intervalEndsAfter' => 2592000, 'step' => 86400),
+        //until the end one version per week
+        6 => array('intervalEndsAfter' => -1,      'step' => 604800),
+    );
+
+    /** @var \OCA\Files_Versions\AppInfo\Application */
+    private static $application;
+
+    /**
+     * get the UID of the owner of the file and the path to the file relative to
+     * owners files folder
+     *
+     * @param string $filename
+     * @return array
+     * @throws \OC\User\NoUserException
+     */
+    public static function getUidAndFilename($filename) {
+        $uid = Filesystem::getOwner($filename);
+        $userManager = \OC::$server->getUserManager();
+        // if the user with the UID doesn't exists, e.g. because the UID points
+        // to a remote user with a federated cloud ID we use the current logged-in
+        // user. We need a valid local user to create the versions
+        if (!$userManager->userExists($uid)) {
+            $uid = User::getUser();
+        }
+        Filesystem::initMountPoints($uid);
+        if ( $uid != User::getUser() ) {
+            $info = Filesystem::getFileInfo($filename);
+            $ownerView = new View('/'.$uid.'/files');
+            try {
+                $filename = $ownerView->getPath($info['fileid']);
+                // make sure that the file name doesn't end with a trailing slash
+                // can for example happen single files shared across servers
+                $filename = rtrim($filename, '/');
+            } catch (NotFoundException $e) {
+                $filename = null;
+            }
+        }
+        return [$uid, $filename];
+    }
+
+    /**
+     * Remember the owner and the owner path of the source file
+     *
+     * @param string $source source path
+     */
+    public static function setSourcePathAndUser($source) {
+        list($uid, $path) = self::getUidAndFilename($source);
+        self::$sourcePathAndUser[$source] = array('uid' => $uid, 'path' => $path);
+    }
+
+    /**
+     * Gets the owner and the owner path from the source path
+     *
+     * @param string $source source path
+     * @return array with user id and path
+     */
+    public static function getSourcePathAndUser($source) {
+
+        if (isset(self::$sourcePathAndUser[$source])) {
+            $uid = self::$sourcePathAndUser[$source]['uid'];
+            $path = self::$sourcePathAndUser[$source]['path'];
+            unset(self::$sourcePathAndUser[$source]);
+        } else {
+            $uid = $path = false;
+        }
+        return array($uid, $path);
+    }
+
+    /**
+     * get current size of all versions from a given user
+     *
+     * @param string $user user who owns the versions
+     * @return int versions size
+     */
+    private static function getVersionsSize($user) {
+        $view = new View('/' . $user);
+        $fileInfo = $view->getFileInfo('/files_versions');
+        return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
+    }
+
+    /**
+     * store a new version of a file.
+     */
+    public static function store($filename) {
+        if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+
+            // if the file gets streamed we need to remove the .part extension
+            // to get the right target
+            $ext = pathinfo($filename, PATHINFO_EXTENSION);
+            if ($ext === 'part') {
+                $filename = substr($filename, 0, strlen($filename) - 5);
+            }
+
+            // we only handle existing files
+            if (! Filesystem::file_exists($filename) || Filesystem::is_dir($filename)) {
+                return false;
+            }
+
+            list($uid, $filename) = self::getUidAndFilename($filename);
+
+            $files_view = new View('/'.$uid .'/files');
+            $users_view = new View('/'.$uid);
+
+            // no use making versions for empty files
+            if ($files_view->filesize($filename) === 0) {
+                return false;
+            }
+
+            // create all parent folders
+            self::createMissingDirectories($filename, $users_view);
+
+            self::scheduleExpire($uid, $filename);
+
+            // store a new version of a file
+            $mtime = $users_view->filemtime('files/' . $filename);
+            $users_view->copy('files/' . $filename, 'files_versions/' . $filename . '.v' . $mtime);
+            // call getFileInfo to enforce a file cache entry for the new version
+            $users_view->getFileInfo('files_versions/' . $filename . '.v' . $mtime);
+        }
+    }
+
+
+    /**
+     * mark file as deleted so that we can remove the versions if the file is gone
+     * @param string $path
+     */
+    public static function markDeletedFile($path) {
+        list($uid, $filename) = self::getUidAndFilename($path);
+        self::$deletedFiles[$path] = array(
+            'uid' => $uid,
+            'filename' => $filename);
+    }
+
+    /**
+     * delete the version from the storage and cache
+     *
+     * @param View $view
+     * @param string $path
+     */
+    protected static function deleteVersion($view, $path) {
+        $view->unlink($path);
+        /**
+         * @var \OC\Files\Storage\Storage $storage
+         * @var string $internalPath
+         */
+        list($storage, $internalPath) = $view->resolvePath($path);
+        $cache = $storage->getCache($internalPath);
+        $cache->remove($internalPath);
+    }
+
+    /**
+     * Delete versions of a file
+     */
+    public static function delete($path) {
+
+        $deletedFile = self::$deletedFiles[$path];
+        $uid = $deletedFile['uid'];
+        $filename = $deletedFile['filename'];
+
+        if (!Filesystem::file_exists($path)) {
+
+            $view = new View('/' . $uid . '/files_versions');
+
+            $versions = self::getVersions($uid, $filename);
+            if (!empty($versions)) {
+                foreach ($versions as $v) {
+                    \OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED));
+                    self::deleteVersion($view, $filename . '.v' . $v['version']);
+                    \OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED));
+                }
+            }
+        }
+        unset(self::$deletedFiles[$path]);
+    }
+
+    /**
+     * Rename or copy versions of a file of the given paths
+     *
+     * @param string $sourcePath source path of the file to move, relative to
+     * the currently logged in user's "files" folder
+     * @param string $targetPath target path of the file to move, relative to
+     * the currently logged in user's "files" folder
+     * @param string $operation can be 'copy' or 'rename'
+     */
+    public static function renameOrCopy($sourcePath, $targetPath, $operation) {
+        list($sourceOwner, $sourcePath) = self::getSourcePathAndUser($sourcePath);
+
+        // it was a upload of a existing file if no old path exists
+        // in this case the pre-hook already called the store method and we can
+        // stop here
+        if ($sourcePath === false) {
+            return true;
+        }
+
+        list($targetOwner, $targetPath) = self::getUidAndFilename($targetPath);
+
+        $sourcePath = ltrim($sourcePath, '/');
+        $targetPath = ltrim($targetPath, '/');
+
+        $rootView = new View('');
+
+        // did we move a directory ?
+        if ($rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
+            // does the directory exists for versions too ?
+            if ($rootView->is_dir('/' . $sourceOwner . '/files_versions/' . $sourcePath)) {
+                // create missing dirs if necessary
+                self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
+
+                // move the directory containing the versions
+                $rootView->$operation(
+                    '/' . $sourceOwner . '/files_versions/' . $sourcePath,
+                    '/' . $targetOwner . '/files_versions/' . $targetPath
+                );
+            }
+        } else if ($versions = Storage::getVersions($sourceOwner, '/' . $sourcePath)) {
+            // create missing dirs if necessary
+            self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
+
+            foreach ($versions as $v) {
+                // move each version one by one to the target directory
+                $rootView->$operation(
+                    '/' . $sourceOwner . '/files_versions/' . $sourcePath.'.v' . $v['version'],
+                    '/' . $targetOwner . '/files_versions/' . $targetPath.'.v'.$v['version']
+                );
+            }
+        }
+
+        // if we moved versions directly for a file, schedule expiration check for that file
+        if (!$rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
+            self::scheduleExpire($targetOwner, $targetPath);
+        }
+
+    }
+
+    /**
+     * Rollback to an old version of a file.
+     *
+     * @param string $file file name
+     * @param int $revision revision timestamp
+     * @return bool
+     */
+    public static function rollback($file, $revision) {
+
+        if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+            // add expected leading slash
+            $file = '/' . ltrim($file, '/');
+            list($uid, $filename) = self::getUidAndFilename($file);
+            if ($uid === null || trim($filename, '/') === '') {
+                return false;
+            }
+
+            $users_view = new View('/'.$uid);
+            $files_view = new View('/'. User::getUser().'/files');
+
+            $versionCreated = false;
+
+            $fileInfo = $files_view->getFileInfo($file);
+
+            // check if user has the permissions to revert a version
+            if (!$fileInfo->isUpdateable()) {
+                return false;
+            }
+
+            //first create a new version
+            $version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename);
+            if (!$users_view->file_exists($version)) {
+                $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
+                $versionCreated = true;
+            }
+
+            $fileToRestore =  'files_versions' . $filename . '.v' . $revision;
+
+            // Restore encrypted version of the old file for the newly restored file
+            // This has to happen manually here since the file is manually copied below
+            $oldVersion = $users_view->getFileInfo($fileToRestore)->getEncryptedVersion();
+            $oldFileInfo = $users_view->getFileInfo($fileToRestore);
+            $cache = $fileInfo->getStorage()->getCache();
+            $cache->update(
+                $fileInfo->getId(), [
+                    'encrypted' => $oldVersion,
+                    'encryptedVersion' => $oldVersion,
+                    'size' => $oldFileInfo->getSize()
+                ]
+            );
+
+            // rollback
+            if (self::copyFileContents($users_view, $fileToRestore, 'files' . $filename)) {
+                $files_view->touch($file, $revision);
+                Storage::scheduleExpire($uid, $file);
+                \OC_Hook::emit('\OCP\Versions', 'rollback', array(
+                    'path' => $filename,
+                    'revision' => $revision,
+                ));
+                return true;
+            } else if ($versionCreated) {
+                self::deleteVersion($users_view, $version);
+            }
+        }
+        return false;
+
+    }
+
+    /**
+     * Stream copy file contents from $path1 to $path2
+     *
+     * @param View $view view to use for copying
+     * @param string $path1 source file to copy
+     * @param string $path2 target file
+     *
+     * @return bool true for success, false otherwise
+     */
+    private static function copyFileContents($view, $path1, $path2) {
+        /** @var \OC\Files\Storage\Storage $storage1 */
+        list($storage1, $internalPath1) = $view->resolvePath($path1);
+        /** @var \OC\Files\Storage\Storage $storage2 */
+        list($storage2, $internalPath2) = $view->resolvePath($path2);
+
+        $view->lockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
+        $view->lockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
+
+        // TODO add a proper way of overwriting a file while maintaining file ids
+        if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) {
+            $source = $storage1->fopen($internalPath1, 'r');
+            $target = $storage2->fopen($internalPath2, 'w');
+            list(, $result) = \OC_Helper::streamCopy($source, $target);
+            fclose($source);
+            fclose($target);
+
+            if ($result !== false) {
+                $storage1->unlink($internalPath1);
+            }
+        } else {
+            $result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
+        }
+
+        $view->unlockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
+        $view->unlockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
+
+        return ($result !== false);
+    }
+
+    /**
+     * get a list of all available versions of a file in descending chronological order
+     * @param string $uid user id from the owner of the file
+     * @param string $filename file to find versions of, relative to the user files dir
+     * @param string $userFullPath
+     * @return array versions newest version first
+     */
+    public static function getVersions($uid, $filename, $userFullPath = '') {
+        $versions = array();
+        if (empty($filename)) {
+            return $versions;
+        }
+        // fetch for old versions
+        $view = new View('/' . $uid . '/');
+
+        $pathinfo = pathinfo($filename);
+        $versionedFile = $pathinfo['basename'];
+
+        $dir = Filesystem::normalizePath(self::VERSIONS_ROOT . '/' . $pathinfo['dirname']);
+
+        $dirContent = false;
+        if ($view->is_dir($dir)) {
+            $dirContent = $view->opendir($dir);
+        }
+
+        if ($dirContent === false) {
+            return $versions;
+        }
+
+        if (is_resource($dirContent)) {
+            while (($entryName = readdir($dirContent)) !== false) {
+                if (!Filesystem::isIgnoredDir($entryName)) {
+                    $pathparts = pathinfo($entryName);
+                    $filename = $pathparts['filename'];
+                    if ($filename === $versionedFile) {
+                        $pathparts = pathinfo($entryName);
+                        $timestamp = substr($pathparts['extension'], 1);
+                        $filename = $pathparts['filename'];
+                        $key = $timestamp . '#' . $filename;
+                        $versions[$key]['version'] = $timestamp;
+                        $versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($timestamp);
+                        if (empty($userFullPath)) {
+                            $versions[$key]['preview'] = '';
+                        } else {
+                            $versions[$key]['preview'] = \OC::$server->getURLGenerator('files_version.Preview.getPreview', ['file' => $userFullPath, 'version' => $timestamp]);
+                        }
+                        $versions[$key]['path'] = Filesystem::normalizePath($pathinfo['dirname'] . '/' . $filename);
+                        $versions[$key]['name'] = $versionedFile;
+                        $versions[$key]['size'] = $view->filesize($dir . '/' . $entryName);
+                        $versions[$key]['mimetype'] = \OC::$server->getMimeTypeDetector()->detectPath($versionedFile);
+                    }
+                }
+            }
+            closedir($dirContent);
+        }
+
+        // sort with newest version first
+        krsort($versions);
+
+        return $versions;
+    }
+
+    /**
+     * Expire versions that older than max version retention time
+     * @param string $uid
+     */
+    public static function expireOlderThanMaxForUser($uid){
+        $expiration = self::getExpiration();
+        $threshold = $expiration->getMaxAgeAsTimestamp();
+        $versions = self::getAllVersions($uid);
+        if (!$threshold || !array_key_exists('all', $versions)) {
+            return;
+        }
+
+        $toDelete = [];
+        foreach (array_reverse($versions['all']) as $key => $version) {
+            if (intval($version['version'])<$threshold) {
+                $toDelete[$key] = $version;
+            } else {
+                //Versions are sorted by time - nothing mo to iterate.
+                break;
+            }
+        }
+
+        $view = new View('/' . $uid . '/files_versions');
+        if (!empty($toDelete)) {
+            foreach ($toDelete as $version) {
+                \OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT));
+                self::deleteVersion($view, $version['path'] . '.v' . $version['version']);
+                \OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT));
+            }
+        }
+    }
+
+    /**
+     * translate a timestamp into a string like "5 days ago"
+     * @param int $timestamp
+     * @return string for example "5 days ago"
+     */
+    private static function getHumanReadableTimestamp($timestamp) {
+
+        $diff = time() - $timestamp;
+
+        if ($diff < 60) { // first minute
+            return  $diff . " seconds ago";
+        } elseif ($diff < 3600) { //first hour
+            return round($diff / 60) . " minutes ago";
+        } elseif ($diff < 86400) { // first day
+            return round($diff / 3600) . " hours ago";
+        } elseif ($diff < 604800) { //first week
+            return round($diff / 86400) . " days ago";
+        } elseif ($diff < 2419200) { //first month
+            return round($diff / 604800) . " weeks ago";
+        } elseif ($diff < 29030400) { // first year
+            return round($diff / 2419200) . " months ago";
+        } else {
+            return round($diff / 29030400) . " years ago";
+        }
+
+    }
+
+    /**
+     * returns all stored file versions from a given user
+     * @param string $uid id of the user
+     * @return array with contains two arrays 'all' which contains all versions sorted by age and 'by_file' which contains all versions sorted by filename
+     */
+    private static function getAllVersions($uid) {
+        $view = new View('/' . $uid . '/');
+        $dirs = array(self::VERSIONS_ROOT);
+        $versions = array();
+
+        while (!empty($dirs)) {
+            $dir = array_pop($dirs);
+            $files = $view->getDirectoryContent($dir);
+
+            foreach ($files as $file) {
+                $fileData = $file->getData();
+                $filePath = $dir . '/' . $fileData['name'];
+                if ($file['type'] === 'dir') {
+                    array_push($dirs, $filePath);
+                } else {
+                    $versionsBegin = strrpos($filePath, '.v');
+                    $relPathStart = strlen(self::VERSIONS_ROOT);
+                    $version = substr($filePath, $versionsBegin + 2);
+                    $relpath = substr($filePath, $relPathStart, $versionsBegin - $relPathStart);
+                    $key = $version . '#' . $relpath;
+                    $versions[$key] = array('path' => $relpath, 'timestamp' => $version);
+                }
+            }
+        }
+
+        // newest version first
+        krsort($versions);
+
+        $result = array();
+
+        foreach ($versions as $key => $value) {
+            $size = $view->filesize(self::VERSIONS_ROOT.'/'.$value['path'].'.v'.$value['timestamp']);
+            $filename = $value['path'];
+
+            $result['all'][$key]['version'] = $value['timestamp'];
+            $result['all'][$key]['path'] = $filename;
+            $result['all'][$key]['size'] = $size;
+
+            $result['by_file'][$filename][$key]['version'] = $value['timestamp'];
+            $result['by_file'][$filename][$key]['path'] = $filename;
+            $result['by_file'][$filename][$key]['size'] = $size;
+        }
+
+        return $result;
+    }
+
+    /**
+     * get list of files we want to expire
+     * @param array $versions list of versions
+     * @param integer $time
+     * @param bool $quotaExceeded is versions storage limit reached
+     * @return array containing the list of to deleted versions and the size of them
+     */
+    protected static function getExpireList($time, $versions, $quotaExceeded = false) {
+        $expiration = self::getExpiration();
+
+        if ($expiration->shouldAutoExpire()) {
+            list($toDelete, $size) = self::getAutoExpireList($time, $versions);
+        } else {
+            $size = 0;
+            $toDelete = [];  // versions we want to delete
+        }
+
+        foreach ($versions as $key => $version) {
+            if ($expiration->isExpired($version['version'], $quotaExceeded) && !isset($toDelete[$key])) {
+                $size += $version['size'];
+                $toDelete[$key] = $version['path'] . '.v' . $version['version'];
+            }
+        }
+
+        return [$toDelete, $size];
+    }
+
+    /**
+     * get list of files we want to expire
+     * @param array $versions list of versions
+     * @param integer $time
+     * @return array containing the list of to deleted versions and the size of them
+     */
+    protected static function getAutoExpireList($time, $versions) {
+        $size = 0;
+        $toDelete = array();  // versions we want to delete
+
+        $interval = 1;
+        $step = Storage::$max_versions_per_interval[$interval]['step'];
+        if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {
+            $nextInterval = -1;
+        } else {
+            $nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
+        }
+
+        $firstVersion = reset($versions);
+        $firstKey = key($versions);
+        $prevTimestamp = $firstVersion['version'];
+        $nextVersion = $firstVersion['version'] - $step;
+        unset($versions[$firstKey]);
+
+        foreach ($versions as $key => $version) {
+            $newInterval = true;
+            while ($newInterval) {
+                if ($nextInterval == -1 || $prevTimestamp > $nextInterval) {
+                    if ($version['version'] > $nextVersion) {
+                        //distance between two version too small, mark to delete
+                        $toDelete[$key] = $version['path'] . '.v' . $version['version'];
+                        $size += $version['size'];
+                        \OCP\Util::writeLog('files_versions', 'Mark to expire '. $version['path'] .' next version should be ' . $nextVersion . " or smaller. (prevTimestamp: " . $prevTimestamp . "; step: " . $step, \OCP\Util::INFO);
+                    } else {
+                        $nextVersion = $version['version'] - $step;
+                        $prevTimestamp = $version['version'];
+                    }
+                    $newInterval = false; // version checked so we can move to the next one
+                } else { // time to move on to the next interval
+                    $interval++;
+                    $step = Storage::$max_versions_per_interval[$interval]['step'];
+                    $nextVersion = $prevTimestamp - $step;
+                    if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {
+                        $nextInterval = -1;
+                    } else {
+                        $nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
+                    }
+                    $newInterval = true; // we changed the interval -> check same version with new interval
+                }
+            }
+        }
+
+        return array($toDelete, $size);
+    }
+
+    /**
+     * Schedule versions expiration for the given file
+     *
+     * @param string $uid owner of the file
+     * @param string $fileName file/folder for which to schedule expiration
+     */
+    private static function scheduleExpire($uid, $fileName) {
+        // let the admin disable auto expire
+        $expiration = self::getExpiration();
+        if ($expiration->isEnabled()) {
+            $command = new Expire($uid, $fileName);
+            \OC::$server->getCommandBus()->push($command);
+        }
+    }
+
+    /**
+     * Expire versions which exceed the quota
+     *
+     * @param string $filename
+     * @return bool|int|null
+     */
+    public static function expire($filename) {
+        $config = \OC::$server->getConfig();
+        $expiration = self::getExpiration();
+
+        if($config->getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' && $expiration->isEnabled()) {
+
+            if (!Filesystem::file_exists($filename)) {
+                return false;
+            }
+
+            list($uid, $filename) = self::getUidAndFilename($filename);
+            if (empty($filename)) {
+                // file maybe renamed or deleted
+                return false;
+            }
+            $versionsFileview = new View('/'.$uid.'/files_versions');
+
+            // get available disk space for user
+            $user = \OC::$server->getUserManager()->get($uid);
+            $softQuota = true;
+            $quota = $user->getQuota();
+            if ( $quota === null || $quota === 'none' ) {
+                $quota = Filesystem::free_space('/');
+                $softQuota = false;
+            } else {
+                $quota = \OCP\Util::computerFileSize($quota);
+            }
+
+            // make sure that we have the current size of the version history
+            $versionsSize = self::getVersionsSize($uid);
+
+            // calculate available space for version history
+            // subtract size of files and current versions size from quota
+            if ($quota >= 0) {
+                if ($softQuota) {
+                    $files_view = new View('/' . $uid . '/files');
+                    $rootInfo = $files_view->getFileInfo('/', false);
+                    $free = $quota - $rootInfo['size']; // remaining free space for user
+                    if ($free > 0) {
+                        $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
+                    } else {
+                        $availableSpace = $free - $versionsSize;
+                    }
+                } else {
+                    $availableSpace = $quota;
+                }
+            } else {
+                $availableSpace = PHP_INT_MAX;
+            }
+
+            $allVersions = Storage::getVersions($uid, $filename);
+
+            $time = time();
+            list($toDelete, $sizeOfDeletedVersions) = self::getExpireList($time, $allVersions, $availableSpace <= 0);
+
+            $availableSpace = $availableSpace + $sizeOfDeletedVersions;
+            $versionsSize = $versionsSize - $sizeOfDeletedVersions;
+
+            // if still not enough free space we rearrange the versions from all files
+            if ($availableSpace <= 0) {
+                $result = Storage::getAllVersions($uid);
+                $allVersions = $result['all'];
+
+                foreach ($result['by_file'] as $versions) {
+                    list($toDeleteNew, $size) = self::getExpireList($time, $versions, $availableSpace <= 0);
+                    $toDelete = array_merge($toDelete, $toDeleteNew);
+                    $sizeOfDeletedVersions += $size;
+                }
+                $availableSpace = $availableSpace + $sizeOfDeletedVersions;
+                $versionsSize = $versionsSize - $sizeOfDeletedVersions;
+            }
+
+            foreach($toDelete as $key => $path) {
+                \OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED));
+                self::deleteVersion($versionsFileview, $path);
+                \OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED));
+                unset($allVersions[$key]); // update array with the versions we keep
+                \OCP\Util::writeLog('files_versions', "Expire: " . $path, \OCP\Util::INFO);
+            }
+
+            // Check if enough space is available after versions are rearranged.
+            // If not we delete the oldest versions until we meet the size limit for versions,
+            // but always keep the two latest versions
+            $numOfVersions = count($allVersions) -2 ;
+            $i = 0;
+            // sort oldest first and make sure that we start at the first element
+            ksort($allVersions);
+            reset($allVersions);
+            while ($availableSpace < 0 && $i < $numOfVersions) {
+                $version = current($allVersions);
+                \OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED));
+                self::deleteVersion($versionsFileview, $version['path'] . '.v' . $version['version']);
+                \OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED));
+                \OCP\Util::writeLog('files_versions', 'running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'] , \OCP\Util::INFO);
+                $versionsSize -= $version['size'];
+                $availableSpace += $version['size'];
+                next($allVersions);
+                $i++;
+            }
+
+            return $versionsSize; // finally return the new size of the version history
+        }
+
+        return false;
+    }
+
+    /**
+     * Create recursively missing directories inside of files_versions
+     * that match the given path to a file.
+     *
+     * @param string $filename $path to a file, relative to the user's
+     * "files" folder
+     * @param View $view view on data/user/
+     */
+    private static function createMissingDirectories($filename, $view) {
+        $dirname = 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);
+            }
+        }
+    }
+
+    /**
+     * Static workaround
+     * @return Expiration
+     */
+    protected static function getExpiration(){
+        if (is_null(self::$application)) {
+            self::$application = new Application();
+        }
+        return self::$application->getContainer()->query('Expiration');
+    }
 
 }

apps/files_versions/lib/Controller/PreviewController.php

Indentation +52 added lines, -52 removed lines

@@ -36,64 +36,64 @@
 
 class PreviewController extends Controller {
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var string */
-	private $userId;
+    /** @var string */
+    private $userId;
 
-	/** @var IMimeTypeDetector */
-	private $mimeTypeDetector;
+    /** @var IMimeTypeDetector */
+    private $mimeTypeDetector;
 
-	/** @var IPreview */
-	private $previewManager;
+    /** @var IPreview */
+    private $previewManager;
 
-	public function __construct($appName,
-								IRequest $request,
-								IRootFolder $rootFolder,
-								$userId,
-								IMimeTypeDetector $mimeTypeDetector,
-								IPreview $previewManager) {
-		parent::__construct($appName, $request);
+    public function __construct($appName,
+                                IRequest $request,
+                                IRootFolder $rootFolder,
+                                $userId,
+                                IMimeTypeDetector $mimeTypeDetector,
+                                IPreview $previewManager) {
+        parent::__construct($appName, $request);
 
-		$this->rootFolder = $rootFolder;
-		$this->userId = $userId;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-		$this->previewManager = $previewManager;
-	}
+        $this->rootFolder = $rootFolder;
+        $this->userId = $userId;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+        $this->previewManager = $previewManager;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $file
-	 * @param int $x
-	 * @param int $y
-	 * @param string $version
-	 * @return DataResponse|FileDisplayResponse
-	 */
-	public function getPreview(
-		$file = '',
-		$x = 44,
-		$y = 44,
-		$version = ''
-	) {
-		if($file === '' || $version === '' || $x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $file
+     * @param int $x
+     * @param int $y
+     * @param string $version
+     * @return DataResponse|FileDisplayResponse
+     */
+    public function getPreview(
+        $file = '',
+        $x = 44,
+        $y = 44,
+        $version = ''
+    ) {
+        if($file === '' || $version === '' || $x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($this->userId);
-			/** @var Folder $versionFolder */
-			$versionFolder = $userFolder->getParent()->get('files_versions');
-			$mimeType = $this->mimeTypeDetector->detectPath($file);
-			$file = $versionFolder->get($file.'.v'.$version);
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($this->userId);
+            /** @var Folder $versionFolder */
+            $versionFolder = $userFolder->getParent()->get('files_versions');
+            $mimeType = $this->mimeTypeDetector->detectPath($file);
+            $file = $versionFolder->get($file.'.v'.$version);
 
-			/** @var File $file */
-			$f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
-			return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-	}
+            /** @var File $file */
+            $f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
+            return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+    }
 }

apps/files_versions/lib/AppInfo/Application.php

Indentation +13 added lines, -13 removed lines

@@ -27,24 +27,24 @@
 use OCA\Files_Versions\Expiration;
 
 class Application extends App {
-	public function __construct(array $urlParams = array()) {
-		parent::__construct('files_versions', $urlParams);
+    public function __construct(array $urlParams = array()) {
+        parent::__construct('files_versions', $urlParams);
 
-		$container = $this->getContainer();
+        $container = $this->getContainer();
 
-		/*
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability('OCA\Files_Versions\Capabilities');
+        $container->registerCapability('OCA\Files_Versions\Capabilities');
 
-		/*
+        /*
 		 * Register expiration
 		 */
-		$container->registerService('Expiration', function($c) {
-			return  new Expiration(
-				$c->query('ServerContainer')->getConfig(),
-				$c->query('OCP\AppFramework\Utility\ITimeFactory')
-			);
-		});
-	}
+        $container->registerService('Expiration', function($c) {
+            return  new Expiration(
+                $c->query('ServerContainer')->getConfig(),
+                $c->query('OCP\AppFramework\Utility\ITimeFactory')
+            );
+        });
+    }
 }

apps/files_versions/lib/Command/Expire.php

Indentation +27 added lines, -27 removed lines

@@ -29,37 +29,37 @@
 use OCP\Command\ICommand;
 
 class Expire implements ICommand {
-	use FileAccess;
+    use FileAccess;
 
-	/**
-	 * @var string
-	 */
-	private $fileName;
+    /**
+     * @var string
+     */
+    private $fileName;
 
-	/**
-	 * @var string
-	 */
-	private $user;
+    /**
+     * @var string
+     */
+    private $user;
 
-	/**
-	 * @param string $user
-	 * @param string $fileName
-	 */
-	function __construct($user, $fileName) {
-		$this->user = $user;
-		$this->fileName = $fileName;
-	}
+    /**
+     * @param string $user
+     * @param string $fileName
+     */
+    function __construct($user, $fileName) {
+        $this->user = $user;
+        $this->fileName = $fileName;
+    }
 
 
-	public function handle() {
-		$userManager = \OC::$server->getUserManager();
-		if (!$userManager->userExists($this->user)) {
-			// User has been deleted already
-			return;
-		}
+    public function handle() {
+        $userManager = \OC::$server->getUserManager();
+        if (!$userManager->userExists($this->user)) {
+            // User has been deleted already
+            return;
+        }
 
-		\OC_Util::setupFS($this->user);
-		Storage::expire($this->fileName);
-		\OC_Util::tearDownFS();
-	}
+        \OC_Util::setupFS($this->user);
+        Storage::expire($this->fileName);
+        \OC_Util::tearDownFS();
+    }
 }

apps/files_versions/lib/Command/ExpireVersions.php

Indentation +78 added lines, -78 removed lines

@@ -33,93 +33,93 @@
 
 class ExpireVersions extends Command {
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	/**
-	 * @param IUserManager|null $userManager
-	 * @param Expiration|null $expiration
-	 */
-	public function __construct(IUserManager $userManager = null,
-								Expiration $expiration = null) {
-		parent::__construct();
+    /**
+     * @param IUserManager|null $userManager
+     * @param Expiration|null $expiration
+     */
+    public function __construct(IUserManager $userManager = null,
+                                Expiration $expiration = null) {
+        parent::__construct();
 
-		$this->userManager = $userManager;
-		$this->expiration = $expiration;
-	}
+        $this->userManager = $userManager;
+        $this->expiration = $expiration;
+    }
 
-	protected function configure() {
-		$this
-			->setName('versions:expire')
-			->setDescription('Expires the users file versions')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('versions:expire')
+            ->setDescription('Expires the users file versions')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output) {
 
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			$output->writeln("No expiry configured.");
-			return;
-		}
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            $output->writeln("No expiry configured.");
+            return;
+        }
 
-		$users = $input->getArgument('user_id');
-		if (!empty($users)) {
-			foreach ($users as $user) {
-				if ($this->userManager->userExists($user)) {
-					$output->writeln("Remove deleted files of   <info>$user</info>");
-					$userObject = $this->userManager->get($user);
-					$this->expireVersionsForUser($userObject);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-				}
-			}
-		} else {
-			$p = new ProgressBar($output);
-			$p->start();
-			$this->userManager->callForSeenUsers(function(IUser $user) use ($p) {
-				$p->advance();
-				$this->expireVersionsForUser($user);
-			});
-			$p->finish();
-			$output->writeln('');
-		}
-	}
+        $users = $input->getArgument('user_id');
+        if (!empty($users)) {
+            foreach ($users as $user) {
+                if ($this->userManager->userExists($user)) {
+                    $output->writeln("Remove deleted files of   <info>$user</info>");
+                    $userObject = $this->userManager->get($user);
+                    $this->expireVersionsForUser($userObject);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                }
+            }
+        } else {
+            $p = new ProgressBar($output);
+            $p->start();
+            $this->userManager->callForSeenUsers(function(IUser $user) use ($p) {
+                $p->advance();
+                $this->expireVersionsForUser($user);
+            });
+            $p->finish();
+            $output->writeln('');
+        }
+    }
 
-	function expireVersionsForUser(IUser $user) {
-		$uid = $user->getUID();
-		if (!$this->setupFS($uid)) {
-			return;
-		}
-		Storage::expireOlderThanMaxForUser($uid);
-	}
+    function expireVersionsForUser(IUser $user) {
+        $uid = $user->getUID();
+        if (!$this->setupFS($uid)) {
+            return;
+        }
+        Storage::expireOlderThanMaxForUser($uid);
+    }
 
-	/**
-	 * Act on behalf on versions item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on versions item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a version directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_versions')) {
-			return false;
-		}
+        // Check if this user has a version directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_versions')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

apps/files_versions/lib/Command/CleanUp.php

Indentation +78 added lines, -78 removed lines

@@ -33,83 +33,83 @@
 
 class CleanUp extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-
-	/**
-	 * @param IRootFolder $rootFolder
-	 * @param IUserManager $userManager
-	 */
-	function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-	}
-
-	protected function configure() {
-		$this
-			->setName('versions:cleanup')
-			->setDescription('Delete versions')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'delete versions of the given user(s), if no user is given all versions will be deleted'
-			);
-	}
-
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-
-		$users = $input->getArgument('user_id');
-		if (!empty($users)) {
-			foreach ($users as $user) {
-				if ($this->userManager->userExists($user)) {
-					$output->writeln("Delete versions of   <info>$user</info>");
-					$this->deleteVersions($user);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-				}
-			}
-		} else {
-			$output->writeln('Delete all versions');
-			foreach ($this->userManager->getBackends() as $backend) {
-				$name = get_class($backend);
-
-				if ($backend instanceof IUserBackend) {
-					$name = $backend->getBackendName();
-				}
-
-				$output->writeln("Delete versions for users on backend <info>$name</info>");
-
-				$limit = 500;
-				$offset = 0;
-				do {
-					$users = $backend->getUsers('', $limit, $offset);
-					foreach ($users as $user) {
-						$output->writeln("   <info>$user</info>");
-						$this->deleteVersions($user);
-					}
-					$offset += $limit;
-				} while (count($users) >= $limit);
-			}
-		}
-	}
-
-
-	/**
-	 * delete versions for the given user
-	 *
-	 * @param string $user
-	 */
-	protected function deleteVersions($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
-		if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
-			$this->rootFolder->get('/' . $user . '/files_versions')->delete();
-		}
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IRootFolder */
+    protected $rootFolder;
+
+    /**
+     * @param IRootFolder $rootFolder
+     * @param IUserManager $userManager
+     */
+    function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('versions:cleanup')
+            ->setDescription('Delete versions')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'delete versions of the given user(s), if no user is given all versions will be deleted'
+            );
+    }
+
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+
+        $users = $input->getArgument('user_id');
+        if (!empty($users)) {
+            foreach ($users as $user) {
+                if ($this->userManager->userExists($user)) {
+                    $output->writeln("Delete versions of   <info>$user</info>");
+                    $this->deleteVersions($user);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                }
+            }
+        } else {
+            $output->writeln('Delete all versions');
+            foreach ($this->userManager->getBackends() as $backend) {
+                $name = get_class($backend);
+
+                if ($backend instanceof IUserBackend) {
+                    $name = $backend->getBackendName();
+                }
+
+                $output->writeln("Delete versions for users on backend <info>$name</info>");
+
+                $limit = 500;
+                $offset = 0;
+                do {
+                    $users = $backend->getUsers('', $limit, $offset);
+                    foreach ($users as $user) {
+                        $output->writeln("   <info>$user</info>");
+                        $this->deleteVersions($user);
+                    }
+                    $offset += $limit;
+                } while (count($users) >= $limit);
+            }
+        }
+    }
+
+
+    /**
+     * delete versions for the given user
+     *
+     * @param string $user
+     */
+    protected function deleteVersions($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
+        if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
+            $this->rootFolder->get('/' . $user . '/files_versions')->delete();
+        }
+    }
 
 }

apps/files_versions/lib/Capabilities.php

Indentation +12 added lines, -12 removed lines

@@ -29,16 +29,16 @@
 
 class Capabilities implements ICapability {
 	
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		return [
-			'files' => [
-				'versioning' => true
-			]
-		];
-	}
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        return [
+            'files' => [
+                'versioning' => true
+            ]
+        ];
+    }
 }

apps/files_versions/lib/BackgroundJob/ExpireVersions.php

Indentation +52 added lines, -52 removed lines

@@ -31,66 +31,66 @@
 
 class ExpireVersions extends \OC\BackgroundJob\TimedJob {
 
-	const ITEMS_PER_SESSION = 1000;
+    const ITEMS_PER_SESSION = 1000;
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	public function __construct(IUserManager $userManager = null, Expiration $expiration = null) {
-		// Run once per 30 minutes
-		$this->setInterval(60 * 30);
+    public function __construct(IUserManager $userManager = null, Expiration $expiration = null) {
+        // Run once per 30 minutes
+        $this->setInterval(60 * 30);
 
-		if (is_null($expiration) || is_null($userManager)) {
-			$this->fixDIForJobs();
-		} else {
-			$this->expiration = $expiration;
-			$this->userManager = $userManager;
-		}
-	}
+        if (is_null($expiration) || is_null($userManager)) {
+            $this->fixDIForJobs();
+        } else {
+            $this->expiration = $expiration;
+            $this->userManager = $userManager;
+        }
+    }
 
-	protected function fixDIForJobs() {
-		$application = new Application();
-		$this->expiration = $application->getContainer()->query('Expiration');
-		$this->userManager = \OC::$server->getUserManager();
-	}
+    protected function fixDIForJobs() {
+        $application = new Application();
+        $this->expiration = $application->getContainer()->query('Expiration');
+        $this->userManager = \OC::$server->getUserManager();
+    }
 
-	protected function run($argument) {
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			return;
-		}
+    protected function run($argument) {
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            return;
+        }
 
-		$this->userManager->callForSeenUsers(function(IUser $user) {
-			$uid = $user->getUID();
-			if (!$this->setupFS($uid)) {
-				return;
-			}
-			Storage::expireOlderThanMaxForUser($uid);
-		});
-	}
+        $this->userManager->callForSeenUsers(function(IUser $user) {
+            $uid = $user->getUID();
+            if (!$this->setupFS($uid)) {
+                return;
+            }
+            Storage::expireOlderThanMaxForUser($uid);
+        });
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a versions directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_versions')) {
-			return false;
-		}
+        // Check if this user has a versions directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_versions')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

apps/files_versions/lib/Hooks.php

Indentation +133 added lines, -133 removed lines

@@ -35,137 +35,137 @@
 
 class Hooks {
 
-	public static function connectHooks() {
-		// Listen to write signals
-		\OCP\Util::connectHook('OC_Filesystem', 'write', 'OCA\Files_Versions\Hooks', 'write_hook');
-		// Listen to delete and rename signals
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', 'OCA\Files_Versions\Hooks', 'remove_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Versions\Hooks', 'pre_remove_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Files_Versions\Hooks', 'rename_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_copy', 'OCA\Files_Versions\Hooks', 'copy_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'copy', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
-
-		$eventDispatcher = \OC::$server->getEventDispatcher();
-		$eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', ['OCA\Files_Versions\Hooks', 'onLoadFilesAppScripts']);
-	}
-
-	/**
-	 * listen to write event.
-	 */
-	public static function write_hook( $params ) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path<>'') {
-				Storage::store($path);
-			}
-		}
-	}
-
-
-	/**
-	 * Erase versions of deleted file
-	 * @param array $params
-	 *
-	 * This function is connected to the delete signal of OC_Filesystem
-	 * cleanup the versions directory if the actual file gets deleted
-	 */
-	public static function remove_hook($params) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path<>'') {
-				Storage::delete($path);
-			}
-		}
-	}
-
-	/**
-	 * mark file as "deleted" so that we can clean up the versions if the file is gone
-	 * @param array $params
-	 */
-	public static function pre_remove_hook($params) {
-		$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path<>'') {
-				Storage::markDeletedFile($path);
-			}
-	}
-
-	/**
-	 * rename/move versions of renamed/moved files
-	 * @param array $params array with oldpath and newpath
-	 *
-	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
-	 * of the stored versions along the actual file
-	 */
-	public static function rename_hook($params) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$oldpath = $params['oldpath'];
-			$newpath = $params['newpath'];
-			if($oldpath<>'' && $newpath<>'') {
-				Storage::renameOrCopy($oldpath, $newpath, 'rename');
-			}
-		}
-	}
-
-	/**
-	 * copy versions of copied files
-	 * @param array $params array with oldpath and newpath
-	 *
-	 * This function is connected to the copy signal of OC_Filesystem and copies the
-	 * the stored versions to the new location
-	 */
-	public static function copy_hook($params) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$oldpath = $params['oldpath'];
-			$newpath = $params['newpath'];
-			if($oldpath<>'' && $newpath<>'') {
-				Storage::renameOrCopy($oldpath, $newpath, 'copy');
-			}
-		}
-	}
-
-	/**
-	 * Remember owner and the owner path of the source file.
-	 * If the file already exists, then it was a upload of a existing file
-	 * over the web interface and we call Storage::store() directly
-	 *
-	 * @param array $params array with oldpath and newpath
-	 *
-	 */
-	public static function pre_renameOrCopy_hook($params) {
-		if (\OCP\App::isEnabled('files_versions')) {
-
-			// if we rename a movable mount point, then the versions don't have
-			// to be renamed
-			$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
-			$manager = \OC\Files\Filesystem::getMountManager();
-			$mount = $manager->find($absOldPath);
-			$internalPath = $mount->getInternalPath($absOldPath);
-			if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) {
-				return;
-			}
-
-			$view = new \OC\Files\View(\OCP\User::getUser() . '/files');
-			if ($view->file_exists($params['newpath'])) {
-				Storage::store($params['newpath']);
-			} else {
-				Storage::setSourcePathAndUser($params['oldpath']);
-			}
-
-		}
-	}
-
-	/**
-	 * Load additional scripts when the files app is visible
-	 */
-	public static function onLoadFilesAppScripts() {
-		\OCP\Util::addScript('files_versions', 'versionmodel');
-		\OCP\Util::addScript('files_versions', 'versioncollection');
-		\OCP\Util::addScript('files_versions', 'versionstabview');
-		\OCP\Util::addScript('files_versions', 'filesplugin');
-	}
+    public static function connectHooks() {
+        // Listen to write signals
+        \OCP\Util::connectHook('OC_Filesystem', 'write', 'OCA\Files_Versions\Hooks', 'write_hook');
+        // Listen to delete and rename signals
+        \OCP\Util::connectHook('OC_Filesystem', 'post_delete', 'OCA\Files_Versions\Hooks', 'remove_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Versions\Hooks', 'pre_remove_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Files_Versions\Hooks', 'rename_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'post_copy', 'OCA\Files_Versions\Hooks', 'copy_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'copy', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
+
+        $eventDispatcher = \OC::$server->getEventDispatcher();
+        $eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', ['OCA\Files_Versions\Hooks', 'onLoadFilesAppScripts']);
+    }
+
+    /**
+     * listen to write event.
+     */
+    public static function write_hook( $params ) {
+
+        if (\OCP\App::isEnabled('files_versions')) {
+            $path = $params[\OC\Files\Filesystem::signal_param_path];
+            if($path<>'') {
+                Storage::store($path);
+            }
+        }
+    }
+
+
+    /**
+     * Erase versions of deleted file
+     * @param array $params
+     *
+     * This function is connected to the delete signal of OC_Filesystem
+     * cleanup the versions directory if the actual file gets deleted
+     */
+    public static function remove_hook($params) {
+
+        if (\OCP\App::isEnabled('files_versions')) {
+            $path = $params[\OC\Files\Filesystem::signal_param_path];
+            if($path<>'') {
+                Storage::delete($path);
+            }
+        }
+    }
+
+    /**
+     * mark file as "deleted" so that we can clean up the versions if the file is gone
+     * @param array $params
+     */
+    public static function pre_remove_hook($params) {
+        $path = $params[\OC\Files\Filesystem::signal_param_path];
+            if($path<>'') {
+                Storage::markDeletedFile($path);
+            }
+    }
+
+    /**
+     * rename/move versions of renamed/moved files
+     * @param array $params array with oldpath and newpath
+     *
+     * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+     * of the stored versions along the actual file
+     */
+    public static function rename_hook($params) {
+
+        if (\OCP\App::isEnabled('files_versions')) {
+            $oldpath = $params['oldpath'];
+            $newpath = $params['newpath'];
+            if($oldpath<>'' && $newpath<>'') {
+                Storage::renameOrCopy($oldpath, $newpath, 'rename');
+            }
+        }
+    }
+
+    /**
+     * copy versions of copied files
+     * @param array $params array with oldpath and newpath
+     *
+     * This function is connected to the copy signal of OC_Filesystem and copies the
+     * the stored versions to the new location
+     */
+    public static function copy_hook($params) {
+
+        if (\OCP\App::isEnabled('files_versions')) {
+            $oldpath = $params['oldpath'];
+            $newpath = $params['newpath'];
+            if($oldpath<>'' && $newpath<>'') {
+                Storage::renameOrCopy($oldpath, $newpath, 'copy');
+            }
+        }
+    }
+
+    /**
+     * Remember owner and the owner path of the source file.
+     * If the file already exists, then it was a upload of a existing file
+     * over the web interface and we call Storage::store() directly
+     *
+     * @param array $params array with oldpath and newpath
+     *
+     */
+    public static function pre_renameOrCopy_hook($params) {
+        if (\OCP\App::isEnabled('files_versions')) {
+
+            // if we rename a movable mount point, then the versions don't have
+            // to be renamed
+            $absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
+            $manager = \OC\Files\Filesystem::getMountManager();
+            $mount = $manager->find($absOldPath);
+            $internalPath = $mount->getInternalPath($absOldPath);
+            if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) {
+                return;
+            }
+
+            $view = new \OC\Files\View(\OCP\User::getUser() . '/files');
+            if ($view->file_exists($params['newpath'])) {
+                Storage::store($params['newpath']);
+            } else {
+                Storage::setSourcePathAndUser($params['oldpath']);
+            }
+
+        }
+    }
+
+    /**
+     * Load additional scripts when the files app is visible
+     */
+    public static function onLoadFilesAppScripts() {
+        \OCP\Util::addScript('files_versions', 'versionmodel');
+        \OCP\Util::addScript('files_versions', 'versioncollection');
+        \OCP\Util::addScript('files_versions', 'versionstabview');
+        \OCP\Util::addScript('files_versions', 'filesplugin');
+    }
 }