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

use getStorage() to get versions location 

update routine implemented
version number of files_versions increased

Conflicts:

	apps/files_versions/lib/hooks.php
This commit is contained in:
Bjoern Schiessle 2012-07-09 16:07:26 +02:00
parent 0f0aa1827f
commit e248412ca9
6 changed files with 158 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_versions/ajax/expireAll.php
View File

@ -28,7 +28,7 @@
OCP\JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OCP\App::checkAppEnabled('files_versions'); OCP\App::checkAppEnabled('files_versions');
$versions = new OCA_Versions\Storage( new OC_FilesystemView('') ); $versions = new OCA_Versions\Storage();
if( $versions->expireAll() ){ if( $versions->expireAll() ){

16
apps/files_versions/appinfo/update.php Normal file
View File

@ -0,0 +1,16 @@
<?php
$installedVersion=OCP\Config::getAppValue('files_versions', 'installed_version');
// move versions to new directory
if (version_compare($installedVersion, '1.0.2', '<')) {
$users = \OCP\User::getUsers();
$datadir = \OCP\Config::getSystemValue('datadirectory').'/';
foreach ($users as $user) {
$oldPath = $datadir.$user.'/versions';
$newPath = $datadir.$user.'/files_versions';
if(is_dir($oldPath)) {
rename($oldPath, $newPath);
}
}
}

2
apps/files_versions/appinfo/version
View File

@ -1 +1 @@
1.0.1 1.0.2

2
apps/files_versions/history.php
View File

@ -30,7 +30,7 @@ if ( isset( $_GET['path'] ) ) {
$path = $_GET['path']; $path = $_GET['path'];
$path = strip_tags( $path ); $path = strip_tags( $path );
$tmpl->assign( 'path', $path ); $tmpl->assign( 'path', $path );
$versions = new OCA_Versions\Storage( new OC_FilesystemView('') ); $versions = new OCA_Versions\Storage();
// roll back to old version if button clicked // roll back to old version if button clicked
if( isset( $_GET['revert'] ) ) { if( isset( $_GET['revert'] ) ) {

69
apps/files_versions/lib/hooks.php
View File

@ -30,41 +30,46 @@ class Hooks {
} }
} }
/**
* @brief Erase versions of deleted file /**
* @param array * @brief Erase versions of deleted file
* * @param array
* This function is connected to the delete signal of OC_Filesystem *
* cleanup the versions directory if the actual file gets deleted * 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) { public static function remove_hook($params) {
$rel_path = $params['path']; $versions_fileview = \OCP\Files::getStorage('files_versions');
$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v'; $rel_path = $params['path'];
if(Storage::isversioned($rel_path)) { $abs_path = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$rel_path.'.v';
$versions = Storage::getVersions($rel_path); if(Storage::isversioned($rel_path)) {
foreach ($versions as $v){ $versions = Storage::getVersions($rel_path);
unlink($abs_path . $v['version']); foreach ($versions as $v){
} unlink($abs_path . $v['version']);
} }
} }
}
/**
* @brief rename/move versions of renamed/moved files /**
* @param array with oldpath and newpath * @brief rename/move versions of renamed/moved files
* * @param 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 * 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) { public static function rename_hook($params) {
$rel_oldpath = $params['oldpath']; $versions_fileview = \OCP\Files::getStorage('files_versions');
$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v'; $rel_oldpath = $params['oldpath'];
$abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v'; $abs_oldpath = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$rel_oldpath.'.v';
$abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$params['newpath'].'.v';
if(Storage::isversioned($rel_oldpath)) { if(Storage::isversioned($rel_oldpath)) {
$versions = Storage::getVersions($rel_oldpath); $info=pathinfo($abs_newpath);
foreach ($versions as $v){ if(!file_exists($info['dirname'])) mkdir($info['dirname'],0700,true);
rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']); $versions = Storage::getVersions($rel_oldpath);
} foreach ($versions as $v){
} rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
}
}
} }
} }

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

@ -22,41 +22,26 @@ class Storage {
// - files_versionsfolder // - files_versionsfolder
// - files_versionsblacklist // - files_versionsblacklist
// - files_versionsmaxfilesize // - files_versionsmaxfilesize
// - files_versionsinterval // - files_versionsinterval
// - files_versionmaxversions // - files_versionmaxversions
// //
// todo: // todo:
// - finish porting to OC_FilesystemView to enable network transparency // - finish porting to OC_FilesystemView to enable network transparency
// - add transparent compression. first test if it´s worth it. // - add transparent compression. first test if it´s worth it.
const DEFAULTENABLED=true; const DEFAULTENABLED=true;
const DEFAULTFOLDER='versions'; const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp';
const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp'; const DEFAULTMAXFILESIZE=1048576; // 10MB
const DEFAULTMAXFILESIZE=1048576; // 10MB
const DEFAULTMININTERVAL=60; // 1 min const DEFAULTMININTERVAL=60; // 1 min
const DEFAULTMAXVERSIONS=50; const DEFAULTMAXVERSIONS=50;
private $view; private $view;
function __construct( $view ) {
$this->view = $view;
}
/** function __construct() {
* init the versioning and create the versions folder.
*/
public static function init() {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
// create versions folder
$foldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
if(!is_dir($foldername)){
mkdir($foldername);
}
}
}
$this->view = \OCP\Files::getStorage('files_versions');
}
/** /**
* listen to write event. * listen to write event.
@ -75,11 +60,11 @@ class Storage {
*/ */
public function store($filename) { public function store($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
$files_view = \OCP\Files::getStorage("files"); $files_view = \OCP\Files::getStorage("files");
$users_view = \OCP\Files::getStorage("files_versions"); $users_view = \OCP\Files::getStorage("files_versions");
$users_view->chroot(\OCP\User::getUser().'/'); $users_view->chroot(\OCP\User::getUser().'/');
if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) { if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
$pos = strpos($source, '/files', 1); $pos = strpos($source, '/files', 1);
$uid = substr($source, 1, $pos - 1); $uid = substr($source, 1, $pos - 1);
@ -87,15 +72,14 @@ class Storage {
} else { } else {
$uid = \OCP\User::getUser(); $uid = \OCP\User::getUser();
} }
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files'; $versionsFolderName=\OCP\Config::getSystemValue('datadirectory') . $this->view->getAbsolutePath('');
Storage::init();
//check if source file already exist as version to avoid recursions. //check if source file already exist as version to avoid recursions.
if ($users_view->file_exists($filename)) { if ($users_view->file_exists($filename)) {
return false; return false;
} }
// check if filename is a directory // check if filename is a directory
if($files_view->is_dir($filename)){ if($files_view->is_dir($filename)){
return false; return false;
@ -110,7 +94,7 @@ class Storage {
return false; return false;
} }
} }
// check filesize // check filesize
if($files_view->filesize($filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)){ if($files_view->filesize($filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)){
return false; return false;
@ -129,12 +113,12 @@ class Storage {
// create all parent folders // create all parent folders
$info=pathinfo($filename); $info=pathinfo($filename);
if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true); if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true);
// store a new version of a file // store a new version of a file
@$users_view->copy('files'.$filename, 'versions'.$filename.'.v'.time()); @$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.time());
// expire old revisions if necessary // expire old revisions if necessary
Storage::expire($filename); Storage::expire($filename);
} }
@ -145,11 +129,11 @@ class Storage {
* rollback to an old version of a file. * rollback to an old version of a file.
*/ */
public static function rollback($filename,$revision) { public static function rollback($filename,$revision) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
$users_view = \OCP\Files::getStorage("files_versions"); $users_view = \OCP\Files::getStorage("files_versions");
$users_view->chroot(\OCP\User::getUser().'/'); $users_view->chroot(\OCP\User::getUser().'/');
if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) { if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
$pos = strpos($source, '/files', 1); $pos = strpos($source, '/files', 1);
$uid = substr($source, 1, $pos - 1); $uid = substr($source, 1, $pos - 1);
@ -157,23 +141,20 @@ class Storage {
} else { } else {
$uid = \OCP\User::getUser(); $uid = \OCP\User::getUser();
} }
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'.$uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
// rollback // rollback
if( @$users_view->copy('versions'.$filename.'.v'.$revision, 'files'.$filename) ) { if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
return true; return true;
}else{ }else{
return false; return false;
} }
} }
} }
/** /**
@ -181,18 +162,17 @@ class Storage {
*/ */
public static function isversioned($filename) { public static function isversioned($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
$versions_fileview = \OCP\Files::getStorage("files_versions");
if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) { if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
$pos = strpos($source, '/files', 1); $pos = strpos($source, '/files', 1);
$uid = substr($source, 1, $pos - 1);
$filename = substr($source, $pos + 6); $filename = substr($source, $pos + 6);
} else {
$uid = \OCP\User::getUser();
} }
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
// check for old versions // check for old versions
$matches=glob($versionsFolderName.'/'.$filename.'.v*'); $matches=glob($versionsFolderName.$filename.'.v*');
if(count($matches)>1){ if(count($matches)>0){
return true; return true;
}else{ }else{
return false; return false;
@ -203,17 +183,17 @@ class Storage {
} }
/** /**
* @brief get a list of all available versions of a file in descending chronological order * @brief get a list of all available versions of a file in descending chronological order
* @param $filename file to find versions of, relative to the user files dir * @param $filename file to find versions of, relative to the user files dir
* @param $count number of versions to return * @param $count number of versions to return
* @returns array * @returns array
*/ */
public static function getVersions( $filename, $count = 0 ) { public static function getVersions( $filename, $count = 0 ) {
if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) { if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
$pos = strpos($source, '/files', 1); $pos = strpos($source, '/files', 1);
$uid = substr($source, 1, $pos - 1); $uid = substr($source, 1, $pos - 1);
@ -221,70 +201,71 @@ class Storage {
} else { } else {
$uid = \OCP\User::getUser(); $uid = \OCP\User::getUser();
} }
$versionsFolderName = \OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER); $versions_fileview = \OCP\Files::getStorage('files_versions');
$versions = array(); $versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
$versions = array();
// fetch for old versions // fetch for old versions
$matches = glob( $versionsFolderName.'/'.$filename.'.v*' ); $matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
sort( $matches );
$i = 0;
foreach( $matches as $ma ) {
sort( $matches );
$i = 0;
$files_view = \OCP\Files::getStorage('files');
$local_file = $files_view->getLocalFile($filename);
foreach( $matches as $ma ) {
$i++; $i++;
$versions[$i]['cur'] = 0; $versions[$i]['cur'] = 0;
$parts = explode( '.v', $ma ); $parts = explode( '.v', $ma );
$versions[$i]['version'] = ( end( $parts ) ); $versions[$i]['version'] = ( end( $parts ) );
// if file with modified date exists, flag it in array as currently enabled version // if file with modified date exists, flag it in array as currently enabled version
$files_view = \OCP\Files::getStorage('files');
$local_file = $files_view->getLocalFile($filename);
( \md5_file( $ma ) == \md5_file( $local_file ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 ); ( \md5_file( $ma ) == \md5_file( $local_file ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
} }
$versions = array_reverse( $versions );
foreach( $versions as $key => $value ) {
$versions = array_reverse( $versions );
foreach( $versions as $key => $value ) {
// flag the first matched file in array (which will have latest modification date) as current version // flag the first matched file in array (which will have latest modification date) as current version
if ( $versions[$key]['fileMatch'] ) { if ( $versions[$key]['fileMatch'] ) {
$versions[$key]['cur'] = 1; $versions[$key]['cur'] = 1;
break; break;
} }
} }
$versions = array_reverse( $versions ); $versions = array_reverse( $versions );
// only show the newest commits // only show the newest commits
if( $count != 0 and ( count( $versions )>$count ) ) { if( $count != 0 and ( count( $versions )>$count ) ) {
$versions = array_slice( $versions, count( $versions ) - $count ); $versions = array_slice( $versions, count( $versions ) - $count );
} }
return( $versions ); return( $versions );
} else { } else {
// if versioning isn't enabled then return an empty array
return( array() );
}
}
/** // if versioning isn't enabled then return an empty array
* @brief Erase a file's versions which exceed the set quota return( array() );
*/
public static function expire($filename) { }
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
}
/**
* @brief Erase a file's versions which exceed the set quota
*/
public static function expire($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) { if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
$pos = strpos($source, '/files', 1); $pos = strpos($source, '/files', 1);
@ -293,36 +274,33 @@ class Storage {
} else { } else {
$uid = \OCP\User::getUser(); $uid = \OCP\User::getUser();
} }
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER); $versions_fileview = \OCP\Files::getStorage("files_versions");
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
// check for old versions // check for old versions
$matches = glob( $versionsFolderName.'/'.$filename.'.v*' ); $matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) { if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {
$numberToDelete = count( $matches-\OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ); $numberToDelete = count( $matches-\OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) );
// delete old versions of a file // delete old versions of a file
$deleteItems = array_slice( $matches, 0, $numberToDelete ); $deleteItems = array_slice( $matches, 0, $numberToDelete );
foreach( $deleteItems as $de ) { foreach( $deleteItems as $de ) {
unlink( $versionsFolderName.'/'.$filename.'.v'.$de ); unlink( $versionsFolderName.'/'.$filename.'.v'.$de );
} }
} }
} }
} }
/** /**
* @brief Erase all old versions of all user files * @brief Erase all old versions of all user files
* @return true/false * @return true/false
*/ */
public function expireAll() { public function expireAll() {
return $this->view->deleteAll('', true);
$dir = \OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER); }
return $this->view->deleteAll( $dir, true );
}
} }