add logging; fix caching

[pharext/pharext.org] / app / Controller / Github / RepoHook.php

diff --git a/app/Controller/Github/RepoHook.php b/app/Controller/Github/RepoHook.php
index 8ab1eed050a04575af2855b8e30e0bc078a9b5d7..023763a5ffef707622b04ad80debf643e7cb74ad 100644 (file)
--- a/app/Controller/Github/RepoHook.php
+++ b/app/Controller/Github/RepoHook.php
@@ -3,6 +3,7 @@
 namespace app\Controller\Github;
 
 use app\Controller\Github;
+use app\Github\API\Hooks\ListHooks;
 
 class RepoHook extends Github
 {
@@ -35,34 +36,51 @@ class RepoHook extends Github
        function addHook($owner, $repo) {
                $hook_conf = $this->app->getRequest()->getForm();
                $this->github->createRepoHook("$owner/$repo", $hook_conf, function($hook) use($owner, $repo) {
-                       if (($cache = $this->github->getCacheStorage())) {
-                               $cache->del($this->github->getCacheKey("hooks:$owner/$repo"));
-                       }
-                       if (($back = $this->app->getRequest()->getForm("returnback")) && isset($this->session->previous)) {
-                               $this->app->redirect($this->app->getBaseUrl()->mod($this->session->previous));
-                       } else {
-                               $this->app->redirect($this->app->getBaseUrl()->mod("./github/repo/$owner/$repo"));
-                       }
+                       $call = new ListHooks($this->github, ["repo" => "$owner/$repo", "fresh" => true]);
+                       $call(function($hooks, $links) use($owner, $repo, $call) {
+                               $call->saveToCache([$hooks, $links]);
+                               $this->redirectBack("$owner/$repo");
+                       });
                })->send();
        }
        
-       function delHook($owner, $repo) {
-               $this->github->fetchRepo("$owner/$repo", function($repo) {
-                       $this->github->fetchHooks($repo->full_name, function($hooks) use($repo) {
+       function updateHook($owner, $repo) {
+               $this->github->readRepo("$owner/$repo", function($repo) {
+                       $call = $this->github->listHooks($repo->full_name, function($hooks, $links) use($repo, &$call) {
                                $repo->hooks = $hooks;
                                if (($hook = $this->checkRepoHook($repo))) {
-                                       $this->github->deleteRepoHook($repo->full_name, $hook->id, function() use($repo) {
-                                               if (($cache = $this->github->getCacheStorage())) {
-                                                       $cache->del($this->github->getCacheKey("hooks:" . $repo->full_name));
-                                               }
-                                               if (($back = $this->app->getRequest()->getForm("returnback")) && isset($this->session->previous)) {
-                                                       $this->app->redirect($this->app->getBaseUrl()->mod($this->session->previous));
-                                               } else {
-                                                       $this->app->redirect($this->app->getBaseUrl()->mod("./github/repo/" . $repo->full_name));
+                                       $hook_conf = $this->app->getRequest()->getForm();
+                                       $this->github->updateRepoHook($repo->full_name, $hook->id, $hook_conf, function($changed_hook) use($repo, $hook, $hooks, $links, &$call) {
+                                               foreach ($changed_hook as $key => $val) {
+                                                       $hook->$key = $val;
                                                }
+                                               $call->saveToCache([$hooks, $links]);
+                                               $this->redirectBack($repo->full_name);
+                                       });
+                               }
+                       });
+               })->send();
+       }
+       
+       function delHook($owner, $repo) {
+               $this->github->readRepo("$owner/$repo", function($repo) {
+                       $call = $this->github->listHooks($repo->full_name, function($hooks) use($repo, &$call) {
+                               $repo->hooks = $hooks;
+                               if (($hook = $this->checkRepoHook($repo))) {
+                                       $this->github->deleteRepoHook($repo->full_name, $hook->id, function() use($repo, &$call) {
+                                               $call->dropFromCache();
+                                               $this->redirectBack($repo->full_name);
                                        });
                                }
                        });
                })->send();
        }
+       
+       function redirectBack($repo) {
+               if (($back = $this->app->getRequest()->getForm("returnback")) && isset($this->session->previous)) {
+                       $this->app->redirect($this->app->getBaseUrl()->mod($this->session->previous));
+               } else {
+                       $this->app->redirect($this->app->getBaseUrl()->mod("./github/repo/" . $repo));
+               }
+       }
 }