Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 07:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #1084)Remove RepositoryUrls

Browse Source
This commit is contained in:
Naoki Takezoe
2016-02-13 01:50:25 +09:00
parent 8145cba111
commit 5b87efa032
11 changed files with 65 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/gitbucket/core/controller/ControllerBase.scala
View File

@@ -3,7 +3,6 @@ package gitbucket.core.controller
import gitbucket.core.api.ApiError
import gitbucket.core.model.Account
import gitbucket.core.service.{AccountService, SystemSettingsService}
import gitbucket.core.service.RepositoryService.{RepositoryInfo, RepositoryUrls}
import gitbucket.core.util.ControlUtil._
import gitbucket.core.util.Directory._
import gitbucket.core.util.Implicits._
@@ -185,8 +184,6 @@ case class Context(settings: SystemSettingsService.SystemSettings, loginAccount:
val currentPath = request.getRequestURI.substring(request.getContextPath.length)
val baseUrl = settings.baseUrl(request)
val host = new java.net.URL(baseUrl).getHost
val urls = (repositoryInfo:RepositoryInfo) => new RepositoryUrls(baseUrl, settings.sshAddress, repositoryInfo.owner, repositoryInfo.name)
val wikiUrls = (repositoryInfo:RepositoryInfo) => new RepositoryUrls(baseUrl, settings.sshAddress, repositoryInfo.owner, repositoryInfo.name + ".wiki")
val platform = request.getHeader("User-Agent") match {
case null => null
case agent if agent.contains("Mac") => "mac"

39
src/main/scala/gitbucket/core/service/RepositoryService.scala
View File

@@ -1,6 +1,6 @@
package gitbucket.core.service
import gitbucket.core.service.SystemSettingsService.SshAddress
import gitbucket.core.controller.Context
import gitbucket.core.model.{Collaborator, Repository, Account}
import gitbucket.core.model.Profile._
import gitbucket.core.util.JGitUtil
@@ -398,8 +398,8 @@ object RepositoryService {
def this(repo: JGitUtil.RepositoryInfo, model: Repository, issueCount: Int, pullCount: Int, forkedCount: Int, managers: Seq[String]) =
this(
repo.owner, repo.name, model,
issueCount, pullCount,
repo.commitCount, forkedCount, repo.branchList, repo.tags, managers)
issueCount, pullCount, repo.commitCount, forkedCount,
repo.branchList, repo.tags, managers)
/**
* Creates instance without issue count and pull request count.
@@ -407,27 +407,20 @@ object RepositoryService {
def this(repo: JGitUtil.RepositoryInfo, model: Repository, forkedCount: Int, managers: Seq[String]) =
this(
repo.owner, repo.name, model,
0, 0,
repo.commitCount, forkedCount, repo.branchList, repo.tags, managers)
0, 0, repo.commitCount, forkedCount,
repo.branchList, repo.tags, managers)
def httpUrl(implicit context: Context): String = RepositoryService.httpUrl(owner, name)
def sshUrl(implicit context: Context): Option[String] = RepositoryService.sshUrl(owner, name)
}
final class RepositoryUrls(baseUrl:String, sshAddress:Option[SshAddress], owner:String, name:String) {
def httpUrl:String =
s"${baseUrl}/git/${owner}/${name}.git"
def httpUrl(owner: String, name: String)(implicit context: Context): String = s"${context.baseUrl}/git/${owner}/${name}.git"
def sshUrl(owner: String, name: String)(implicit context: Context): Option[String] =
if(context.settings.ssh){
context.loginAccount.flatMap { loginAccount =>
context.settings.sshAddress.map { x => s"ssh://${loginAccount.userName}@${x.host}:${x.port}/${owner}/${name}.git" }
}
} else None
def openRepoUrl(openUrl: String)(implicit context: Context): String = s"github-${context.platform}://openRepo/${openUrl}"
// BETTER make this return an Option and use it in the gui
def sshUrl(userName: String):String =
sshAddress.fold("")(adr => s"ssh://${userName}@${adr.host}:${adr.port}/${owner}/${name}.git")
def sshOpenRepoUrl(platform: String, userName: String) =
openRepoUrl(platform, sshUrl(userName))
def httpOpenRepoUrl(platform: String) =
openRepoUrl(platform, httpUrl)
private def openRepoUrl(platform: String, openUrl: String) =
s"github-${platform}://openRepo/${openUrl}"
}
case class RepositoryTreeNode(owner: String, name: String, children: List[RepositoryTreeNode])
}

6
src/main/scala/gitbucket/core/service/SystemSettingsService.scala
View File

@@ -139,8 +139,7 @@ object SystemSettingsService {
def sshAddress:Option[SshAddress] =
for {
host <- sshHost
if ssh
host <- sshHost if ssh
}
yield SshAddress(host, sshPort.getOrElse(DefaultSshPort))
}
@@ -228,7 +227,4 @@ object SystemSettingsService {
else value
}
// // TODO temporary flag
// val enablePluginSystem = Option(System.getProperty("enable.plugin")).getOrElse("false").toBoolean
}

13
src/main/scala/gitbucket/core/service/WikiService.scala
View File

@@ -1,8 +1,9 @@
package gitbucket.core.service
import java.util.Date
import gitbucket.core.service.SystemSettingsService.SshAddress
import gitbucket.core.controller.Context
import gitbucket.core.model.Account
import gitbucket.core.service.RepositoryService.RepositoryInfo
import gitbucket.core.util._
import gitbucket.core.util.ControlUtil._
import org.eclipse.jgit.api.Git
@@ -14,8 +15,6 @@ import java.io.ByteArrayInputStream
import org.eclipse.jgit.patch._
import org.eclipse.jgit.api.errors.PatchFormatException
import scala.collection.JavaConverters._
import RepositoryService.RepositoryInfo
import RepositoryService.RepositoryUrls
object WikiService {
@@ -39,6 +38,14 @@ object WikiService {
* @param date the commit date
*/
case class WikiPageHistoryInfo(name: String, committer: String, message: String, date: Date)
def wikiHttpUrl(repositoryInfo: RepositoryInfo)(implicit context: Context): String
= RepositoryService.httpUrl(repositoryInfo.owner, repositoryInfo.name + ".wiki")
def wikiSshUrl(repositoryInfo: RepositoryInfo)(implicit context: Context): Option[String]
= RepositoryService.sshUrl(repositoryInfo.owner, repositoryInfo.name + ".wiki")
}
trait WikiService {

10
src/main/scala/gitbucket/core/view/Markdown.scala
View File

@@ -60,8 +60,6 @@ object Markdown {
pages: List[String])
(implicit val context: Context) extends Renderer(options) with LinkConverter with RequestCache {
private val repositoryUrls = context.urls(repository)
override def heading(text: String, level: Int, raw: String): String = {
val id = generateAnchorName(text)
val out = new StringBuilder()
@@ -137,7 +135,7 @@ object Markdown {
(link, link)
}
val url = repositoryUrls.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/wiki/" + StringUtil.urlEncode(page)
val url = repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/wiki/" + StringUtil.urlEncode(page)
if(pages.contains(page)){
"<a href=\"" + url + "\">" + escape(label) + "</a>"
} else {
@@ -159,14 +157,14 @@ object Markdown {
} else if(context.currentPath.contains("/tree/")){
val paths = context.currentPath.split("/")
val branch = if(paths.length > 3) paths.drop(4).mkString("/") else repository.repository.defaultBranch
repositoryUrls.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/blob/" + branch + "/" + url + (if(isImage) "?raw=true" else "")
repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/blob/" + branch + "/" + url + (if(isImage) "?raw=true" else "")
} else {
val paths = context.currentPath.split("/")
val branch = if(paths.length > 3) paths.last else repository.repository.defaultBranch
repositoryUrls.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/blob/" + branch + "/" + url + (if(isImage) "?raw=true" else "")
repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/blob/" + branch + "/" + url + (if(isImage) "?raw=true" else "")
}
} else {
repositoryUrls.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/wiki/_blob/" + url
repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/wiki/_blob/" + url
}
}

2
src/main/twirl/gitbucket/core/admin/system.scala.html
View File

@@ -128,7 +128,7 @@
</div>
</div>
<p class="muted">
Base URL is required if SSH access is enabled.
Both of SSH host and Base URL are required if SSH access is enabled.
</p>
<!--====================================================================-->
<!-- Authentication -->

2
src/main/twirl/gitbucket/core/main.scala.html
View File

@@ -37,7 +37,7 @@
<script src="@assets/vendors/jquery-hotkeys/jquery.hotkeys.js"></script>
@repository.map { repository =>
@if(!repository.repository.isPrivate){
<meta name="go-import" content="@context.baseUrl.replaceFirst("^https?://", "")/@repository.owner/@repository.name git @context.urls(repository).httpUrl" />
<meta name="go-import" content="@context.baseUrl.replaceFirst("^https?://", "")/@repository.owner/@repository.name git @repository.httpUrl" />
}
}
</head>

20
src/main/twirl/gitbucket/core/menu.scala.html
View File

@@ -5,9 +5,9 @@
isNoGroup: Boolean = true,
info: Option[Any] = None,
error: Option[Any] = None)(body: Html)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.service.SystemSettingsService
@import context._
@import gitbucket.core.view.helpers._
@import gitbucket.core.service.RepositoryService._
@sidemenu(path: String, name: String, icon: String, label: String, count: Int = 0) = {
<li @if(active == name){class="active"} @if(!expand){data-toggle="tooltip" data-placement="left" data-original-title="@label"}>
@@ -80,10 +80,10 @@
<div class="small">
<strong id="repository-url-proto">HTTP</strong> <span class="mute">clone URL</span>
</div>
@helper.html.copy("repository-url-copy", context.urls(repository).httpUrl){
<input type="text" value="@context.urls(repository).httpUrl" id="repository-url" class="form-control input-sm" readonly>
@helper.html.copy("repository-url-copy", repository.httpUrl){
<input type="text" value="@repository.httpUrl" id="repository-url" class="form-control input-sm" readonly>
}
@if(settings.ssh && loginAccount.isDefined){
@if(repository.sshUrl.isDefined){
<div class="small">
<span class="mute">You can clone <a href="javascript:void(0);" id="repository-url-http">HTTP</a> or <a href="javascript:void(0);" id="repository-url-ssh">SSH</a>.</span>
</div>
@@ -91,7 +91,7 @@
@id.map { id =>
@if(context.platform != "linux" && context.platform != null){
<div style="margin-top: 10px;">
<a href="@context.urls(repository).httpOpenRepoUrl(context.platform)" id="repository-clone-url" class="btn btn-sm btn-default btn-block"><i class="octicon octicon-desktop-download"></i>&nbsp;&nbsp;Clone in Desktop</a>
<a href="@openRepoUrl(repository.httpUrl)" id="repository-clone-url" class="btn btn-sm btn-default btn-block"><i class="octicon octicon-desktop-download"></i>&nbsp;&nbsp;Clone in Desktop</a>
</div>
}
<div style="margin-top: 10px;">
@@ -181,18 +181,18 @@ $(function(){
});
}
@if(settings.ssh && loginAccount.isDefined){
@repository.sshUrl.map { sshUrl =>
$('#repository-url-http').click(function(){
$('#repository-url-proto').text('HTTP');
$('#repository-url').val('@context.urls(repository).httpUrl');
$('#repository-clone-url').attr('href', '@context.urls(repository).httpOpenRepoUrl(context.platform)')
$('#repository-url').val('@repository.httpUrl');
$('#repository-clone-url').attr('href', '@openRepoUrl(repository.httpUrl)')
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
});
$('#repository-url-ssh').click(function(){
$('#repository-url-proto').text('SSH');
$('#repository-url').val('@context.urls(repository).sshUrl(loginAccount.get.userName)');
$('#repository-clone-url').attr('href', '@context.urls(repository).sshOpenRepoUrl(context.platform, loginAccount.get.userName)');
$('#repository-url').val('@sshUrl');
$('#repository-clone-url').attr('href', '@openRepoUrl(sshUrl)');
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
});
}

19
src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
View File

@@ -100,21 +100,21 @@
you can perform a manual merge on the command line.
</p>
}
@helper.html.copy("repository-url-copy", context.urls(forkedRepository).httpUrl, true){
@helper.html.copy("repository-url-copy", forkedRepository.httpUrl, true){
<div class="btn-group" data-toggle="buttons-radio">
<button class="btn btn-small active" type="button" id="repository-url-http">HTTP</button>
@if(settings.ssh && loginAccount.isDefined){
<button class="btn btn-small" type="button" id="repository-url-ssh" style="border-radius: 0px;">SSH</button>
}
</div>
<input type="text" style="width: 500px;" value="@context.urls(forkedRepository).httpUrl" id="repository-url" readonly />
<input type="text" style="width: 500px;" value="@forkedRepository.httpUrl" id="repository-url" readonly />
}
<div>
<p>
<span class="strong">Step 1:</span> From your project repository, check out a new branch and test the changes.
</p>
@defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}\n" +
s"git pull ${context.urls(forkedRepository).httpUrl} ${pullreq.requestBranch}"){ command =>
s"git pull ${forkedRepository.httpUrl} ${pullreq.requestBranch}"){ command =>
@helper.html.copy("merge-command-copy-1", command){
<pre style="width: 600px; float: left; font-size: 12px; border-radius: 3px 0px 3px 3px;" id="merge-command">@Html(command)</pre>
}
@@ -171,27 +171,26 @@ $(function(){
$('#confirm-merge-form').show();
});
@if(settings.ssh && loginAccount.isDefined){
@* @if(settings.ssh && loginAccount.isDefined){ *@
@forkedRepository.sshUrl.map { sshUrl =>
$('#repository-url-http').click(function(){
// Update URL box
$('#repository-url').val('@context.urls(forkedRepository).httpUrl');
$('#repository-url').val('@forkedRepository.httpUrl');
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
// Update command guidance
$('#merge-command').text($('#merge-command').text().replace(
'@context.urls(forkedRepository).sshUrl(loginAccount.get.userName)',
'@context.urls(forkedRepository).httpUrl'
'@sshUrl', '@forkedRepository.httpUrl'
));
$('#merge-command-copy-1').attr('data-clipboard-text', $('#merge-command').text());
});
$('#repository-url-ssh').click(function(){
// Update URL box
$('#repository-url').val('@context.urls(forkedRepository).sshUrl(loginAccount.get.userName)');
$('#repository-url').val('@sshUrl');
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
// Update command guidance
$('#merge-command').text($('#merge-command').text().replace(
'@context.urls(forkedRepository).httpUrl',
'@context.urls(forkedRepository).sshUrl(loginAccount.get.userName)'
'@forkedRepository.httpUrl', '@sshUrl'
));
$('#merge-command-copy-1').attr('data-clipboard-text', $('#merge-command').text());
});

10
src/main/twirl/gitbucket/core/repo/guide.scala.html
View File

@@ -10,10 +10,10 @@
} else {
<h3><strong>Quick setup</strong> — if you've done this kind of thing before</h3>
<div class="empty-repo-options">
via <a href="@context.urls(repository).httpUrl" class="git-protocol-selector">HTTP</a>
@if(settings.ssh && loginAccount.isDefined){
via <a href="@repository.httpUrl" class="git-protocol-selector">HTTP</a>
@repository.sshUrl.map { sshUrl =>
or
<a href="@context.urls(repository).sshUrl(loginAccount.get.userName)" class="git-protocol-selector">SSH</a>
<a href="@sshUrl" class="git-protocol-selector">SSH</a>
}
</div>
<h3 style="margin-top: 30px;">Create a new repository on the command line</h3>
@@ -22,12 +22,12 @@
git init
git add README.md
git commit -m "first commit"
git remote add origin <span class="live-clone-url">@context.urls(repository).httpUrl</span>
git remote add origin <span class="live-clone-url">@repository.httpUrl</span>
git push -u origin master
}
<h3 style="margin-top: 30px;">Push an existing repository from the command line</h3>
@pre {
git remote add origin <span class="live-clone-url">@context.urls(repository).httpUrl</span>
git remote add origin <span class="live-clone-url">@repository.httpUrl</span>
git push -u origin master
}
<script>

16
src/main/twirl/gitbucket/core/wiki/page.scala.html
View File

@@ -7,7 +7,7 @@
footer: Option[gitbucket.core.service.WikiService.WikiPageInfo])(implicit context: gitbucket.core.controller.Context)
@import context._
@import gitbucket.core.view.helpers._
@import gitbucket.core.service.WikiService._
@import gitbucket.core.service.WikiService.{wikiHttpUrl, wikiSshUrl}
@html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
@html.menu("wiki", repository){
<ul class="nav nav-tabs fill-width">
@@ -67,10 +67,10 @@
<div class="small">
<strong>Clone this wiki locally</strong>
</div>
@helper.html.copy("repository-url-copy", context.wikiUrls(repository).httpUrl){
<input type="text" value="@context.wikiUrls(repository).httpUrl" id="repository-url" class="form-control input-sm" readonly>
@helper.html.copy("repository-url-copy", wikiHttpUrl(repository)){
<input type="text" value="@wikiHttpUrl(repository)" id="repository-url" class="form-control input-sm" readonly>
}
@if(settings.ssh && loginAccount.isDefined){
@if(wikiSshUrl(repository).isDefined) {
<div class="small">
<span class="mute">You can clone <a href="javascript:void(0);" id="repository-url-http">HTTP</a> or <a href="javascript:void(0);" id="repository-url-ssh">SSH</a>.</span>
</div>
@@ -106,7 +106,7 @@
</div>
}
}
<script>
<script><script>
$(function(){
$('#show-more-pages').click(function(e){
$('div.page-link').show();
@@ -131,13 +131,13 @@ $(function(){
$('#triangle-right').show();
}
@if(settings.ssh && loginAccount.isDefined){
@wikiSshUrl(repository).map { sshUrl =>
$('#repository-url-http').click(function(){
$('#repository-url').val('@context.wikiUrls(repository).httpUrl');
$('#repository-url').val('@wikiHttpUrl(repository)');
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
});
$('#repository-url-ssh').click(function(){
$('#repository-url').val('@context.wikiUrls(repository).sshUrl(loginAccount.get.userName)');
$('#repository-url').val('@sshUrl');
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
});
}