Appdata integration 1 & log fix 2

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2016-11-09 11:18:43 +01:00 committed by Roeland Jago Douma
parent cf73e71ff1
commit 3a7d6846fa
No known key found for this signature in database
GPG Key ID: F941078878347C0C
4 changed files with 49 additions and 21 deletions

View File

@ -26,14 +26,22 @@
namespace OC\Template;
class CSSResourceLocator extends ResourceLocator {
protected $appData;
public function __construct(\OCP\ILogger $logger, $theme, $core_map, $party_map, $appData) {
$this->appData = $appData;
parent::__construct($logger, $theme, $core_map, $party_map);
}
/**
* @param string $style
*/
public function doFind($style) {
if (strpos($style, '3rdparty') === 0
&& $this->appendIfExist($this->thirdpartyroot, $style.'.css')
|| $this->cacheAndAppendScssIfExist($this->serverroot, $style.'.scss')
|| $this->cacheAndAppendScssIfExist($this->serverroot, 'core/'.$style.'.scss')
|| $this->cacheAndAppendScssIfExist($this->serverroot, $style.'.scss', $this->appData)
|| $this->cacheAndAppendScssIfExist($this->serverroot, 'core/'.$style.'.scss', $this->appData)
|| $this->appendIfExist($this->serverroot, $style.'.css')
|| $this->appendIfExist($this->serverroot, 'core/'.$style.'.css')
) {

View File

@ -114,16 +114,16 @@ abstract class ResourceLocator {
* @param string|null $webRoot base for path, default map $root to $webRoot
* @return bool True if the resource was found and cached, false otherwise
*/
protected function cacheAndAppendScssIfExist($root, $file, $webRoot = null) {
protected function cacheAndAppendScssIfExist($root, $file, $appData, $webRoot = null) {
if (is_file($root.'/'.$file)) {
$scssCache = new \OC\Template\SCSSCacher(
$this->logger,
$root,
$file);
$file,
$appData);
if($scssCache->process()) {
$this->append($root, $scssCache->getCachedSCSS(), $webRoot, false);
$this->logger->debug($root.'/'.$file.' compiled and successfully cached', ['app' => 'SCSSPHP']);
return true;
} else {
$this->logger->error('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'SCSSPHP']);

View File

@ -23,46 +23,53 @@ namespace OC\Template;
use Leafo\ScssPhp\Compiler;
use Leafo\ScssPhp\Exception\ParserException;
use OCP\Files\NotFoundException;
class SCSSCacher {
protected $root;
protected $folder;
protected $file;
protected $fileName;
protected $fileLoc;
protected $fileCache;
protected $rootCssLoc;
/** Cache folder from serverroot */
private $scssCache = "assets";
/** @var \OCP\ILogger */
protected $logger;
protected $appData;
/**
* @param \OCP\ILogger $logger
* @param string $root
* @param string $file
*/
public function __construct(\OCP\ILogger $logger, $root, $file) {
public function __construct(\OCP\ILogger $logger, $root, $file, $appData) {
$this->logger = $logger;
$this->appData = $appData;
$this->root = $root;
$this->file = explode('/', $root.'/'.$file);
$this->fileName = array_pop($this->file);
$this->fileNameSCSS = array_pop($this->file);
$this->fileNameCSS = str_replace('.scss', '.css', $this->fileNameSCSS);
$this->fileLoc = implode('/', $this->file);
$this->fileCache = str_replace('.scss', '.css', $this->scssCache.'/'.$this->fileName);
// base uri to css file
$this->rootCssLoc = explode('/', $file);
array_pop($this->rootCssLoc);
$this->rootCssLoc = implode('/', $this->rootCssLoc);
try {
$this->folder = $this->appData->getFolder('css');
} catch(NotFoundException $e) {
// creating css appdata folder
$this->folder = $this->appData->newFolder('css');
}
}
public function process() {
if($this->is_cached($this->root.'/'.$this->fileCache, $this->fileLoc.'/'.$this->fileName)) {
if($this->is_cached()) {
return true;
} else {
return $this->cache();
@ -70,33 +77,45 @@ class SCSSCacher {
return false;
}
private function is_cached($in, $out) {
if (! is_file($out) || filemtime($in) > filemtime($out)) {
private function is_cached() {
try{
$cachedfile = $this->folder->getFile($this->fileNameCSS);
if( $cachedfile->getMTime() > filemtime($this->fileLoc.'/'.$this->fileNameSCSS)
&& $cachedfile->getSize() > 0 ) {
return true;
}
} catch(NotFoundException $e) {
return false;
}
return false;
}
private function cache() {
$scss = new Compiler();
$scss->setImportPaths($this->fileLoc);
if(\OC::$server->getSystemConfig()->getValue('debug')) {
// Debug mode
$scss->setFormatter('Leafo\ScssPhp\Formatter\Expanded');
$scss->setLineNumberStyle(Compiler::LINE_COMMENTS);
} else {
// Compression
$scss->setFormatter('Leafo\ScssPhp\Formatter\Crunched');
}
try {
$compiledScss = $scss->compile('@import "'.$this->fileName.'";');
$cachedfile = $this->folder->getFile($this->fileNameCSS);
} catch(NotFoundException $e) {
$cachedfile = $this->folder->newFile($this->fileNameCSS);
}
try {
$compiledScss = $scss->compile('@import "'.$this->fileNameSCSS.'";');
} catch(ParserException $e) {
$this->logger->error($e, ['app' => 'SCSSPHP']);
return false;
}
if(file_put_contents($this->fileCache, $this->rebaseUrls($compiledScss))) {
if($cachedfile->putContent($this->rebaseUrls($compiledScss))) {
$this->logger->debug($root.'/'.$file.' compiled and successfully cached', ['app' => 'SCSSPHP']);
return true;
}

View File

@ -188,7 +188,8 @@ class TemplateLayout extends \OC_Template {
\OC::$server->getLogger(),
$theme,
array( \OC::$SERVERROOT => \OC::$WEBROOT ),
array( \OC::$SERVERROOT => \OC::$WEBROOT ));
array( \OC::$SERVERROOT => \OC::$WEBROOT ),
\OC::$server->getAppDataDir('server'));
$locator->find($styles);
return $locator->getResources();
}