DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use filters

Browse Source
This commit is contained in:
VicDeo 2013-12-26 15:42:28 +00:00
parent 0c5bcbdd61
commit 5c59a2d374
5 changed files with 57 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ajax/documentController.php
View File

@ -26,7 +26,7 @@ class DocumentController extends Controller{
$content = base64_decode(self::ODT_TEMPLATE);
if (class_exists('\OC\Files\Type\TemplateManager')){
$manager = \OC_Helper::getFileTemplateManager();
$templateContent = $manager->getTemplate('application/vnd.oasis.opendocument.text');
$templateContent = $manager->getTemplate(Storage::MIMETYPE_LIBREOFFICE_WORDPROCESSOR);
if ($templateContent){
$content = $templateContent;
}

12
ajax/sessionController.php
View File

@ -117,7 +117,6 @@ class SessionController extends Controller{
if ($view->file_exists($path)){
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$currentHash = sha1($view->file_get_contents($path));
@ -127,14 +126,21 @@ class SessionController extends Controller{
// Original file was modified externally. Save to a new one
$path = Helper::getNewFileName($view, $path, '-conflict');
}
$mimetype = $view->getMimeType($path);
} else {
$mimetype = Storage::MIMETYPE_LIBREOFFICE_WORDPROCESSOR;
}
if ($view->file_put_contents($path, $content)){
$data = Filter::write($content, $mimetype);
if ($view->file_put_contents($path, $data['content'])){
// Not a last user
if ($memberCount>0){
// Update genesis hash to prevent conflicts
Helper::debugLog('Update hash');
$session->updateGenesisHash($esId, sha1($content));
$session->updateGenesisHash($esId, sha1($data['content']));
} else {
// Last user. Kill session data
Db_Session::cleanUp($esId);

38
lib/filter.php Normal file
View File

@ -0,0 +1,38 @@
<?php
/**
* ownCloud - Documents App
*
* @author Victor Dubiniuk
* @copyright 2013 Victor Dubiniuk victor.dubiniuk@gmail.com
*
* This file is licensed under the Affero General Public License version 3 or
* later.
*/
namespace OCA\Documents;
class Filter {
public static function read($content, $mimetype){
$data = array(
'mimetype' => $mimetype,
'content' => $content
);
\OCP\Util::emitHook('\OCA\Documents\Filter', 'read', $data);
return $data;
}
public static function write($content, $mimetype){
$data = array(
'mimetype' => $mimetype,
'content' => $content
);
\OCP\Util::emitHook('\OCA\Documents\Filter', 'write', $data);
return $data;
}
}

5
lib/genesis.php
View File

@ -52,11 +52,14 @@ class Genesis {
//copy new genesis to /user/documents/{hash}.odt
// get decrypted content
$content = $view->file_get_contents($path);
$mimetype = $view->getMimeType($path);
$data = Filter::read($content, $mimetype);
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$this->view->file_put_contents($this->path, $content);
$this->view->file_put_contents($this->path, $data['content']);
\OC_FileProxy::$enabled = $proxyStatus;
}

5
lib/storage.php Executable file → Normal file
View File

@ -25,10 +25,11 @@
namespace OCA\Documents;
class Storage {
const MIMETYPE_LIBREOFFICE_WORDPROCESSOR = 'application/vnd.oasis.opendocument.text';
public static function getDocuments() {
$list = array_filter(
\OCP\Files::searchByMime('application/vnd.oasis.opendocument.text'),
\OCP\Files::searchByMime(self::MIMETYPE_LIBREOFFICE_WORDPROCESSOR),
function($item){
//filter Deleted
if (strpos($item['path'], '_trashbin')===0){
@ -43,7 +44,7 @@ class Storage {
public static function resolvePath($fileId){
$list = array_filter(
\OCP\Files::searchByMime('application/vnd.oasis.opendocument.text'),
\OCP\Files::searchByMime(self::MIMETYPE_LIBREOFFICE_WORDPROCESSOR),
function($item) use ($fileId){
return intval($item['fileid'])==$fileId;
}