add the option to have templates for newly created files

This commit is contained in:
Robin Appelman 2013-08-07 16:53:09 +02:00
parent fc332acf8a
commit 9321eceed6
3 changed files with 98 additions and 34 deletions

View File

@ -3,29 +3,29 @@
// Init owncloud // Init owncloud
global $eventSource; global $eventSource;
if(!OC_User::isLoggedIn()) { if (!OC_User::isLoggedIn()) {
exit; exit;
} }
session_write_close(); session_write_close();
// Get the params // Get the params
$dir = isset( $_REQUEST['dir'] ) ? '/'.trim($_REQUEST['dir'], '/\\') : ''; $dir = isset($_REQUEST['dir']) ? '/' . trim($_REQUEST['dir'], '/\\') : '';
$filename = isset( $_REQUEST['filename'] ) ? trim($_REQUEST['filename'], '/\\') : ''; $filename = isset($_REQUEST['filename']) ? trim($_REQUEST['filename'], '/\\') : '';
$content = isset( $_REQUEST['content'] ) ? $_REQUEST['content'] : ''; $content = isset($_REQUEST['content']) ? $_REQUEST['content'] : '';
$source = isset( $_REQUEST['source'] ) ? trim($_REQUEST['source'], '/\\') : ''; $source = isset($_REQUEST['source']) ? trim($_REQUEST['source'], '/\\') : '';
if($source) { if ($source) {
$eventSource=new OC_EventSource(); $eventSource = new OC_EventSource();
} else { } else {
OC_JSON::callCheck(); OC_JSON::callCheck();
} }
if($filename == '') { if ($filename == '') {
OCP\JSON::error(array("data" => array( "message" => "Empty Filename" ))); OCP\JSON::error(array("data" => array("message" => "Empty Filename")));
exit(); exit();
} }
if(strpos($filename, '/')!==false) { if (strpos($filename, '/') !== false) {
OCP\JSON::error(array("data" => array( "message" => "Invalid Filename" ))); OCP\JSON::error(array("data" => array("message" => "Invalid Filename")));
exit(); exit();
} }
@ -34,7 +34,7 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
static $lastsize = 0; static $lastsize = 0;
global $eventSource; global $eventSource;
switch($notification_code) { switch ($notification_code) {
case STREAM_NOTIFY_FILE_SIZE_IS: case STREAM_NOTIFY_FILE_SIZE_IS:
$filesize = $bytes_max; $filesize = $bytes_max;
break; break;
@ -43,52 +43,56 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
if ($bytes_transferred > 0) { if ($bytes_transferred > 0) {
if (!isset($filesize)) { if (!isset($filesize)) {
} else { } else {
$progress = (int)(($bytes_transferred/$filesize)*100); $progress = (int)(($bytes_transferred / $filesize) * 100);
if($progress>$lastsize) {//limit the number or messages send if ($progress > $lastsize) { //limit the number or messages send
$eventSource->send('progress', $progress); $eventSource->send('progress', $progress);
} }
$lastsize=$progress; $lastsize = $progress;
} }
} }
break; break;
} }
} }
if($source) { if ($source) {
if(substr($source, 0, 8)!='https://' and substr($source, 0, 7)!='http://') { if (substr($source, 0, 8) != 'https://' and substr($source, 0, 7) != 'http://') {
OCP\JSON::error(array("data" => array( "message" => "Not a valid source" ))); OCP\JSON::error(array("data" => array("message" => "Not a valid source")));
exit(); exit();
} }
$ctx = stream_context_create(null, array('notification' =>'progress')); $ctx = stream_context_create(null, array('notification' => 'progress'));
$sourceStream=fopen($source, 'rb', false, $ctx); $sourceStream = fopen($source, 'rb', false, $ctx);
$target=$dir.'/'.$filename; $target = $dir . '/' . $filename;
$result=\OC\Files\Filesystem::file_put_contents($target, $sourceStream); $result = \OC\Files\Filesystem::file_put_contents($target, $sourceStream);
if($result) { if ($result) {
$meta = \OC\Files\Filesystem::getFileInfo($target); $meta = \OC\Files\Filesystem::getFileInfo($target);
$mime=$meta['mimetype']; $mime = $meta['mimetype'];
$id = $meta['fileid']; $id = $meta['fileid'];
$eventSource->send('success', array('mime'=>$mime, 'size'=>\OC\Files\Filesystem::filesize($target), 'id' => $id)); $eventSource->send('success', array('mime' => $mime, 'size' => \OC\Files\Filesystem::filesize($target), 'id' => $id));
} else { } else {
$eventSource->send('error', "Error while downloading ".$source. ' to '.$target); $eventSource->send('error', "Error while downloading " . $source . ' to ' . $target);
} }
$eventSource->close(); $eventSource->close();
exit(); exit();
} else { } else {
if($content) { if ($content) {
if(\OC\Files\Filesystem::file_put_contents($dir.'/'.$filename, $content)) { if (\OC\Files\Filesystem::file_put_contents($dir . '/' . $filename, $content)) {
$meta = \OC\Files\Filesystem::getFileInfo($dir.'/'.$filename); $meta = \OC\Files\Filesystem::getFileInfo($dir . '/' . $filename);
$id = $meta['fileid']; $id = $meta['fileid'];
OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id))); OCP\JSON::success(array("data" => array('content' => $content, 'id' => $id)));
exit(); exit();
} }
}elseif(\OC\Files\Filesystem::touch($dir . '/' . $filename)) { } elseif (\OC\Files\Filesystem::touch($dir . '/' . $filename)) {
$meta = \OC\Files\Filesystem::getFileInfo($dir.'/'.$filename); $meta = \OC\Files\Filesystem::getFileInfo($dir . '/' . $filename);
$templateManager = OC_Helper::getFileTemplateManager();
if ($content = $templateManager->getTemplate($meta['mimetype'])) {
\OC\Files\Filesystem::file_put_contents($dir . '/' . $filename, $content);
}
$id = $meta['fileid']; $id = $meta['fileid'];
OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id, 'mime' => $meta['mimetype']))); OCP\JSON::success(array("data" => array('content' => $content, 'id' => $id, 'mime' => $meta['mimetype'])));
exit(); exit();
} }
} }
OCP\JSON::error(array("data" => array( "message" => "Error when creating the file" ))); OCP\JSON::error(array("data" => array("message" => "Error when creating the 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 '';
}
}
}

View File

@ -28,6 +28,7 @@ class OC_Helper {
private static $tmpFiles = array(); private static $tmpFiles = array();
private static $mimetypeIcons = array(); private static $mimetypeIcons = array();
private static $mimetypeDetector; private static $mimetypeDetector;
private static $templateManager;
/** /**
* @brief Creates an url using a defined route * @brief Creates an url using a defined route
@ -357,6 +358,9 @@ class OC_Helper {
} }
} }
/**
* @return \OC\Files\Type\Detection
*/
static public function getMimetypeDetector() { static public function getMimetypeDetector() {
if (!self::$mimetypeDetector) { if (!self::$mimetypeDetector) {
self::$mimetypeDetector = new \OC\Files\Type\Detection(); self::$mimetypeDetector = new \OC\Files\Type\Detection();
@ -365,6 +369,16 @@ class OC_Helper {
return self::$mimetypeDetector; 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
* *