yet another github api refactoring

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

diff --git a/app/Controller/Github/Repo.php b/app/Controller/Github/Repo.php
index ac2ce37d5916cebdb2a3fc68e8cb39f4c2fa1202..813b942bf0c2ec7f72345f29049b2ef9977070d5 100644 (file)
--- a/app/Controller/Github/Repo.php
+++ b/app/Controller/Github/Repo.php
@@ -3,79 +3,24 @@
 namespace app\Controller\Github;
 
 use app\Controller\Github;
+use app\Github\API\Repos\RepoCallback;
 
 class Repo extends Github
 {
        function __invoke(array $args = null) {
                extract($args);
-               $this->app->getView()->addData(compact("owner", "name"));
                if ($this->checkToken()) {
-                       $this->github->readRepo(
-                               "$owner/$name",
-                               [$this, "repoCallback"]
-                       )->send();
+                       list($repo) = $this->github->readRepo("$owner/$name", new RepoCallback($this->github))->send();
+                       $hook = $this->github->checkRepoHook($repo);
+                       
+                       $this->app->getView()->addData(compact("owner", "name", "repo", "hook"));
                        
                        if (($modal = $this->app->getRequest()->getQuery("modal"))) {
-                               $this->app->getView()->addData(compact("modal") + [
-                                       "action" => $this->app->getRequest()->getQuery($modal)
-                               ]);
+                               $action = $this->app->getRequest()->getQuery($modal);
+                               $this->app->getView()->addData(compact("modal", "action")); 
                        }
                        
                        $this->app->display("github/repo");
                }
        }
-
-       function repoCallback($repo) {
-               $this->app->getView()->addData(compact("repo") + [
-                       "title" => "Github: {$repo->name}"
-               ]);
-               settype($repo->tags, "object");
-               $this->github->listHooks($repo->full_name, function($hooks) use($repo) {
-                       $repo->hooks = $hooks;
-                       $this->app->getView()->addData(["hook" => $this->checkRepoHook($repo)]);
-               });
-               $this->github->listTags($repo->full_name, 1, $this->createTagsCallback($repo));
-               $this->github->listReleases($repo->full_name, 1, $this->createReleasesCallback($repo));
-               $this->github->readContents($repo->full_name, null, $this->createContentsCallback($repo));
-       }
-
-       function createReleasesCallback($repo) {
-               return function($releases, $links) use($repo) {
-                       foreach ($releases as $release) {
-                               $tag = $release->tag_name;
-                               settype($repo->tags->$tag, "object");
-                               $repo->tags->$tag->release = $release;
-                               $this->github->listReleaseAssets($repo->full_name, $release->id, function($assets) use($release) {
-                                       $release->assets = $assets;
-                               });
-                       }
-               };
-       }
-
-       function createTagsCallback($repo) {
-               return function($tags, $links) use ($repo) {
-                       foreach ($tags as $tag) {
-                               $name = $tag->name;
-                               settype($repo->tags->$name, "object");
-                               $repo->tags->$name->tag = $tag;
-                       }
-               };
-       }
-       
-       function createContentsCallback($repo) {
-               return function($tree) use($repo) {
-                       foreach ($tree as $entry) {
-                               if ($entry->type !== "file" || $entry->size <= 0) {
-                                       continue;
-                               }
-                               if ($entry->name === "config.m4" || fnmatch("config?.m4", $entry->name)) {
-                                       $repo->config_m4 = $entry->name;
-                               } elseif ($entry->name === "package.xml" || $entry->name === "package2.xml") {
-                                       $repo->package_xml = $entry->name;
-                               } elseif ($entry->name === "pharext_package.php") {
-                                       $repo->pharext_package_php = $entry->name;
-                               }
-                       }
-               };
-       }
 }