Use default branch instead of master (#32)

* use default branch instead of hard coded master
* ignore .bsp

Author: yaroot

.gitignore

@@ -28,4 +28,5 @@ project/plugins/project/
 .bloop/
 .metals/
 .vscode/
-**/metals.sbt
+**/metals.sbt
+.bsp

src/main/scala/Plugin.scala

@@ -39,9 +39,8 @@ class Plugin extends gitbucket.core.plugin.Plugin {
 
   override val controllers: Seq[(String, ControllerBase)] = Seq("/*" -> new PagesController)
 
-  override val repositorySettingTabs = Seq(
-    (repository: RepositoryInfo, context: Context) => Some(Link("pages", "Pages", s"settings/pages"))
-  )
+  override val repositorySettingTabs =
+    Seq((repository: RepositoryInfo, context: Context) => Some(Link("pages", "Pages", s"settings/pages")))
 
   override val repositoryHooks = Seq(new PagesHook)
 }

src/main/scala/gitbucket/plugin/pages/pages.scala

@@ -30,8 +30,8 @@ trait PagesControllerBase extends ControllerBase {
   self: AccountService with RepositoryService with PagesService with ReferrerAuthenticator with OwnerAuthenticator =>
   import PagesControllerBase._
 
-  val optionsForm = mapping("source" -> trim(label("Pages Source", text(required, pagesOption))))(
-    (source) => OptionsForm(PageSourceType.valueOf(source))
+  val optionsForm = mapping("source" -> trim(label("Pages Source", text(required, pagesOption))))((source) =>
+    OptionsForm(PageSourceType.valueOf(source))
   )
 
   val PAGES_BRANCHES = List("gb-pages", "gh-pages")
@@ -45,14 +45,15 @@ trait PagesControllerBase extends ControllerBase {
   })
 
   private def renderPage(repository: RepositoryInfo, path: String) = {
+    val defaultBranch = repository.repository.defaultBranch
     Using.resource(Git.open(Directory.getRepositoryDir(repository.owner, repository.name))) { git =>
       getPageSource(repository.owner, repository.name) match {
         case PageSourceType.GH_PAGES =>
           renderFromBranch(repository, git, path, PAGES_BRANCHES.collectFirstOpt(resolveBranch(git, _)))
         case PageSourceType.MASTER =>
-          renderFromBranch(repository, git, path, resolveBranch(git, "master"))
+          renderFromBranch(repository, git, path, resolveBranch(git, defaultBranch))
         case PageSourceType.MASTER_DOCS =>
-          renderFromBranch(repository, git, joinPath("docs", path), resolveBranch(git, "master"))
+          renderFromBranch(repository, git, joinPath("docs", path), resolveBranch(git, defaultBranch))
         case PageSourceType.NONE =>
           NotFound()
       }
@@ -61,7 +62,8 @@ trait PagesControllerBase extends ControllerBase {
 
   get("/:owner/:repository/settings/pages")(ownerOnly { repository =>
     val source = getPageSource(repository.owner, repository.name)
-    html.options(repository, source, flash.get("info"))
+    val defaultBranch = repository.repository.defaultBranch
+    html.options(repository, source, defaultBranch, flash.get("info"))
   })
 
   post("/:owner/:repository/settings/pages", optionsForm)(ownerOnly { (form, repository) =>

src/main/scala/gitbucket/plugin/service/PagesService.scala

@@ -21,8 +21,8 @@ trait PagesService {
       .map(t => t.source)
       .update(source)
 
-  def renameRepository(userName: String, oldRepositoryName: String, newRepositoryName: String)(
-    implicit s: Session
+  def renameRepository(userName: String, oldRepositoryName: String, newRepositoryName: String)(implicit
+    s: Session
   ): Unit =
     Pages
       .filter(t => (t.userName === userName.bind) && (t.repositoryName === oldRepositoryName.bind))

src/main/twirl/gitbucket/pages/options.scala.html

@@ -1,6 +1,7 @@
 @import gitbucket.plugin.model.PageSourceType
 @(repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
     source: PageSourceType,
+    defaultBranch: String,
     info: Option[Any])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main("Pages", Some(repository)){
@@ -24,16 +25,16 @@
                             <div class="radio">
                                 <label>
                                     <input type="radio" name="source" value="@PageSourceType.MASTER.code" @if(source == PageSourceType.MASTER) { checked="checked" }>
-                                    <span class="strong">master branch</span><br>
+                                    <span class="strong">default branch</span><br>
                                     <div class="normal muted">
-                                      Use the <code>master</code> branch for Pages.
+                                      Use the <code>@defaultBranch</code> branch for Pages.
                                     </div>
                                 </label>
                             </div>
                             <div class="radio">
                                 <label>
                                     <input type="radio" name="source" value="@PageSourceType.MASTER_DOCS.code" @if(source == PageSourceType.MASTER_DOCS) { checked="checked" }>
-                                    <span class="strong">master branch /docs folder</span><br>
+                                    <span class="strong">default branch /docs folder</span><br>
                                     <div class="normal muted">
                                       Use only the <code>/docs</code> folder for Pages.
                                     </div>