Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Modify git clone for Gitea and Gogs.

Browse Source
This commit is contained in:
caoyanyi
2022-08-02 13:28:29 +08:00
parent 73cf4d6f1a
commit bded54ba44
24 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/scm/gitea.class.php
+4 -1
View File
@@ -28,8 +28,11 @@ class Gitea
$project = $app->control->loadModel('gitea')->apiGetSingleProject($repo->serviceHost, $repo->serviceProject);
if(isset($project->tokenCloneUrl))
{
$cmd = 'git clone --progress -v "' . $project->tokenCloneUrl . '" "' . $this->root . '"';
$cmd = 'git clone --progress -v "' . $project->tokenCloneUrl . '" "' . $this->root . '" > "' . $app->getTmpRoot() . "log/clone.progress." . strtolower($repo->SCM) . ".{$repo->name}.log\" 2>&1 &";
if(PHP_OS == 'WINNT') $cmd = "start /b $cmd";
exec($cmd);
return $app->control->locate($app->control->createLink('repo', 'showSyncCommit', "repoID={$repo->id}"));
}
}
lib/scm/gogs.class.php
+4 -1
View File
@@ -28,8 +28,11 @@ class Gogs
$project = $app->control->loadModel('gogs')->apiGetSingleProject($repo->serviceHost, $repo->serviceProject);
if(isset($project->tokenCloneUrl))
{
$cmd = 'git clone --progress -v "' . $project->tokenCloneUrl . '" "' . $this->root . '"';
$cmd = 'git clone --progress -v "' . $project->tokenCloneUrl . '" "' . $this->root . '" > "' . $app->getTmpRoot() . "log/clone.progress." . strtolower($repo->SCM) . ".{$repo->name}.log\" 2>&1 &";
if(PHP_OS == 'WINNT') $cmd = "start /b $cmd";
exec($cmd);
return $app->control->locate($app->control->createLink('repo', 'showSyncCommit', "repoID={$repo->id}"));
}
}
module/common/lang/common.php
+1
View File
@@ -44,6 +44,7 @@ $lang->repo = new stdclass();
$lang->jenkins = new stdclass();
$lang->gitlab = new stdclass();
$lang->gitea = new stdclass();
$lang->gogs = new stdclass();
$lang->mr = new stdclass();
$lang->compile = new stdclass();
$lang->job = new stdclass();
module/gitea/lang/de.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gitea = new stdclass;
$lang->gitea->common = 'Gitea';
$lang->gitea->browse = 'Gitea Browse';
$lang->gitea->search = 'Search';
module/gitea/lang/en.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gitea = new stdclass;
$lang->gitea->common = 'Gitea';
$lang->gitea->browse = 'Gitea Browse';
$lang->gitea->search = 'Search';
module/gitea/lang/fr.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gitea = new stdclass;
$lang->gitea->common = 'Gitea';
$lang->gitea->browse = 'Gitea Browse';
$lang->gitea->search = 'Search';
module/gitea/lang/vi.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gitea = new stdclass;
$lang->gitea->common = 'Gitea';
$lang->gitea->browse = 'Gitea Browse';
$lang->gitea->search = 'Search';
module/gitea/lang/zh-cn.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gitea = new stdclass;
$lang->gitea->common = 'Gitea';
$lang->gitea->browse = '浏览Gitea';
$lang->gitea->search = '搜索';
module/gitea/lang/zh-tw.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gitea = new stdclass;
$lang->gitea->common = 'Gitea';
$lang->gitea->browse = '浏览Gitea';
$lang->gitea->search = '搜索';
module/gitlab/lang/de.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gitlab = new stdclass;
$lang->gitlab->common = 'GitLab';
$lang->gitlab->browse = 'GitLab Browse';
$lang->gitlab->search = 'Search';
module/gitlab/lang/en.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gitlab = new stdclass;
$lang->gitlab->common = 'GitLab';
$lang->gitlab->browse = 'GitLab Browse';
$lang->gitlab->search = 'Search';
module/gitlab/lang/fr.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gitlab = new stdclass;
$lang->gitlab->common = 'GitLab';
$lang->gitlab->browse = 'GitLab Browse';
$lang->gitlab->search = 'Search';
module/gitlab/lang/vi.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gitlab = new stdclass;
$lang->gitlab->common = 'GitLab';
$lang->gitlab->browse = 'GitLab Browse';
$lang->gitlab->search = 'Search';
module/gitlab/lang/zh-cn.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gitlab = new stdclass;
$lang->gitlab->common = 'GitLab';
$lang->gitlab->browse = '浏览GitLab';
$lang->gitlab->search = '搜索';
module/gitlab/lang/zh-tw.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gitlab = new stdclass;
$lang->gitlab->common = 'GitLab';
$lang->gitlab->browse = '瀏覽GitLab';
$lang->gitlab->search = '搜索';
module/gogs/lang/de.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gogs = new stdclass;
$lang->gogs->common = 'Gogs';
$lang->gogs->browse = 'Gogs Browse';
$lang->gogs->search = 'Search';
module/gogs/lang/en.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gogs = new stdclass;
$lang->gogs->common = 'Gogs';
$lang->gogs->browse = 'Gogs Browse';
$lang->gogs->search = 'Search';
module/gogs/lang/fr.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gogs = new stdclass;
$lang->gogs->common = 'Gogs';
$lang->gogs->browse = 'Gogs Browse';
$lang->gogs->search = 'Search';
module/gogs/lang/vi.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gogs = new stdclass;
$lang->gogs->common = 'Gogs';
$lang->gogs->browse = 'Gogs Browse';
$lang->gogs->search = 'Search';
module/gogs/lang/zh-cn.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gogs = new stdclass;
$lang->gogs->common = 'Gogs';
$lang->gogs->browse = '浏览Gogs';
$lang->gogs->search = '搜索';
module/gogs/lang/zh-tw.php
-1
View File
@@ -1,5 +1,4 @@
<?php
$lang->gogs = new stdclass;
$lang->gogs->common = 'Gogs';
$lang->gogs->browse = '浏览Gogs';
$lang->gogs->search = '搜索';
module/repo/control.php
+25 -3
View File
@@ -300,7 +300,7 @@ class repo extends control
}
$this->app->loadClass('pager', $static = true);
$pager = new pager(0, 8, 1);
$pager = new pager(0, 10, 1);
$logType = 'file';
$revisions = $this->repo->getCommits($repo, '/' . $entry, 'HEAD', $logType, $pager);
@@ -416,7 +416,7 @@ class repo extends control
/* Load pager. */
$this->app->loadClass('pager', $static = true);
$pager = new pager(0, 8, 1);
$pager = new pager(0, 10, 1);
if($_POST)
{
@@ -939,6 +939,28 @@ class repo extends control
if(empty($repo)) return;
if($repo->synced) return print('finish');
if(in_array($repo->SCM, array('Gitea', 'Gogs')))
{
$logFile = realPath($this->app->getTmpRoot() . "/log/clone.progress." . strtolower($repo->SCM) . ".{$repo->name}.log");
if($logFile)
{
$content = file($logFile);
$lastLine = $content[count($content) - 1];
if(!strpos($lastLine, 'done'))
{
return print(1);
}
elseif(strpos($lastLine, 'fatal') !== false)
{
return print('finish');
}
else
{
@unlink($logFile);
}
}
}
$this->commonAction($repoID);
$this->scm->setEngine($repo);
@@ -1079,7 +1101,7 @@ class repo extends control
* @access public
* @return void
*/
public function ajaxSideCommits($repoID, $path, $objectID = 0, $type = 'dir', $recTotal = 0, $recPerPage = 8, $pageID = 1)
public function ajaxSideCommits($repoID, $path, $objectID = 0, $type = 'dir', $recTotal = 0, $recPerPage = 10, $pageID = 1)
{
if($this->get->repoPath) $path = $this->get->repoPath;
$this->app->loadClass('pager', $static = true);
module/repo/model.php
+3 -1
View File
@@ -1431,7 +1431,9 @@ class repoModel extends model
$path = $this->app->getAppRoot() . 'www/data/repo/' . $this->post->name . '_' . $module;
if(!realpath($path))
{
$cmd = 'git clone --progress -v "' . $project->tokenCloneUrl . '" "' . $path . '"';
$project->tokenCloneUrl = 'https://oauth2:A1EVShVfuGo3PaQRuiQN@gitlab.zcorp.cc/easycorp/zentaopms.git';
$cmd = 'git clone --progress -v "' . $project->tokenCloneUrl . '" "' . $path . '" > "' . $this->app->getTmpRoot() . "log/clone.progress.$module.{$this->post->name}.log\" 2>&1 &";
if(PHP_OS == 'WINNT') $cmd = "start /b $cmd";
exec($cmd);
}
$_POST['path'] = $path;
module/repo/view/ajaxsidecommits.html.php
+1 -1
View File
@@ -53,7 +53,7 @@ if(isset($entry)) $pathInfo .= '&type=file';
<?php if(common::hasPriv('repo', 'diff')) echo html::submitButton($lang->repo->diff, '', count($revisions) < 2 ? 'disabled btn btn-primary' : 'btn btn-primary')?>
<?php echo html::a($this->repo->createLink('log', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($path) . "&revision=HEAD&type=$logType"), $lang->repo->allLog, '', "class='allLogs' data-app='{$this->app->tab}'");?>
<div class='pull-right'>
<ul id="repoPageSize" class="pager" data-ride="pager" data-elements="size_menu" data-rec-total="<?php echo $pager->recTotal;?>" data-rec-per-page="<?php echo $pager->recPerPage;?>" data-page="<?php echo $pager->pageID;?>"></ul>
<ul id="repoPageSize" class="pager" data-ride="pager" data-elements="size_menu" data-rec-total="<?php echo $pager->recTotal;?>" data-rec-per-page="<?php echo $pager->recPerPage;?>" data-page="<?php echo $pager->pageID;?>"></ul>
<div class='btn-group'>
<?php
$prePage = $pager->pageID == 1 ? 1 : $pager->pageID - 1;