From a421c78a4df804af1dc5e8d2039016f7f68cd33e Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 5 May 2016 01:36:43 +0900 Subject: [PATCH] Reorganize temporary directory structure --- classes/display/HTMLDisplayHandler.php | 2 +- .../FrontEndFileHandler.class.php | 29 +++++++++++-------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index 8fd650c59..b106ef3cf 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -433,7 +433,7 @@ class HTMLDisplayHandler { Context::loadFile(array('./common/js/jquery-' . $jquery_version . '.min.js', 'head', '', -1730000), true); Context::loadFile(array('./common/js/plugins/jquery.migrate/jquery-migrate-1.2.1.min.js', 'head', '', -1720000), true); - $concat_target_filename = 'files/cache/minify/xe.min.js'; + $concat_target_filename = 'files/cache/assets/minified/rhymix.min.js'; if(file_exists(\RX_BASEDIR . $concat_target_filename)) { $concat_target_mtime = filemtime(\RX_BASEDIR . $concat_target_filename); diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php index bffeab024..5c96df733 100644 --- a/classes/frontendfile/FrontEndFileHandler.class.php +++ b/classes/frontendfile/FrontEndFileHandler.class.php @@ -12,6 +12,11 @@ class FrontEndFileHandler extends Handler */ public static $minify = null; public static $concat = null; + + /** + * Directory for minified, compiled, and concatenated CSS/JS assets. + */ + public static $assetdir = 'files/cache/assets'; /** * Map for css @@ -227,7 +232,7 @@ class FrontEndFileHandler extends Handler $minifiedFileName = $file->fileNameNoExt . '.min.' . $file->fileExtension; $minifiedFileHash = ltrim(str_replace(array('/', '\\'), '.', substr($file->fileRealPath, strlen(\RX_BASEDIR))), '.'); - $minifiedFilePath = \RX_BASEDIR . 'files/cache/minify/' . $minifiedFileHash . '.' . $minifiedFileName; + $minifiedFilePath = \RX_BASEDIR . self::$assetdir . '/minified/' . $minifiedFileHash . '.' . $minifiedFileName; if (!file_exists($minifiedFilePath) || filemtime($minifiedFilePath) < filemtime($file->fileFullPath)) { @@ -240,11 +245,11 @@ class FrontEndFileHandler extends Handler } $file->fileName = $minifiedFileHash . '.' . $minifiedFileName; - $file->filePath = \RX_BASEURL . 'files/cache/minify'; - $file->fileRealPath = \RX_BASEDIR . 'files/cache/minify'; + $file->filePath = \RX_BASEURL . self::$assetdir . '/minified'; + $file->fileRealPath = \RX_BASEDIR . self::$assetdir . '/minified'; $file->fileFullPath = $minifiedFilePath; $file->keyName = $minifiedFileHash . '.' . $file->fileNameNoExt . '.' . $file->fileExtension; - $file->cdnPath = './files/cache/minify'; + $file->cdnPath = './' . self::$assetdir . '/minified'; $file->isMinified = true; } @@ -264,7 +269,7 @@ class FrontEndFileHandler extends Handler $compiledFileName = $file->fileName . ($minify ? '.min' : '') . '.css'; $compiledFileHash = ltrim(str_replace(array('/', '\\'), '.', substr($file->fileRealPath, strlen(\RX_BASEDIR))), '.'); - $compiledFilePath = \RX_BASEDIR . 'files/cache/minify/' . $compiledFileHash . '.' . $compiledFileName; + $compiledFilePath = \RX_BASEDIR . self::$assetdir . '/compiled/' . $compiledFileHash . '.' . $compiledFileName; if (!file_exists($compiledFilePath) || filemtime($compiledFilePath) < filemtime($file->fileFullPath)) { @@ -277,11 +282,11 @@ class FrontEndFileHandler extends Handler } $file->fileName = $compiledFileHash . '.' . $compiledFileName; - $file->filePath = \RX_BASEURL . 'files/cache/minify'; - $file->fileRealPath = \RX_BASEDIR . 'files/cache/minify'; + $file->filePath = \RX_BASEURL . self::$assetdir . '/compiled'; + $file->fileRealPath = \RX_BASEDIR . self::$assetdir . '/compiled'; $file->fileFullPath = $compiledFilePath; $file->keyName = $compiledFileHash . '.' . $file->fileNameNoExt . '.' . $file->fileExtension; - $file->cdnPath = './files/cache/minify'; + $file->cdnPath = './' . self::$assetdir . '/compiled'; $file->isMinified = true; $file->fileExtension = 'css'; } @@ -399,7 +404,7 @@ class FrontEndFileHandler extends Handler $concat_files[] = $file->media === 'all' ? $file->fileFullPath : array($file->fileFullPath, $file->media); $concat_max_timestamp = max($concat_max_timestamp, filemtime($file->fileFullPath)); } - $concat_filename = 'files/cache/minify/concat.' . sha1(serialize($concat_files)) . '.css'; + $concat_filename = self::$assetdir . '/combined/' . sha1(serialize($concat_files)) . '.css'; if (!file_exists(\RX_BASEDIR . $concat_filename) || filemtime(\RX_BASEDIR . $concat_filename) < $concat_max_timestamp) { Rhymix\Framework\Storage::write(\RX_BASEDIR . $concat_filename, Rhymix\Framework\Formatter::concatCSS($concat_files, $concat_filename)); @@ -487,7 +492,7 @@ class FrontEndFileHandler extends Handler $concat_files[] = $file->targetIe ? array($file->fileFullPath, $file->targetIe) : $file->fileFullPath; $concat_max_timestamp = max($concat_max_timestamp, filemtime($file->fileFullPath)); } - $concat_filename = 'files/cache/minify/concat.' . sha1(serialize($concat_files)) . '.js'; + $concat_filename = self::$assetdir . '/combined/' . sha1(serialize($concat_files)) . '.js'; if (!file_exists(\RX_BASEDIR . $concat_filename) || filemtime(\RX_BASEDIR . $concat_filename) < $concat_max_timestamp) { Rhymix\Framework\Storage::write(\RX_BASEDIR . $concat_filename, Rhymix\Framework\Formatter::concatJS($concat_files, $concat_filename)); @@ -614,9 +619,9 @@ class FrontEndFileHandler extends Handler } $dirname = substr($dirname, strlen(\RX_BASEDIR)); - if (strncmp($dirname, 'files/cache/minify/', 19) === 0) + if (strncmp($dirname, self::$assetdir . '/', strlen(self::$assetdir) + 1) === 0) { - $dirname = substr($dirname, 19); + $dirname = substr($dirname, strlen(self::$assetdir) + 1); } $tmp = array_first(explode('/', strtr($dirname, '\\.', '//')));