X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=app%2FController%2FGithub%2FRepo.php;h=32fab565a7794a3ccd4000e910cfaf4b2b87556c;hb=6535fbd73f79a015eb12d7468b0b4f86fc5f0648;hp=02ab7a94bd1e4202bb6a82b745969a115a68c370;hpb=7f4e70ea88d180cfa25f25f3846f842c5958ebf4;p=pharext%2Fpharext.org

diff --git a/app/Controller/Github/Repo.php b/app/Controller/Github/Repo.php
index 02ab7a9..32fab56 100644
--- a/app/Controller/Github/Repo.php
+++ b/app/Controller/Github/Repo.php
@@ -8,28 +8,34 @@ class Repo extends Github
 {
 	function __invoke(array $args = null) {
 		extract($args);
+		$this->app->getView()->addData(compact("owner", "name"));
 		if ($this->checkToken()) {
-			try {
-				$this->github->fetchRepo(
-					"$owner/$name",
-					[$this, "repoCallback"]
-				)->send();
-			} catch (\app\Github\Exception $exception) {
-				$this->app->getView()->addData(compact("exception", "owner", "name"));
+			$this->github->readRepo(
+				"$owner/$name",
+				[$this, "repoCallback"]
+			)->send();
+			
+			if (($modal = $this->app->getRequest()->getQuery("modal"))) {
+				$this->app->getView()->addData(compact("modal") + [
+					"action" => $this->app->getRequest()->getQuery($modal)
+				]);
 			}
+			
 			$this->app->display("github/repo");
 		}
 	}
 
-	function repoCallback($repo, $links) {
-		$this->app->getView()->addData(compact("repo"));
+	function repoCallback($repo) {
+		$this->app->getView()->addData(compact("repo") + [
+			"title" => "Github: {$repo->name}"
+		]);
 		settype($repo->tags, "object");
-		$this->github->fetchHooks($repo->full_name, function($hooks) use($repo) {
+		$this->github->listHooks($repo->full_name, function($hooks) use($repo) {
 			$repo->hooks = $hooks;
 		});
-		$this->github->fetchTags($repo->full_name, 1, $this->createTagsCallback($repo));
-		$this->github->fetchReleases($repo->full_name, 1, $this->createReleasesCallback($repo));
-		$this->github->fetchContents($repo->full_name, null, $this->createContentsCallback($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) {
@@ -38,6 +44,9 @@ class Repo extends Github
 				$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;
+				});
 			}
 		};
 	}