From 9c8cf7d43372aeea4d8a450e7cb17d7a24b64d5f Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Mon, 9 May 2016 21:59:27 -0400 Subject: Fixed some bugs with empty repo name and improved the interface a bit. --- Zotlabs/Module/Admin.php | 17 ++++++++------ Zotlabs/Storage/GitRepo.php | 57 ++++++++++++++++++--------------------------- view/tpl/admin_plugins.tpl | 31 ++++++++++++++---------- 3 files changed, 52 insertions(+), 53 deletions(-) diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 19b8a2e77..63f3e77f0 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -1729,9 +1729,13 @@ class Admin extends \Zotlabs\Web\Controller { json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false)); } $git = new GitRepo('sys', null, false, $repoName, $repoDir); - if($git->pull()) { - json_return_and_die(array('message' => 'Repo updated.', 'success' => true)); - } else { + try { + if($git->pull()) { + json_return_and_die(array('message' => 'Repo updated.', 'success' => true)); + } else { + json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false)); + } + } catch(\PHPGit\Exception\GitException $e) { json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false)); } case 'removerepo': @@ -1769,7 +1773,7 @@ class Admin extends \Zotlabs\Web\Controller { } } $repoName = null; - if(array_key_exists('repoName',$_REQUEST)) { + if(array_key_exists('repoName',$_REQUEST) && $_REQUEST['repoName'] !== '') { $repoName = $_REQUEST['repoName']; } else { $repoName = GitRepo::getRepoNameFromURL($repoURL); @@ -1805,15 +1809,14 @@ class Admin extends \Zotlabs\Web\Controller { } } $repoName = null; - if(array_key_exists('repoName',$_REQUEST)) { + if(array_key_exists('repoName',$_REQUEST) && $_REQUEST['repoName'] !== '') { $repoName = $_REQUEST['repoName']; - logger('repoName: ' . $repoName); } else { $repoName = GitRepo::getRepoNameFromURL($repoURL); } if(!$repoName) { logger('Invalid git repo'); - json_return_and_die(array('message' => 'Invalid git repo', 'success' => false)); + json_return_and_die(array('message' => 'Invalid git repo: ' . $repoName, 'success' => false)); } $repoDir = $tempAddonDir.'/'.$repoName; // clone the repo if new automatically diff --git a/Zotlabs/Storage/GitRepo.php b/Zotlabs/Storage/GitRepo.php index ac53aefc4..2a24e03c0 100644 --- a/Zotlabs/Storage/GitRepo.php +++ b/Zotlabs/Storage/GitRepo.php @@ -7,7 +7,7 @@ use PHPGit\Git as PHPGit; require __DIR__ . '/../../library/PHPGit.autoload.php'; // Load PHPGit dependencies /** - * Description of Git + * Wrapper class for PHPGit class for git repositories managed by Hubzilla * * @author Andrew Manning */ @@ -16,48 +16,42 @@ class GitRepo { public $url = null; public $name = null; private $path = null; - private $repoID = null; private $channel = null; public $git = null; private $repoBasePath = null; function __construct($channel = 'sys', $url = null, $clone = false, $name = null, $path = null) { - - if($channel === 'sys' && ! is_site_admin()) { + + if ($channel === 'sys' && !is_site_admin()) { logger('Only admin can use channel sys'); return null; } - + $this->repoBasePath = __DIR__ . '/../../store/git'; $this->channel = $channel; $this->git = new PHPGit(); - + // Allow custom path for repo in the case of , for example - if($path) { - //if(mkdir($path, 0770, true)) { - $this->path = $path; - //} else { - // logger('Error creating GitRepo. Path not created.'); - // return null; - //} + if ($path) { + $this->path = $path; } else { $this->path = $this->repoBasePath . "/" . $this->channel . "/" . $this->name; } - + if ($this->isValidGitRepoURL($url)) { $this->url = $url; } - + if ($name) { $this->name = $name; } else { $this->name = $this->getRepoNameFromURL($url); - } + } if (!$this->name) { logger('Error creating GitRepo. No repo name found.'); return null; } - + if (is_dir($this->path)) { // ignore the $url input if it exists // TODO: Check if the path is either empty or is a valid git repo and error if not @@ -65,9 +59,8 @@ class GitRepo { // TODO: get repo metadata return; } - + if ($this->url) { - //$this->repoID = random_string(); // create the folder and clone the repo at url to that folder if $clone is true if ($clone) { if (mkdir($this->path, 0770, true)) { @@ -80,16 +73,16 @@ class GitRepo { logger('git repo path could not be created: ' . json_encode($this->git)); } } - } + } } + public function pull() { - return $this->git->pull(); - } - /** - * delete repository from disk - */ - public function delete() { - return $this->delTree($this->getRepoPath()); + try { + $success = $this->git->pull(); + } catch (\PHPGit\Exception\GitException $ex) { + return false; + } + return $success; } public function getRepoPath() { @@ -105,10 +98,6 @@ class GitRepo { return false; } - public function getRepoID() { - return $this->repoID; - } - public function setIdentity($user_name, $user_email) { // setup user for commit messages $this->git->config->set("user.name", $user_name, ['global' => false, 'system' => false]); @@ -123,11 +112,10 @@ class GitRepo { public function probeRepo() { $git = $this->git; - logger('probeRepo path: ' . $this->path); $repo = array(); $repo['remote'] = $git->remote(); $repo['branches'] = $git->branch(['all' => true]); - $repo['logs'] = $git->log(array('limit' => 50)); + $repo['logs'] = $git->log(array('limit' => 50)); return $repo; } @@ -138,7 +126,7 @@ class GitRepo { return false; } } - + public static function getRepoNameFromURL($url) { $urlpath = parse_url($url, PHP_URL_PATH); $lastslash = strrpos($urlpath, '/') + 1; @@ -149,4 +137,5 @@ class GitRepo { return null; } } + } diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 876681f9f..3265a534c 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -17,15 +17,14 @@

Installed Addon Repositories

{{foreach $addonrepos as $repo}} -
-
-
{{$repo.name}}
+ +
+ {{$repo.name}} - -   - + +
-
+
{{/foreach}}
@@ -97,12 +96,15 @@ $("#generic-modal-ok-{{$newRepoModalID}}").off('click'); $("#generic-modal-ok-{{$newRepoModalID}}").click(function () { $('#generic-modal-{{$newRepoModalID}}').modal('hide'); - location.reload(); + if(confirm('Repo installed. Click OK to refresh page.')) { + location.reload(); + } }); $('#generic-modal-{{$newRepoModalID}}').modal(); } else { window.console.log('Error installing repo :' + response['message']); + alert('Error installing addon repo!'); } return false; }, @@ -117,9 +119,10 @@ function(response) { if (response.success) { window.console.log('Addon repo'+repoName+'successfully updated :' + response['message']); - alert('Repo updated'); + alert('Addon repo updated.'); } else { - window.console.log('Error installing repo :' + response['message']); + window.console.log('Error updating repo :' + response['message']); + alert('Error updating addon repo!'); } return false; }, @@ -130,6 +133,7 @@ window.console.log('switchAddonRepoBranch: ' + repoName); // TODO: Discover the available branches and create an interface to switch between them } + function removeAddonRepo(repoName) { window.console.log('removeAddonRepo: ' + repoName); // TODO: Unlink the addons @@ -139,9 +143,12 @@ function(response) { if (response.success) { window.console.log('Addon repo'+repoName+'successfully removed :' + response['message']); - alert('Repo deleted'); + if(confirm('Repo deleted. Click OK to refresh page.')) { + location.reload(); + } } else { - window.console.log('Error installing repo :' + response['message']); + window.console.log('Error removing repo :' + response['message']); + alert('Error removing addon repo!'); } return false; }, -- cgit v1.2.3