fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-04 01:23:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

Update widget controller to use new cache system

Browse source
This commit is contained in:
Kijin Sung 2016-04-17 16:15:29 +09:00
parent 877cccbcb7
commit 884aba864e
1 changed files with 12 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

76
modules/widget/widget.controller.php
View file

@ -12,9 +12,6 @@ class widgetController extends widget
var $javascript_mode = false; var $javascript_mode = false;
var $layout_javascript_mode = false; var $layout_javascript_mode = false;
// Where the cache files are created widget
var $cache_path = './files/cache/widget_cache/';
/** /**
* @brief Initialization * @brief Initialization
*/ */
@ -343,11 +340,9 @@ class widgetController extends widget
{ {
foreach($args as $k => $v) $args->{$k} = urldecode($v); foreach($args as $k => $v) $args->{$k} = urldecode($v);
} }
// If the cache file for each language widget regeneration
foreach($lang_list as $lang_type => $val) foreach($lang_list as $lang_type => $val)
{ {
$cache_file = sprintf('%s%s.%s.cache', $this->cache_path, $sequence, $lang_type);
if(!file_exists($cache_file)) continue;
$this->getCache($widget, $args, $lang_type, true, $sequence); $this->getCache($widget, $args, $lang_type, true, $sequence);
} }
} }
@ -397,61 +392,20 @@ class widgetController extends widget
return $widget_content; return $widget_content;
} }
$oCacheHandler = CacheHandler::getInstance('object'); $cache_data = Rhymix\Framework\Cache::get('widget_cache:' . $widget_sequence);
if($oCacheHandler->isSupport()) if ($cache_data)
{ {
$key = 'widget_cache:' . $widget_sequence; return $cache_data;
$cache_body = $oCacheHandler->get($key, RX_TIME - $widget_cache);
$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
} }
if($cache_body) $oWidget = $this->getWidgetObject($widget);
{ if(!$oWidget || !method_exists($oWidget,'proc')) return;
return $cache_body;
}
else
{
/**
* Cache number and cache values are set so that the cache file should call
*/
FileHandler::makeDir($this->cache_path);
// Wanted cache file
$cache_file = sprintf('%s%s.%s.cache', $this->cache_path, $widget_sequence, $lang_type);
// If the file exists in the cache, the file validation
if(!$ignore_cache && file_exists($cache_file))
{
$filemtime = filemtime($cache_file);
// Should be modified compared to the time of the cache or in the future if creating more than widget.controller.php file a return value of the cache
if($filemtime + $widget_cache > $_SERVER['REQUEST_TIME'] && $filemtime > filemtime(_XE_PATH_.'modules/widget/widget.controller.php'))
{
$cache_body = FileHandler::readFile($cache_file);
$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
return $cache_body; $widget_content = $oWidget->proc($args);
} $oModuleController = getController('module');
} $oModuleController->replaceDefinedLangCode($widget_content);
// cache update and cache renewal of the file mtime
if(!$oCacheHandler->isSupport()) Rhymix\Framework\Cache::set('widget_cache:' . $widget_sequence, $widget_content, $widget_cache);
{
touch($cache_file);
}
$oWidget = $this->getWidgetObject($widget);
if(!$oWidget || !method_exists($oWidget,'proc')) return;
$widget_content = $oWidget->proc($args);
$oModuleController = getController('module');
$oModuleController->replaceDefinedLangCode($widget_content);
if($oCacheHandler->isSupport())
{
$oCacheHandler->put($key, $widget_content, $widget_cache);
}
else
{
FileHandler::writeFile($cache_file, $widget_content);
}
}
return $widget_content; return $widget_content;
} }
@ -810,13 +764,7 @@ class widgetController extends widget
if($vars->widget_sequence) if($vars->widget_sequence)
{ {
$oCacheHandler = CacheHandler::getInstance('object'); Rhymix\Framework\Cache::delete('widget_cache:' . $vars->widget_sequence);
if($oCacheHandler->isSupport())
{
$cache_body = $oCacheHandler->delete('widget_cache:' . $vars->widget_sequence);
}
$cache_file = sprintf('%s%s.%s.cache', $this->cache_path, $vars->widget_sequence, Context::getLangType());
FileHandler::removeFile($cache_file);
} }
if($vars->widget_cache>0) $vars->widget_sequence = getNextSequence(); if($vars->widget_cache>0) $vars->widget_sequence = getNextSequence();