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

connect preview lib to filesystem hooks

Browse source
This commit is contained in:
Georg Ehrke 2013-05-29 12:01:43 +02:00
parent a03787bc42
commit eebc15dce0
2 changed files with 71 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/base.php
View file

@ -474,6 +474,7 @@ class OC {
self::registerCacheHooks();
self::registerFilesystemHooks();
self::registerPreviewHooks();
self::registerShareHooks();
//make sure temporary files are cleaned up
@ -539,6 +540,14 @@ class OC {
OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
}
/**
* register hooks for previews
*/
public static function registerPreviewHooks() {
OC_Hook::connect('OC_Filesystem', 'post_write', 'OC_Preview', 'post_write');
OC_Hook::connect('OC_Filesystem', 'delete', 'OC_Preview', 'post_delete');
}
/**
* register hooks for sharing
*/

92
lib/preview.php
View file

@ -55,7 +55,7 @@ class OC_Preview {
* false if thumbnail does not exist
* path to thumbnail if thumbnail exists
*/
public function __construct($user = null, $root = '', $file = '', $maxX = 0, $maxY = 0, $scalingup = true){
public function __construct($user = null, $root = '', $file = '', $maxX = 0, $maxY = 0, $scalingup = true, $force = false){
//set config
$this->max_x = OC_Config::getValue('preview_max_x', null);
$this->max_y = OC_Config::getValue('preview_max_y', null);
@ -71,47 +71,49 @@ class OC_Preview {
$this->fileview = new \OC\Files\View('/' . $user . '/' . $root);
$this->userview = new \OC\Files\View('/' . $user);
if(!is_null($this->max_x)){
if($this->maxX > $this->max_x){
OC_Log::write('core', 'maxX reduced from ' . $this->maxX . ' to ' . $this->max_x, OC_Log::DEBUG);
$this->maxX = $this->max_x;
if($force !== true){
if(!is_null($this->max_x)){
if($this->maxX > $this->max_x){
OC_Log::write('core', 'maxX reduced from ' . $this->maxX . ' to ' . $this->max_x, OC_Log::DEBUG);
$this->maxX = $this->max_x;
}
}
}
if(!is_null($this->max_y)){
if($this->maxY > $this->max_y){
OC_Log::write('core', 'maxY reduced from ' . $this->maxY . ' to ' . $this->max_y, OC_Log::DEBUG);
$this->maxY = $this->max_y;
if(!is_null($this->max_y)){
if($this->maxY > $this->max_y){
OC_Log::write('core', 'maxY reduced from ' . $this->maxY . ' to ' . $this->max_y, OC_Log::DEBUG);
$this->maxY = $this->max_y;
}
}
}
//init providers
if(empty(self::$providers)){
self::initProviders();
}
//init providers
if(empty(self::$providers)){
self::initProviders();
}
//check if there are any providers at all
if(empty(self::$providers)){
OC_Log::write('core', 'No preview providers exist', OC_Log::ERROR);
throw new Exception('No providers');
}
//check if there are any providers at all
if(empty(self::$providers)){
OC_Log::write('core', 'No preview providers exist', OC_Log::ERROR);
throw new Exception('No providers');
}
//validate parameters
if($file === ''){
OC_Log::write('core', 'No filename passed', OC_Log::ERROR);
throw new Exception('File not found');
}
//validate parameters
if($file === ''){
OC_Log::write('core', 'No filename passed', OC_Log::ERROR);
throw new Exception('File not found');
}
//check if file exists
if(!$this->fileview->file_exists($file)){
OC_Log::write('core', 'File:"' . $file . '" not found', OC_Log::ERROR);
throw new Exception('File not found');
}
//check if file exists
if(!$this->fileview->file_exists($file)){
OC_Log::write('core', 'File:"' . $file . '" not found', OC_Log::ERROR);
throw new Exception('File not found');
}
//check if given size makes sense
if($maxX === 0 || $maxY === 0){
OC_Log::write('core', 'Can not create preview with 0px width or 0px height', OC_Log::ERROR);
throw new Exception('Height and/or width set to 0');
//check if given size makes sense
if($maxX === 0 || $maxY === 0){
OC_Log::write('core', 'Can not create preview with 0px width or 0px height', OC_Log::ERROR);
throw new Exception('Height and/or width set to 0');
}
}
}
@ -187,18 +189,21 @@ class OC_Preview {
$fileinfo = $this->fileview->getFileInfo($this->file);
$fileid = $fileinfo['fileid'];
return $this->userview->unlink(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $this->maxX . '-' . $this->maxY . '.png');
$this->userview->unlink(self::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $this->maxX . '-' . $this->maxY . '.png');
return;
}
/**
* @brief deletes all previews of a file
* @return bool
*/
public function deleteAllPrevies(){
public function deleteAllPreviews(){
$fileinfo = $this->fileview->getFileInfo($this->file);
$fileid = $fileinfo['fileid'];
return $this->userview->rmdir(self::THUMBNAILS_FOLDER . '/' . $fileid);
$this->userview->deleteAll(self::THUMBNAILS_FOLDER . '/' . $fileid . '/');
$this->userview->rmdir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/');
return;
}
/**
@ -577,4 +582,17 @@ class OC_Preview {
exit;
}
}
public static function post_write($args){
self::post_delete($args);
}
public static function post_delete($args){
$path = $args['path'];
if(substr($path, 0, 1) == '/'){
$path = substr($path, 1);
}
$preview = new OC_Preview(OC_User::getUser(), 'files/', $path, 0, 0, false, true);
$preview->deleteAllPreviews();
}
}