harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some bugs with empty repo name and improved the interface a bit.

Browse Source
This commit is contained in:
Andrew Manning 2016-05-09 21:59:27 -04:00
parent 180731c162
commit 9c8cf7d433
3 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Zotlabs/Module/Admin.php
View File

@ -1729,9 +1729,13 @@ class Admin extends \Zotlabs\Web\Controller {
json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false)); json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
} }
$git = new GitRepo('sys', null, false, $repoName, $repoDir); $git = new GitRepo('sys', null, false, $repoName, $repoDir);
if($git->pull()) { try {
json_return_and_die(array('message' => 'Repo updated.', 'success' => true)); if($git->pull()) {
} else { 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)); json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false));
} }
case 'removerepo': case 'removerepo':
@ -1769,7 +1773,7 @@ class Admin extends \Zotlabs\Web\Controller {
} }
} }
$repoName = null; $repoName = null;
if(array_key_exists('repoName',$_REQUEST)) { if(array_key_exists('repoName',$_REQUEST) && $_REQUEST['repoName'] !== '') {
$repoName = $_REQUEST['repoName']; $repoName = $_REQUEST['repoName'];
} else { } else {
$repoName = GitRepo::getRepoNameFromURL($repoURL); $repoName = GitRepo::getRepoNameFromURL($repoURL);
@ -1805,15 +1809,14 @@ class Admin extends \Zotlabs\Web\Controller {
} }
} }
$repoName = null; $repoName = null;
if(array_key_exists('repoName',$_REQUEST)) { if(array_key_exists('repoName',$_REQUEST) && $_REQUEST['repoName'] !== '') {
$repoName = $_REQUEST['repoName']; $repoName = $_REQUEST['repoName'];
logger('repoName: ' . $repoName);
} else { } else {
$repoName = GitRepo::getRepoNameFromURL($repoURL); $repoName = GitRepo::getRepoNameFromURL($repoURL);
} }
if(!$repoName) { if(!$repoName) {
logger('Invalid git repo'); 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; $repoDir = $tempAddonDir.'/'.$repoName;
// clone the repo if new automatically // clone the repo if new automatically

57
Zotlabs/Storage/GitRepo.php
View File

@ -7,7 +7,7 @@ use PHPGit\Git as PHPGit;
require __DIR__ . '/../../library/PHPGit.autoload.php'; // Load PHPGit dependencies 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 <andrewmanning@grid.reticu.li> * @author Andrew Manning <andrewmanning@grid.reticu.li>
*/ */
@ -16,48 +16,42 @@ class GitRepo {
public $url = null; public $url = null;
public $name = null; public $name = null;
private $path = null; private $path = null;
private $repoID = null;
private $channel = null; private $channel = null;
public $git = null; public $git = null;
private $repoBasePath = null; private $repoBasePath = null;
function __construct($channel = 'sys', $url = null, $clone = false, $name = null, $path = 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'); logger('Only admin can use channel sys');
return null; return null;
} }
$this->repoBasePath = __DIR__ . '/../../store/git'; $this->repoBasePath = __DIR__ . '/../../store/git';
$this->channel = $channel; $this->channel = $channel;
$this->git = new PHPGit(); $this->git = new PHPGit();
// Allow custom path for repo in the case of , for example // Allow custom path for repo in the case of , for example
if($path) { if ($path) {
//if(mkdir($path, 0770, true)) { $this->path = $path;
$this->path = $path;
//} else {
// logger('Error creating GitRepo. Path not created.');
// return null;
//}
} else { } else {
$this->path = $this->repoBasePath . "/" . $this->channel . "/" . $this->name; $this->path = $this->repoBasePath . "/" . $this->channel . "/" . $this->name;
} }
if ($this->isValidGitRepoURL($url)) { if ($this->isValidGitRepoURL($url)) {
$this->url = $url; $this->url = $url;
} }
if ($name) { if ($name) {
$this->name = $name; $this->name = $name;
} else { } else {
$this->name = $this->getRepoNameFromURL($url); $this->name = $this->getRepoNameFromURL($url);
} }
if (!$this->name) { if (!$this->name) {
logger('Error creating GitRepo. No repo name found.'); logger('Error creating GitRepo. No repo name found.');
return null; return null;
} }
if (is_dir($this->path)) { if (is_dir($this->path)) {
// ignore the $url input if it exists // 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 // 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 // TODO: get repo metadata
return; return;
} }
if ($this->url) { if ($this->url) {
//$this->repoID = random_string();
// create the folder and clone the repo at url to that folder if $clone is true // create the folder and clone the repo at url to that folder if $clone is true
if ($clone) { if ($clone) {
if (mkdir($this->path, 0770, true)) { if (mkdir($this->path, 0770, true)) {
@ -80,16 +73,16 @@ class GitRepo {
logger('git repo path could not be created: ' . json_encode($this->git)); logger('git repo path could not be created: ' . json_encode($this->git));
} }
} }
} }
} }
public function pull() { public function pull() {
return $this->git->pull(); try {
} $success = $this->git->pull();
/** } catch (\PHPGit\Exception\GitException $ex) {
* delete repository from disk return false;
*/ }
public function delete() { return $success;
return $this->delTree($this->getRepoPath());
} }
public function getRepoPath() { public function getRepoPath() {
@ -105,10 +98,6 @@ class GitRepo {
return false; return false;
} }
public function getRepoID() {
return $this->repoID;
}
public function setIdentity($user_name, $user_email) { public function setIdentity($user_name, $user_email) {
// setup user for commit messages // setup user for commit messages
$this->git->config->set("user.name", $user_name, ['global' => false, 'system' => false]); $this->git->config->set("user.name", $user_name, ['global' => false, 'system' => false]);
@ -123,11 +112,10 @@ class GitRepo {
public function probeRepo() { public function probeRepo() {
$git = $this->git; $git = $this->git;
logger('probeRepo path: ' . $this->path);
$repo = array(); $repo = array();
$repo['remote'] = $git->remote(); $repo['remote'] = $git->remote();
$repo['branches'] = $git->branch(['all' => true]); $repo['branches'] = $git->branch(['all' => true]);
$repo['logs'] = $git->log(array('limit' => 50)); $repo['logs'] = $git->log(array('limit' => 50));
return $repo; return $repo;
} }
@ -138,7 +126,7 @@ class GitRepo {
return false; return false;
} }
} }
public static function getRepoNameFromURL($url) { public static function getRepoNameFromURL($url) {
$urlpath = parse_url($url, PHP_URL_PATH); $urlpath = parse_url($url, PHP_URL_PATH);
$lastslash = strrpos($urlpath, '/') + 1; $lastslash = strrpos($urlpath, '/') + 1;
@ -149,4 +137,5 @@ class GitRepo {
return null; return null;
} }
} }
} }

