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

Merge pull request #4339 from owncloud/mimetype-defaults 

Add the option to provide templates for newly created files
This commit is contained in:
Thomas Müller 2013-08-17 08:42:49 -07:00
parent 6ae6dc00e5 57f7ff2dbd
commit 12f4494de0
8 changed files with 740 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files/ajax/newfile.php
View File

@ -77,6 +77,12 @@ if($source) {
exit(); exit();
} else { } else {
$success = false; $success = false;
if (!$content) {
$templateManager = OC_Helper::getFileTemplateManager();
$mimeType = OC_Helper::getMimeType($target);
$content = $templateManager->getTemplate($mimeType);
}
if($content) { if($content) {
$success = \OC\Files\Filesystem::file_put_contents($target, $content); $success = \OC\Files\Filesystem::file_put_contents($target, $content);
} else { } else {
@ -87,9 +93,11 @@ if($source) {
$meta = \OC\Files\Filesystem::getFileInfo($target); $meta = \OC\Files\Filesystem::getFileInfo($target);
$id = $meta['fileid']; $id = $meta['fileid'];
$mime = $meta['mimetype']; $mime = $meta['mimetype'];
$size = $meta['size'];
OCP\JSON::success(array('data' => array( OCP\JSON::success(array('data' => array(
'id' => $id, 'id' => $id,
'mime' => $mime, 'mime' => $mime,
'size' => $size,
'content' => $content, 'content' => $content,
))); )));
exit(); exit();

4
apps/files/appinfo/app.php
View File

@ -21,3 +21,7 @@ OC_Search::registerProvider('OC_Search_Provider_File');
\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook'); \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
\OCP\BackgroundJob::addRegularTask('\OC\Files\Cache\BackgroundWatcher', 'checkNext'); \OCP\BackgroundJob::addRegularTask('\OC\Files\Cache\BackgroundWatcher', 'checkNext');
$templateManager = OC_Helper::getFileTemplateManager();
$templateManager->registerTemplate('text/html', 'core/templates/filetemplates/template.html');

2
apps/files/js/file-upload.js
View File

@ -258,8 +258,10 @@ $(document).ready(function() {
var date=new Date(); var date=new Date();
FileList.addFile(name,0,date,false,hidden); FileList.addFile(name,0,date,false,hidden);
var tr=$('tr').filterAttr('data-file',name); var tr=$('tr').filterAttr('data-file',name);
tr.attr('data-size',result.data.size);
tr.attr('data-mime',result.data.mime); tr.attr('data-mime',result.data.mime);
tr.attr('data-id', result.data.id); tr.attr('data-id', result.data.id);
tr.find('.filesize').text(humanFileSize(result.data.size));
getMimeIcon(result.data.mime,function(path){ getMimeIcon(result.data.mime,function(path){
tr.find('td.filename').attr('style','background-image:url('+path+')'); tr.find('td.filename').attr('style','background-image:url('+path+')');
}); });

2
apps/files/js/files.js
View File

@ -365,7 +365,9 @@ $(document).ready(function() {
FileList.addFile(name,0,date,false,hidden); FileList.addFile(name,0,date,false,hidden);
var tr=$('tr').filterAttr('data-file',name); var tr=$('tr').filterAttr('data-file',name);
tr.attr('data-mime',result.data.mime); tr.attr('data-mime',result.data.mime);
tr.attr('data-size',result.data.size);
tr.attr('data-id', result.data.id); tr.attr('data-id', result.data.id);
tr.find('.filesize').text(humanFileSize(result.data.size));
getMimeIcon(result.data.mime,function(path){ getMimeIcon(result.data.mime,function(path){
tr.find('td.filename').attr('style','background-image:url('+path+')'); tr.find('td.filename').attr('style','background-image:url('+path+')');
}); });

9
core/templates/filetemplates/template.html Normal file
View File

@ -0,0 +1,9 @@
<!DOCTYPE html>
<html>
<head>
</head>
<body>
</body>
</html>

121
lib/files/type/detection.php Normal file
View File

@ -0,0 +1,121 @@
<?php
/**
* Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC\Files\Type;
/**
* Class Detection
*
* Mimetype detection
*
* @package OC\Files\Type
*/
class Detection {
protected $mimetypes = array();
/**
* add an extension -> mimetype mapping
*
* @param string $extension
* @param string $mimetype
*/
public function registerType($extension, $mimetype) {
$this->mimetypes[$extension] = $mimetype;
}
/**
* add an array of extension -> mimetype mappings
*
* @param array $types
*/
public function registerTypeArray($types) {
$this->mimetypes = array_merge($this->mimetypes, $types);
}
/**
* detect mimetype only based on filename, content of file is not used
*
* @param string $path
* @return string
*/
public function detectPath($path) {
if (strpos($path, '.')) {
//try to guess the type by the file extension
$extension = strtolower(strrchr(basename($path), "."));
$extension = substr($extension, 1); //remove leading .
return (isset($this->mimetypes[$extension])) ? $this->mimetypes[$extension] : 'application/octet-stream';
} else {
return 'application/octet-stream';
}
}
/**
* detect mimetype based on both filename and content
*
* @param string $path
* @return string
*/
public function detect($path) {
$isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) === 'file://');
if (@is_dir($path)) {
// directories are easy
return "httpd/unix-directory";
}
$mimeType = $this->detectPath($path);
if ($mimeType === 'application/octet-stream' and function_exists('finfo_open')
and function_exists('finfo_file') and $finfo = finfo_open(FILEINFO_MIME)
) {
$info = @strtolower(finfo_file($finfo, $path));
if ($info) {
$mimeType = substr($info, 0, strpos($info, ';'));
}
finfo_close($finfo);
}
if (!$isWrapped and $mimeType === 'application/octet-stream' && function_exists("mime_content_type")) {
// use mime magic extension if available
$mimeType = mime_content_type($path);
}
if (!$isWrapped and $mimeType === 'application/octet-stream' && \OC_Helper::canExecute("file")) {
// it looks like we have a 'file' command,
// lets see if it does have mime support
$path = escapeshellarg($path);
$fp = popen("file -b --mime-type $path 2>/dev/null", "r");
$reply = fgets($fp);
pclose($fp);
//trim the newline
$mimeType = trim($reply);
}
return $mimeType;
}
/**
* detect mimetype based on the content of a string
*
* @param string $data
* @return string
*/
public function detectString($data) {
if (function_exists('finfo_open') and function_exists('finfo_file')) {
$finfo = finfo_open(FILEINFO_MIME);
return finfo_buffer($finfo, $data);
} else {
$tmpFile = \OC_Helper::tmpFile();
$fh = fopen($tmpFile, 'wb');
fwrite($fh, $data, 8024);
fclose($fh);
$mime = $this->detect($tmpFile);
unset($tmpFile);
return $mime;
}
}
}

46
lib/files/type/templatemanager.php Normal file
View File

@ -0,0 +1,46 @@
<?php
/**
* Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC\Files\Type;
class TemplateManager {
protected $templates = array();
public function registerTemplate($mimetype, $path) {
$this->templates[$mimetype] = $path;
}
/**
* get the path of the template for a mimetype
*
* @param string $mimetype
* @return string | null
*/
public function getTemplatePath($mimetype) {
if (isset($this->templates[$mimetype])) {
return $this->templates[$mimetype];
} else {
return null;
}
}
/**
* get the template content for a mimetype
*
* @param string $mimetype
* @return string
*/
public function getTemplate($mimetype) {
$path = $this->getTemplatePath($mimetype);
if ($path) {
return file_get_contents($path);
} else {
return '';
}
}
}

108
lib/helper.php
View File

@ -25,9 +25,10 @@
* Collection of useful functions * Collection of useful functions
*/ */
class OC_Helper { class OC_Helper {
private static $mimetypes=array();
private static $tmpFiles = array(); private static $tmpFiles = array();
private static $mimetypeIcons = array(); private static $mimetypeIcons = array();
private static $mimetypeDetector;
private static $templateManager;
/** /**
* @brief Creates an url using a defined route * @brief Creates an url using a defined route
@ -65,16 +66,13 @@ class OC_Helper {
} else { } else {
$urlLinkTo = OC_App::getAppWebPath($app) . '/' . $file; $urlLinkTo = OC_App::getAppWebPath($app) . '/' . $file;
} }
} } else {
else{
$urlLinkTo = OC::$WEBROOT . '/' . $app . '/' . $file; $urlLinkTo = OC::$WEBROOT . '/' . $app . '/' . $file;
} }
} } else {
else{
if (file_exists(OC::$SERVERROOT . '/core/' . $file)) { if (file_exists(OC::$SERVERROOT . '/core/' . $file)) {
$urlLinkTo = OC::$WEBROOT . '/core/' . $file; $urlLinkTo = OC::$WEBROOT . '/core/' . $file;
} } else {
else{
$urlLinkTo = OC::$WEBROOT . '/' . $file; $urlLinkTo = OC::$WEBROOT . '/' . $file;
} }
} }
@ -108,8 +106,7 @@ class OC_Helper {
* *
* Returns a absolute url to the given app and file. * Returns a absolute url to the given app and file.
*/ */
public static function makeURLAbsolute( $url ) public static function makeURLAbsolute($url) {
{
return OC_Request::serverProtocol() . '://' . OC_Request::serverHost() . $url; return OC_Request::serverProtocol() . '://' . OC_Request::serverHost() . $url;
} }
@ -304,8 +301,7 @@ class OC_Helper {
if (is_link($fullpath)) if (is_link($fullpath))
return false; return false;
elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode)) elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode))
return false; return false; elseif (!self::chmodr($fullpath, $filemode))
elseif(!self::chmodr($fullpath, $filemode))
return false; return false;
} }
} }
@ -362,6 +358,27 @@ class OC_Helper {
} }
} }
/**
* @return \OC\Files\Type\Detection
*/
static public function getMimetypeDetector() {
if (!self::$mimetypeDetector) {
self::$mimetypeDetector = new \OC\Files\Type\Detection();
self::$mimetypeDetector->registerTypeArray(include 'mimetypes.list.php');
}
return self::$mimetypeDetector;
}
/**
* @return \OC\Files\Type\TemplateManager
*/
static public function getFileTemplateManager() {
if (!self::$templateManager) {
self::$templateManager = new \OC\Files\Type\TemplateManager();
}
return self::$templateManager;
}
/** /**
* Try to guess the mimetype based on filename * Try to guess the mimetype based on filename
* *
@ -369,80 +386,28 @@ class OC_Helper {
* @return string * @return string
*/ */
static public function getFileNameMimeType($path) { static public function getFileNameMimeType($path) {
if(strpos($path, '.')) { return self::getMimetypeDetector()->detectPath($path);
//try to guess the type by the file extension
if(!self::$mimetypes || self::$mimetypes != include 'mimetypes.list.php') {
self::$mimetypes=include 'mimetypes.list.php';
}
$extension=strtolower(strrchr(basename($path), "."));
$extension=substr($extension, 1);//remove leading .
return (isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream';
}else{
return 'application/octet-stream';
}
} }
/** /**
* get the mimetype form a local file * get the mimetype form a local file
*
* @param string $path * @param string $path
* @return string * @return string
* does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
*/ */
static function getMimeType($path) { static function getMimeType($path) {
$isWrapped=(strpos($path, '://')!==false) and (substr($path, 0, 7)=='file://'); return self::getMimetypeDetector()->detect($path);
if (@is_dir($path)) {
// directories are easy
return "httpd/unix-directory";
}
$mimeType = self::getFileNameMimeType($path);
if($mimeType=='application/octet-stream' and function_exists('finfo_open')
and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)) {
$info = @strtolower(finfo_file($finfo, $path));
if($info) {
$mimeType=substr($info, 0, strpos($info, ';'));
}
finfo_close($finfo);
}
if (!$isWrapped and $mimeType=='application/octet-stream' && function_exists("mime_content_type")) {
// use mime magic extension if available
$mimeType = mime_content_type($path);
}
if (!$isWrapped and $mimeType=='application/octet-stream' && OC_Helper::canExecute("file")) {
// it looks like we have a 'file' command,
// lets see if it does have mime support
$path=escapeshellarg($path);
$fp = popen("file -b --mime-type $path 2>/dev/null", "r");
$reply = fgets($fp);
pclose($fp);
//trim the newline
$mimeType = trim($reply);
}
return $mimeType;
} }
/** /**
* get the mimetype form a data string * get the mimetype form a data string
*
* @param string $data * @param string $data
* @return string * @return string
*/ */
static function getStringMimeType($data) { static function getStringMimeType($data) {
if(function_exists('finfo_open') and function_exists('finfo_file')) { return self::getMimetypeDetector()->detectString($data);
$finfo=finfo_open(FILEINFO_MIME);
return finfo_buffer($finfo, $data);
}else{
$tmpFile=OC_Helper::tmpFile();
$fh=fopen($tmpFile, 'wb');
fwrite($fh, $data, 8024);
fclose($fh);
$mime=self::getMimeType($tmpFile);
unset($tmpFile);
return $mime;
}
} }
/** /**
@ -466,6 +431,7 @@ class OC_Helper {
/** /**
* returns "checked"-attribute if request contains selected radio element * returns "checked"-attribute if request contains selected radio element
* OR if radio element is the default one -- maybe? * OR if radio element is the default one -- maybe?
*
* @param string $s Name of radio-button element name * @param string $s Name of radio-button element name
* @param string $v Value of current radio-button element * @param string $v Value of current radio-button element
* @param string $d Value of default radio-button element * @param string $d Value of default radio-button element
@ -522,6 +488,7 @@ class OC_Helper {
/** /**
* copy the contents of one stream to another * copy the contents of one stream to another
*
* @param resource $source * @param resource $source
* @param resource $target * @param resource $target
* @return int the number of bytes copied * @return int the number of bytes copied
@ -544,6 +511,7 @@ class OC_Helper {
/** /**
* create a temporary file with an unique filename * create a temporary file with an unique filename
*
* @param string $postfix * @param string $postfix
* @return string * @return string
* *
@ -559,6 +527,7 @@ class OC_Helper {
/** /**
* move a file to oc-noclean temp dir * move a file to oc-noclean temp dir
*
* @param string $filename * @param string $filename
* @return mixed * @return mixed
* *
@ -584,6 +553,7 @@ class OC_Helper {
/** /**
* create a temporary folder with an unique filename * create a temporary folder with an unique filename
*
* @return string * @return string
* *
* temporary files are automatically cleaned up after the script is finished * temporary files are automatically cleaned up after the script is finished
@ -792,6 +762,7 @@ class OC_Helper {
/** /**
* Shortens str to maxlen by replacing characters in the middle with '...', eg. * Shortens str to maxlen by replacing characters in the middle with '...', eg.
* ellipsis('a very long string with lots of useless info to make a better example', 14) becomes 'a very ...example' * ellipsis('a very long string with lots of useless info to make a better example', 14) becomes 'a very ...example'
*
* @param string $str the string * @param string $str the string
* @param string $maxlen the maximum length of the result * @param string $maxlen the maximum length of the result
* @return string with at most maxlen characters * @return string with at most maxlen characters
@ -833,6 +804,7 @@ class OC_Helper {
/** /**
* Checks if a function is available * Checks if a function is available
*
* @param string $function_name * @param string $function_name
* @return bool * @return bool
*/ */