X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=app%2FGithub%2FAPI%2FCall.php;h=22a69516e3f7fb60d466e3eac46b1522e6e13122;hb=36cfa28cf2dcee3422f0231f91c6692eb28e7824;hp=3615851693f1870d2094ea70d8a3a018298326f6;hpb=25b99959b9e66d00681092977c23b5df32ead5f4;p=pharext%2Fpharext.org

diff --git a/app/Github/API/Call.php b/app/Github/API/Call.php
index 3615851..22a6951 100644
--- a/app/Github/API/Call.php
+++ b/app/Github/API/Call.php
@@ -3,6 +3,7 @@
 namespace app\Github\API;
 
 use app\Github\API;
+use app\Github\Storage\Item;
 use http\QueryString;
 use http\Url;
 use merry\Config;
@@ -34,6 +35,11 @@ abstract class Call
 	 */
 	protected $query;
 	
+	/**
+	 * @var array
+	 */
+	protected $result;
+	
 	/**
 	 * Queue this call to the API client
 	 */
@@ -57,17 +63,12 @@ abstract class Call
 	}
 	
 	function __invoke(callable $callback) {
-		if (empty($this->args["fresh"]) && ($cache = $this->api->getCacheStorage())) {
-			$key = $this->getCacheKey();
-			
-			if ($cache->get($key, $cached)) {
-				call_user_func_array($callback, $cached);
-				return $this->api->getClient();
-			}
+		if ($this->readFromCache($this->result)) {
+			call_user_func_array($callback, $this->result);
+		} else {
+			$this->enqueue($callback);
 		}
-		
-		$this->enqueue($callback);
-		return $this->api->getClient();
+		return $this;
 	}
 	
 	/**
@@ -79,6 +80,14 @@ abstract class Call
 		return strtolower(end($parts));
 	}
 	
+	/**
+	 * Call Client::send()
+	 */
+	function send() {
+		$this->api->getClient()->send();
+		return $this->result;
+	}
+	
 	/**
 	 * Get associated cache storage
 	 * @param int $ttl out param of configure ttl
@@ -92,16 +101,35 @@ abstract class Call
 	}
 	
 	function getCacheKey() {
-		return sprintf("github:%s:%s:%s", $this->api->getToken(), $this, 
-			new QueryString($this->args));
+		$args = $this->args;
+		unset($args["fresh"]);
+		if (isset($args["page"]) && !strcmp($args["page"], "1")) {
+			unset($args["page"]);
+		}
+		ksort($args);
+		return sprintf("%s:%s:%s", $this->api->getToken(), $this, 
+			new QueryString($args));
 	}
 
-	function readFromCache(array &$cached = null, &$ttl = null) {
-		if (empty($this->args["fresh"]) && ($cache = $this->api->getCacheStorage())) {
-			$key = $this->getCacheKey();
-			return $cache->get($key, $cached, $ttl);
+	function readFromCache(array &$value = null) {
+		if (!empty($this->args["fresh"])) {
+			return false;
+		}
+		if (!($cache = $this->api->getCacheStorage())) {
+			return false;
+		}
+		if (!strlen($key = $this->getCacheKey())) {
+			return false;
+		}
+		if (!$cache->get($key, $cached)) {
+			return false;
+		}
+		if (null !== $this->api->getMaxAge() && $cached->getAge() > $this->api->getMaxAge()) {
+			return false;
 		}
-		return false;
+		$this->api->getLogger()->debug("Cache-Hit: $this", $this->args);
+		$value = $cached->getValue();
+		return true;
 	}
 	
 	function saveToCache(array $fresh) {
@@ -109,11 +137,18 @@ abstract class Call
 			if (isset($this->config->storage->cache->{$this}->ttl)) {
 				$ttl = $this->config->storage->cache->{$this}->ttl;
 			} else {
-				$ttl = 0;
+				$ttl = null;
 			}
 			
 			$key = $this->getCacheKey();
-			$cache->set($key, $fresh, $ttl);
+			$cache->set($key, new Item($fresh, $ttl));
+		}
+	}
+	
+	function dropFromCache() {
+		if (($cache = $this->api->getCacheStorage())) {
+			$key = $this->getCacheKey();
+			$cache->del($key);
 		}
 	}
 }