31
view/tpl/admin_plugins.tpl
View File

@ -17,15 +17,14 @@
<div class="section-content-info-wrapper"> <div class="section-content-info-wrapper">
<h3>Installed Addon Repositories</h3> <h3>Installed Addon Repositories</h3>
{{foreach $addonrepos as $repo}} {{foreach $addonrepos as $repo}}
<div class="section-content-tools-wrapper"> <!-- <div class="section-content-tools-wrapper"> -->
<div> <div style="margin-left: 30%; margin-right: 30%;">
<div class="pull-left">{{$repo.name}}</div> <span class="pull-left">{{$repo.name}}</span>
<!--<button class="btn btn-xs btn-primary pull-right" onclick="switchAddonRepoBranch('{{$repo.name}}'); return false;">{{$repoBranchButton}}</button>--> <!--<button class="btn btn-xs btn-primary pull-right" onclick="switchAddonRepoBranch('{{$repo.name}}'); return false;">{{$repoBranchButton}}</button>-->
<button class="btn btn-xs btn-danger pull-right" onclick="removeAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-trash-o'></i>&nbsp;{{$repoRemoveButton}}</button> <button class="btn btn-xs btn-danger pull-right" style="margin-left: 10px; margin-right: 0px;" onclick="removeAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-trash-o'></i>&nbsp;{{$repoRemoveButton}}</button>
&nbsp; <button class="btn btn-xs btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i>&nbsp;{{$repoUpdateButton}}</button>
<button class="btn btn-xs btn-success pull-right" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i>&nbsp;{{$repoUpdateButton}}</button>
</div> </div>
</div> <!-- </div>-->
<div class="clear"></div> <div class="clear"></div>
{{/foreach}} {{/foreach}}
</div> </div>
@ -97,12 +96,15 @@
$("#generic-modal-ok-{{$newRepoModalID}}").off('click'); $("#generic-modal-ok-{{$newRepoModalID}}").off('click');
$("#generic-modal-ok-{{$newRepoModalID}}").click(function () { $("#generic-modal-ok-{{$newRepoModalID}}").click(function () {
$('#generic-modal-{{$newRepoModalID}}').modal('hide'); $('#generic-modal-{{$newRepoModalID}}').modal('hide');
location.reload(); if(confirm('Repo installed. Click OK to refresh page.')) {
location.reload();
}
}); });
$('#generic-modal-{{$newRepoModalID}}').modal(); $('#generic-modal-{{$newRepoModalID}}').modal();
} else { } else {
window.console.log('Error installing repo :' + response['message']); window.console.log('Error installing repo :' + response['message']);
alert('Error installing addon repo!');
} }
return false; return false;
}, },
@ -117,9 +119,10 @@
function(response) { function(response) {
if (response.success) { if (response.success) {
window.console.log('Addon repo'+repoName+'successfully updated :' + response['message']); window.console.log('Addon repo'+repoName+'successfully updated :' + response['message']);
alert('Repo updated'); alert('Addon repo updated.');
} else { } else {
window.console.log('Error installing repo :' + response['message']); window.console.log('Error updating repo :' + response['message']);
alert('Error updating addon repo!');
} }
return false; return false;
}, },
@ -130,6 +133,7 @@
window.console.log('switchAddonRepoBranch: ' + repoName); window.console.log('switchAddonRepoBranch: ' + repoName);
// TODO: Discover the available branches and create an interface to switch between them // TODO: Discover the available branches and create an interface to switch between them
} }
function removeAddonRepo(repoName) { function removeAddonRepo(repoName) {
window.console.log('removeAddonRepo: ' + repoName); window.console.log('removeAddonRepo: ' + repoName);
// TODO: Unlink the addons // TODO: Unlink the addons
@ -139,9 +143,12 @@
function(response) { function(response) {
if (response.success) { if (response.success) {
window.console.log('Addon repo'+repoName+'successfully removed :' + response['message']); 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 { } else {
window.console.log('Error installing repo :' + response['message']); window.console.log('Error removing repo :' + response['message']);
alert('Error removing addon repo!');
} }
return false; return false;
}, },