1
0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-30 12:52:24 -05:00

[add] display last check of wallabag release

This commit is contained in:
Nicolas Lœuillet 2014-03-01 19:10:17 +01:00
parent 223268c2fa
commit 11c680f97a
2 changed files with 14 additions and 5 deletions

View File

@ -582,8 +582,12 @@ class Poche
switch ($view) switch ($view)
{ {
case 'config': case 'config':
$dev = trim($this->getPocheVersion('dev')); $dev_infos = $this->getPocheVersion('dev');
$prod = trim($this->getPocheVersion('prod')); $dev = trim($dev_infos[0]);
$check_time_dev = date('d-M-Y H:i', $dev_infos[1]);
$prod_infos = $this->getPocheVersion('prod');
$prod = trim($prod_infos[0]);
$check_time_prod = date('d-M-Y H:i', $prod_infos[1]);
$compare_dev = version_compare(POCHE, $dev); $compare_dev = version_compare(POCHE, $dev);
$compare_prod = version_compare(POCHE, $prod); $compare_prod = version_compare(POCHE, $prod);
$themes = $this->getInstalledThemes(); $themes = $this->getInstalledThemes();
@ -595,6 +599,8 @@ class Poche
'languages' => $languages, 'languages' => $languages,
'dev' => $dev, 'dev' => $dev,
'prod' => $prod, 'prod' => $prod,
'check_time_dev' => $check_time_dev,
'check_time_prod' => $check_time_prod,
'compare_dev' => $compare_dev, 'compare_dev' => $compare_dev,
'compare_prod' => $compare_prod, 'compare_prod' => $compare_prod,
'token' => $token, 'token' => $token,
@ -1105,15 +1111,17 @@ class Poche
private function getPocheVersion($which = 'prod') private function getPocheVersion($which = 'prod')
{ {
$cache_file = CACHE . '/' . $which; $cache_file = CACHE . '/' . $which;
$check_time = time();
# checks if the cached version file exists # checks if the cached version file exists
if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) { if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
$version = file_get_contents($cache_file); $version = file_get_contents($cache_file);
$check_time = filemtime($cache_file);
} else { } else {
$version = file_get_contents('http://static.wallabag.org/versions/' . $which); $version = file_get_contents('http://static.wallabag.org/versions/' . $which);
file_put_contents($cache_file, $version, LOCK_EX); file_put_contents($cache_file, $version, LOCK_EX);
} }
return $version; return array($version, $check_time);
} }
public function generateToken() public function generateToken()

View File

@ -25,9 +25,10 @@
<h2>{% trans "Upgrading wallabag" %}</h2> <h2>{% trans "Upgrading wallabag" %}</h2>
<ul> <ul>
<li>{% trans "Installed version" %} : <strong>{{ constant('POCHE') }}</strong></li> <li>{% trans "Installed version" %} : <strong>{{ constant('POCHE') }}</strong></li>
<li>{% trans "Latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %}</li> <li>{% trans "Latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
{% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %}</li>{% endif %} {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
</ul> </ul>
<p>{% trans "You can clear cache to check the latest release." %}</p>
<h2>{% trans "Feeds" %}</h2> <h2>{% trans "Feeds" %}</h2>
{% if token == '' %} {% if token == '' %}