(refs #10)Display ssh url

Author: takezoe

src/main/scala/gitbucket/gist/controller/GistController.scala

@@ -205,7 +205,13 @@ trait GistControllerBase extends ControllerBase {
             }
           }
           val gist = getGist(userName, repoName).get
-          html.revisions("revision", gist, repositoryUrl(gist, baseUrl), isEditable(userName), commits)
+          html.revisions(
+            "revision",
+            gist,
+            GistRepositoryURL(gist, baseUrl, context.settings),
+            isEditable(userName),
+            commits
+          )
         }
         case Left(_) => NotFound
       }
@@ -317,7 +323,14 @@ trait GistControllerBase extends ControllerBase {
               val files: Seq[(String, String)] = JGitUtil.getFileList(git, revision, ".").map { file =>
                 file.name -> StringUtil.convertFromByteArray(JGitUtil.getContentFromId(git, file.id, true).get)
               }
-              html.detail("code", gist, repositoryUrl(gist, baseUrl), revision, files, isEditable(userName))
+              html.detail(
+                "code",
+                gist,
+                GistRepositoryURL(gist, baseUrl, context.settings),
+                revision,
+                files,
+                isEditable(userName)
+              )
             } else Unauthorized
           }
         } else NotFound

src/main/scala/gitbucket/gist/util/GistUtils.scala

@@ -2,6 +2,8 @@ package gitbucket.gist.util
 
 import gitbucket.core.controller.Context
 import gitbucket.core.model.Account
+import gitbucket.core.service.SystemSettingsService
+import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.util.JGitUtil
 import gitbucket.gist.model.Gist
 import org.eclipse.jgit.api.Git
@@ -40,6 +42,15 @@ object GistUtils {
 
   def getTitle(fileName: String, repoName: String): String = if(isGistFile(fileName)) repoName else fileName
 
-  def repositoryUrl(gist: Gist, baseUrl: String) = s"${baseUrl}/git/gist/${gist.userName}/${gist.repositoryName}.git"
+  case class GistRepositoryURL(gist: Gist, baseUrl: String, settings: SystemSettings){
+
+    def httpUrl: String = s"${baseUrl}/git/gist/${gist.userName}/${gist.repositoryName}.git"
+
+    def sshUrl(loginUser: String): String = {
+      val host = """^https?://(.+?)(:\d+)?/""".r.findFirstMatchIn(httpUrl).get.group(1)
+      s"ssh://${loginUser}@${host}:${settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort)}/gist/${gist.userName}/${gist.repositoryName}.git"
+    }
+
+  }
 
 }

src/main/twirl/gitbucket/gist/detail.scala.html

@@ -1,6 +1,6 @@
 @(active: String,
   gist: gitbucket.gist.model.Gist,
-  repositoryUrl: String,
+  repositoryUrl: gitbucket.gist.util.GistUtils.GistRepositoryURL,
   revision: String,
   files: Seq[(String, String)],
   editable: Boolean)(implicit context: gitbucket.core.controller.Context)

src/main/twirl/gitbucket/gist/menu.scala.html

@@ -1,6 +1,6 @@
 @(active: String,
   gist: gitbucket.gist.model.Gist,
-  repositoryUrl: String)(implicit context: gitbucket.core.controller.Context)
+  repositoryUrl: gitbucket.gist.util.GistUtils.GistRepositoryURL)(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.helper
 @import gitbucket.core.view.helpers._
@@ -44,8 +44,8 @@
   <div class="small">
     <strong id="repository-url-proto">HTTP</strong> <span class="mute">clone URL</span>
   </div>
-  @helper.html.copy("repository-url-copy", repositoryUrl){
-    <input type="text" value="@repositoryUrl" id="repository-url" readonly>
+  @helper.html.copy("repository-url-copy", repositoryUrl.httpUrl){
+    <input type="text" value="@repositoryUrl.httpUrl" id="repository-url" readonly>
   }
   @if(settings.ssh && loginAccount.isDefined){
     <div class="small">
@@ -61,3 +61,17 @@
        class="btn btn-small" style="width: 147px;"><i class="icon-download-alt"></i>Download TAR.GZ</a>
   </div>
 </div>
+@if(settings.ssh && loginAccount.isDefined){
+  <script>
+  $(function(){
+    $('#repository-url-http').click(function(){
+      $('#repository-url').val('@repositoryUrl.httpUrl');
+      $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
+    });
+    $('#repository-url-ssh').click(function(){
+      $('#repository-url').val('@repositoryUrl.sshUrl(loginAccount.get.userName)');
+      $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
+    });
+  });
+  </script>
+}

src/main/twirl/gitbucket/gist/revisions.scala.html

@@ -1,6 +1,6 @@
 @(active: String,
   gist: gitbucket.gist.model.Gist,
-  repositoryUrl: String,
+  repositoryUrl: gitbucket.gist.util.GistUtils.GistRepositoryURL,
   editable: Boolean,
   revisions: List[(gitbucket.core.util.JGitUtil.CommitInfo, List[gitbucket.core.util.JGitUtil.DiffInfo])])(implicit context: gitbucket.core.controller.Context)
 @import context._