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'] ) ) {

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

@ -30,6 +30,7 @@ class Hooks {
} }
} }
/** /**
* @brief Erase versions of deleted file * @brief Erase versions of deleted file
* @param array * @param array
@ -38,8 +39,9 @@ class Hooks {
* cleanup the versions directory if the actual file gets deleted * cleanup the versions directory if the actual file gets deleted
*/ */
public static function remove_hook($params) { public static function remove_hook($params) {
$versions_fileview = \OCP\Files::getStorage('files_versions');
$rel_path = $params['path']; $rel_path = $params['path'];
$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v'; $abs_path = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$rel_path.'.v';
if(Storage::isversioned($rel_path)) { if(Storage::isversioned($rel_path)) {
$versions = Storage::getVersions($rel_path); $versions = Storage::getVersions($rel_path);
foreach ($versions as $v){ foreach ($versions as $v){
@ -56,10 +58,13 @@ class Hooks {
* of the stored versions along the actual file * of the stored versions along the actual file
*/ */
public static function rename_hook($params) { public static function rename_hook($params) {
$versions_fileview = \OCP\Files::getStorage('files_versions');
$rel_oldpath = $params['oldpath']; $rel_oldpath = $params['oldpath'];
$abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v'; $abs_oldpath = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$rel_oldpath.'.v';
$abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v'; $abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$params['newpath'].'.v';
if(Storage::isversioned($rel_oldpath)) { if(Storage::isversioned($rel_oldpath)) {
$info=pathinfo($abs_newpath);
if(!file_exists($info['dirname'])) mkdir($info['dirname'],0700,true);
$versions = Storage::getVersions($rel_oldpath); $versions = Storage::getVersions($rel_oldpath);
foreach ($versions as $v){ foreach ($versions as $v){
rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']); rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);

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

@ -30,7 +30,6 @@ class Storage {
// - 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
@ -38,26 +37,12 @@ class Storage {
private $view; private $view;
function __construct( $view ) { function __construct() {
$this->view = $view; $this->view = \OCP\Files::getStorage('files_versions');
} }
/**
* 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);
}
}
}
/** /**
* listen to write event. * listen to write event.
*/ */
@ -87,9 +72,8 @@ 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)) {
@ -133,7 +117,7 @@ class Storage {
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);
@ -157,12 +141,9 @@ 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;
@ -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;
@ -221,7 +201,8 @@ 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('');
$versions = array(); $versions = array();
// fetch for old versions // fetch for old versions
@ -231,6 +212,8 @@ class Storage {
$i = 0; $i = 0;
$files_view = \OCP\Files::getStorage('files');
$local_file = $files_view->getLocalFile($filename);
foreach( $matches as $ma ) { foreach( $matches as $ma ) {
$i++; $i++;
@ -239,8 +222,6 @@ class Storage {
$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 );
} }
@ -293,7 +274,8 @@ 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*' );
@ -319,10 +301,6 @@ class Storage {
* @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 );
} }
} }