get pages option from service

Author: shiena

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

@@ -2,8 +2,11 @@ package gitbucket.plugin.pages
 
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.{ AccountService, RepositoryService }
+import gitbucket.core.util.Implicits._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.{ Directory, JGitUtil, ReferrerAuthenticator }
+import gitbucket.plugin.model.PageSourceType
+import gitbucket.plugin.service.PagesService
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.ObjectId
 import org.eclipse.jgit.revwalk.RevCommit
@@ -14,37 +17,65 @@ import scala.language.implicitConversions
 class PagesController
   extends PagesControllerBase
   with AccountService
+  with PagesService
   with RepositoryService
   with ReferrerAuthenticator
 
 trait PagesControllerBase extends ControllerBase {
-  self: AccountService with RepositoryService with ReferrerAuthenticator =>
+  self: AccountService with RepositoryService with PagesService with ReferrerAuthenticator =>
 
   val PAGES_BRANCHES = List("gb-pages", "gh-pages")
 
   get("/:owner/:repository/pages/*")(referrersOnly { repository =>
     val path = params("splat")
     using(Git.open(Directory.getRepositoryDir(repository.owner, repository.name))) { git =>
-      val objectId = resolveBranch(git, PAGES_BRANCHES)
-        .map(JGitUtil.getRevCommitFromId(git, _))
-        .flatMap { revCommit =>
-          getPathIndexObjectId(git, path, revCommit)
+
+      def resolvePath(objectId: Option[(String, ObjectId)], path: String) = {
+        objectId match {
+          case Some((path0, objId)) =>
+            // redirect [owner/repo/pages/path] -> [owner/repo/pages/path/]
+            if (shouldRedirect(path, path0)) {
+              redirect(s"/${repository.owner}/${repository.name}/pages/$path/")
+            } else {
+              JGitUtil.getObjectLoaderFromId(git, objId) { loader =>
+                contentType = Option(servletContext.getMimeType(path0)).getOrElse("application/octet-stream")
+                response.setContentLength(loader.getSize.toInt)
+                loader.copyTo(response.getOutputStream)
+              }
+              ()
+            }
+          case None =>
+            NotFound()
         }
+      }
 
-      objectId match {
-        case Some((path0, objId)) =>
-          // redirect [owner/repo/pages/path] -> [owner/repo/pages/path/]
-          if (shouldRedirect(path, path0)) {
-            redirect(s"/${repository.owner}/${repository.name}/pages/$path/")
-          } else {
-            JGitUtil.getObjectLoaderFromId(git, objId) { loader =>
-              contentType = Option(servletContext.getMimeType(path0)).getOrElse("application/octet-stream")
-              response.setContentLength(loader.getSize.toInt)
-              loader.copyTo(response.getOutputStream)
+      val source = getPageOptions(repository.owner, repository.name) match {
+        case Some(p) => p.source
+        case None => PageSourceType.GH_PAGES
+      }
+      source match {
+        case PageSourceType.GH_PAGES =>
+          val objectId = resolveBranch(git, PAGES_BRANCHES)
+            .map(JGitUtil.getRevCommitFromId(git, _))
+            .flatMap { revCommit =>
+              getPathIndexObjectId(git, path, revCommit)
+            }
+          resolvePath(objectId, path)
+        case PageSourceType.MASTER =>
+          val objectId = Option(git.getRepository.resolve("master"))
+            .map(JGitUtil.getRevCommitFromId(git, _))
+            .flatMap { revCommit =>
+              getPathIndexObjectId(git, path, revCommit)
+            }
+          resolvePath(objectId, path)
+        case PageSourceType.MASTER_DOCS =>
+          val objectId = Option(git.getRepository.resolve("master"))
+            .map(JGitUtil.getRevCommitFromId(git, _))
+            .flatMap { revCommit =>
+              getPathIndexObjectId(git, s"docs/$path", revCommit)
             }
-            ()
-          }
-        case None =>
+          resolvePath(objectId, path)
+        case PageSourceType.NONE =>
           NotFound()
       }
     }