Merge pull request #25578 from nextcloud/enh/simplify_weatherservice
Always use the cache
This commit is contained in:
commit
797527e5ea
|
@ -72,9 +72,6 @@ class WeatherStatusService {
|
||||||
/** @var IAppManager */
|
/** @var IAppManager */
|
||||||
private $appManager;
|
private $appManager;
|
||||||
|
|
||||||
/** @var ICacheFactory */
|
|
||||||
private $cacheFactory;
|
|
||||||
|
|
||||||
/** @var ICache */
|
/** @var ICache */
|
||||||
private $cache;
|
private $cache;
|
||||||
|
|
||||||
|
@ -116,9 +113,7 @@ class WeatherStatusService {
|
||||||
$this->version = $appManager->getAppVersion(Application::APP_ID);
|
$this->version = $appManager->getAppVersion(Application::APP_ID);
|
||||||
$this->clientService = $clientService;
|
$this->clientService = $clientService;
|
||||||
$this->client = $clientService->newClient();
|
$this->client = $clientService->newClient();
|
||||||
if ($cacheFactory->isAvailable()) {
|
$this->cache = $cacheFactory->createDistributed('weatherstatus');
|
||||||
$this->cache = $cacheFactory->createDistributed();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -397,12 +392,12 @@ class WeatherStatusService {
|
||||||
* @return array which contains the error message or the parsed JSON result
|
* @return array which contains the error message or the parsed JSON result
|
||||||
*/
|
*/
|
||||||
private function requestJSON(string $url, array $params = []): array {
|
private function requestJSON(string $url, array $params = []): array {
|
||||||
if (isset($this->cache)) {
|
|
||||||
$cacheKey = $url . '|' . implode(',', $params) . '|' . implode(',', array_keys($params));
|
$cacheKey = $url . '|' . implode(',', $params) . '|' . implode(',', array_keys($params));
|
||||||
if ($this->cache->hasKey($cacheKey)) {
|
$cacheValue = $this->cache->get($cacheKey);
|
||||||
return $this->cache->get($cacheKey);
|
if ($cacheValue !== null) {
|
||||||
}
|
return $cacheValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$options = [
|
$options = [
|
||||||
'headers' => [
|
'headers' => [
|
||||||
|
@ -425,7 +420,7 @@ class WeatherStatusService {
|
||||||
return ['error' => $this->l10n->t('Error')];
|
return ['error' => $this->l10n->t('Error')];
|
||||||
} else {
|
} else {
|
||||||
$json = json_decode($body, true);
|
$json = json_decode($body, true);
|
||||||
if (isset($this->cache)) {
|
|
||||||
// default cache duration is one hour
|
// default cache duration is one hour
|
||||||
$cacheDuration = 60 * 60;
|
$cacheDuration = 60 * 60;
|
||||||
if (isset($headers['Expires']) && count($headers['Expires']) > 0) {
|
if (isset($headers['Expires']) && count($headers['Expires']) > 0) {
|
||||||
|
@ -438,7 +433,7 @@ class WeatherStatusService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->cache->set($cacheKey, $json, $cacheDuration);
|
$this->cache->set($cacheKey, $json, $cacheDuration);
|
||||||
}
|
|
||||||
return $json;
|
return $json;
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
|
|
Loading…
Reference in New Issue