Use ControlUtil.

2025-11-07 22:15:51 +01:00 · 2013-09-21 22:13:15 +09:00
parent 18ca3cbd80
commit e89b2020a3
14 changed files with 272 additions and 278 deletions
--- a/src/main/scala/service/PullRequestService.scala
+++ b/src/main/scala/service/PullRequestService.scala
@@ -2,21 +2,21 @@ package service

 import scala.slick.driver.H2Driver.simple._
 import Database.threadLocalSession
-
 import model._
+import util.ControlUtil._

 trait PullRequestService { self: IssuesService =>
  import PullRequestService._

-  def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] = {
-    val issue = getIssue(owner, repository, issueId.toString)
-    if(issue.isDefined){
-      Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).firstOption match {
-        case Some(pullreq) => Some((issue.get, pullreq))
-        case None          => None
-      }
-    } else None
-  }
+  def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] =
+    defining(getIssue(owner, repository, issueId.toString)){ issue =>
+      if(issue.isDefined){
+        Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).firstOption match {
+          case Some(pullreq) => Some((issue.get, pullreq))
+          case None          => None
+        }
+      } else None
+    }

  def getPullRequestCountGroupByUser(closed: Boolean, owner: String, repository: Option[String]): List[PullRequestCount] =
    Query(PullRequests)
--- a/src/main/scala/service/RepositorySearchService.scala
+++ b/src/main/scala/service/RepositorySearchService.scala
@@ -10,7 +10,8 @@ import scala.collection.mutable.ListBuffer
 import org.eclipse.jgit.lib.FileMode
 import org.eclipse.jgit.api.Git

-trait RepositorySearchService { self: IssuesService =>
+trait
+RepositorySearchService { self: IssuesService =>
  import RepositorySearchService._

  def countIssues(owner: String, repository: String, query: String): Int =
--- a/src/main/scala/service/SystemSettingsService.scala
+++ b/src/main/scala/service/SystemSettingsService.scala
@@ -1,73 +1,76 @@
 package service

 import util.Directory._
+import util.ControlUtil._
 import SystemSettingsService._

 trait SystemSettingsService {

  def saveSystemSettings(settings: SystemSettings): Unit = {
-    val props = new java.util.Properties()
-    props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
-    props.setProperty(Gravatar, settings.gravatar.toString)
-    props.setProperty(Notification, settings.notification.toString)
-    if(settings.notification) {
-      settings.smtp.foreach { smtp =>
-        props.setProperty(SmtpHost, smtp.host)
-        smtp.port.foreach(x => props.setProperty(SmtpPort, x.toString))
-        smtp.user.foreach(props.setProperty(SmtpUser, _))
-        smtp.password.foreach(props.setProperty(SmtpPassword, _))
-        smtp.ssl.foreach(x => props.setProperty(SmtpSsl, x.toString))
+    defining(new java.util.Properties()){ props =>
+      props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
+      props.setProperty(Gravatar, settings.gravatar.toString)
+      props.setProperty(Notification, settings.notification.toString)
+      if(settings.notification) {
+        settings.smtp.foreach { smtp =>
+          props.setProperty(SmtpHost, smtp.host)
+          smtp.port.foreach(x => props.setProperty(SmtpPort, x.toString))
+          smtp.user.foreach(props.setProperty(SmtpUser, _))
+          smtp.password.foreach(props.setProperty(SmtpPassword, _))
+          smtp.ssl.foreach(x => props.setProperty(SmtpSsl, x.toString))
+        }
      }
-    }
-    props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
-    if(settings.ldapAuthentication){
-      settings.ldap.map { ldap =>
-        props.setProperty(LdapHost, ldap.host)
-        ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
-        ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
-        ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
-        props.setProperty(LdapBaseDN, ldap.baseDN)
-        props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
-        props.setProperty(LdapMailAddressAttribute, ldap.mailAttribute)
+      props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
+      if(settings.ldapAuthentication){
+        settings.ldap.map { ldap =>
+          props.setProperty(LdapHost, ldap.host)
+          ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
+          ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
+          ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
+          props.setProperty(LdapBaseDN, ldap.baseDN)
+          props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
+          props.setProperty(LdapMailAddressAttribute, ldap.mailAttribute)
+        }
      }
+      props.store(new java.io.FileOutputStream(GitBucketConf), null)
    }
-    props.store(new java.io.FileOutputStream(GitBucketConf), null)
  }


  def loadSystemSettings(): SystemSettings = {
-    val props = new java.util.Properties()
-    if(GitBucketConf.exists){
-      props.load(new java.io.FileInputStream(GitBucketConf))
-    }
-    SystemSettings(
-      getValue(props, AllowAccountRegistration, false),
-      getValue(props, Gravatar, true),
-      getValue(props, Notification, false),
-      if(getValue(props, Notification, false)){
-        Some(Smtp(
-          getValue(props, SmtpHost, ""),
-          getOptionValue(props, SmtpPort, Some(DefaultSmtpPort)),
-          getOptionValue(props, SmtpUser, None),
-          getOptionValue(props, SmtpPassword, None),
-          getOptionValue[Boolean](props, SmtpSsl, None)))
-      } else {
-        None
-      },
-      getValue(props, LdapAuthentication, false),
-      if(getValue(props, LdapAuthentication, false)){
-        Some(Ldap(
-          getValue(props, LdapHost, ""),
-          getOptionValue(props, LdapPort, Some(DefaultLdapPort)),
-          getOptionValue(props, LdapBindDN, None),
-          getOptionValue(props, LdapBindPassword, None),
-          getValue(props, LdapBaseDN, ""),
-          getValue(props, LdapUserNameAttribute, ""),
-          getValue(props, LdapMailAddressAttribute, "")))
-      } else {
-        None
+    defining(new java.util.Properties()){ props =>
+      if(GitBucketConf.exists){
+        props.load(new java.io.FileInputStream(GitBucketConf))
      }
-    )
+      SystemSettings(
+        getValue(props, AllowAccountRegistration, false),
+        getValue(props, Gravatar, true),
+        getValue(props, Notification, false),
+        if(getValue(props, Notification, false)){
+          Some(Smtp(
+            getValue(props, SmtpHost, ""),
+            getOptionValue(props, SmtpPort, Some(DefaultSmtpPort)),
+            getOptionValue(props, SmtpUser, None),
+            getOptionValue(props, SmtpPassword, None),
+            getOptionValue[Boolean](props, SmtpSsl, None)))
+        } else {
+          None
+        },
+        getValue(props, LdapAuthentication, false),
+        if(getValue(props, LdapAuthentication, false)){
+          Some(Ldap(
+            getValue(props, LdapHost, ""),
+            getOptionValue(props, LdapPort, Some(DefaultLdapPort)),
+            getOptionValue(props, LdapBindDN, None),
+            getOptionValue(props, LdapBindPassword, None),
+            getValue(props, LdapBaseDN, ""),
+            getValue(props, LdapUserNameAttribute, ""),
+            getValue(props, LdapMailAddressAttribute, "")))
+        } else {
+          None
+        }
+      )
+    }
  }

 }
@@ -119,23 +122,23 @@ object SystemSettingsService {
  private val LdapUserNameAttribute = "ldap.username_attribute"
  private val LdapMailAddressAttribute = "ldap.mail_attribute"

-  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = {
-    val value = props.getProperty(key)
-    if(value == null || value.isEmpty) default
-    else convertType(value).asInstanceOf[A]
-  }
+  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A =
+    defining(props.getProperty(key)){ value =>
+      if(value == null || value.isEmpty) default
+      else convertType(value).asInstanceOf[A]
+    }

-  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] = {
-    val value = props.getProperty(key)
-    if(value == null || value.isEmpty) default
-    else Some(convertType(value)).asInstanceOf[Option[A]]
-  }
+  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] =
+    defining(props.getProperty(key)){ value =>
+      if(value == null || value.isEmpty) default
+      else Some(convertType(value)).asInstanceOf[Option[A]]
+    }

-  private def convertType[A: ClassTag](value: String) = {
-    val c = implicitly[ClassTag[A]].runtimeClass
-    if(c == classOf[Boolean])  value.toBoolean
-    else if(c == classOf[Int]) value.toInt
-    else value
-  }
+  private def convertType[A: ClassTag](value: String) =
+    defining(implicitly[ClassTag[A]].runtimeClass){ c =>
+      if(c == classOf[Boolean])  value.toBoolean
+      else if(c == classOf[Int]) value.toInt
+      else value
+    }

 }
--- a/src/main/scala/service/WikiService.scala
+++ b/src/main/scala/service/WikiService.scala
@@ -34,40 +34,40 @@ object WikiService {
 trait WikiService {
  import WikiService._

-  def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit = {
+  def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit =
    LockUtil.lock(s"${owner}/${repository}/wiki"){
-      val dir = Directory.getWikiRepositoryDir(owner, repository)
-      if(!dir.exists){
-        try {
-          JGitUtil.initRepository(dir)
-          saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit")
-        } finally {
-          // once delete cloned repository because initial cloned repository does not have 'branch.master.merge'
-          FileUtils.deleteDirectory(Directory.getWikiWorkDir(owner, repository))
+      defining(Directory.getWikiRepositoryDir(owner, repository)){ dir =>
+        if(!dir.exists){
+          try {
+            JGitUtil.initRepository(dir)
+            saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit")
+          } finally {
+            // once delete cloned repository because initial cloned repository does not have 'branch.master.merge'
+            FileUtils.deleteDirectory(Directory.getWikiWorkDir(owner, repository))
+          }
        }
      }
    }
-  }
-  
+
  /**
   * Returns the wiki page.
   */
  def getWikiPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      if(!JGitUtil.isEmpty(git)){
+      optionIf(!JGitUtil.isEmpty(git)){
        JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
          WikiPageInfo(file.name, new String(git.getRepository.open(file.id).getBytes, "UTF-8"), file.committer, file.time)
        }
-      } else None
+      }
    }
  }

  /**
   * Returns the content of the specified file.
   */
-  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] = {
+  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] =
    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      if(!JGitUtil.isEmpty(git)){
+      optionIf(!JGitUtil.isEmpty(git)){
        val index = path.lastIndexOf('/')
        val parentPath = if(index < 0) "."  else path.substring(0, index)
        val fileName   = if(index < 0) path else path.substring(index + 1)
@@ -75,9 +75,8 @@ trait WikiService {
        JGitUtil.getFileList(git, "master", parentPath).find(_.name == fileName).map { file =>
          git.getRepository.open(file.id).getBytes
        }
-      } else None
+      }
    }
-  }

  /**
   * Returns the list of wiki page names.
@@ -98,36 +97,31 @@ trait WikiService {
      content: String, committer: model.Account, message: String): Option[String] = {

    LockUtil.lock(s"${owner}/${repository}/wiki"){
-      // clone working copy
-      val workDir = Directory.getWikiWorkDir(owner, repository)
-      cloneOrPullWorkingCopy(workDir, owner, repository)
+      defining(Directory.getWikiWorkDir(owner, repository)){ workDir =>
+        // clone working copy
+        cloneOrPullWorkingCopy(workDir, owner, repository)

-      // write as file
-      using(Git.open(workDir)){ git =>
-        val file = new File(workDir, newPageName + ".md")
-        val added = if(!file.exists || FileUtils.readFileToString(file, "UTF-8") != content){
-          FileUtils.writeStringToFile(file, content, "UTF-8")
-          git.add.addFilepattern(file.getName).call
-          true
-        } else {
-          false
-        }
+        // write as file
+        using(Git.open(workDir)){ git =>
+          defining(new File(workDir, newPageName + ".md")){ file =>
+            val added = executeIf(!file.exists || FileUtils.readFileToString(file, "UTF-8") != content){
+              FileUtils.writeStringToFile(file, content, "UTF-8")
+              git.add.addFilepattern(file.getName).call
+            }

-        // delete file
-        val deleted = if(currentPageName != "" && currentPageName != newPageName){
-          git.rm.addFilepattern(currentPageName + ".md").call
-          true
-        } else {
-          false
-        }
+            // delete file
+            val deleted = executeIf(currentPageName != "" && currentPageName != newPageName){
+              git.rm.addFilepattern(currentPageName + ".md").call
+            }

-        // commit and push
-        if(added || deleted){
-          val commit = git.commit.setCommitter(committer.userName, committer.mailAddress).setMessage(message).call
-          git.push.call
-          Some(commit.getName)
-        } else {
-          None
+            // commit and push
+            optionIf(added || deleted){
+              defining(git.commit.setCommitter(committer.userName, committer.mailAddress).setMessage(message).call){ commit =>
+                git.push.call
+                Some(commit.getName)
+              }
+            }
+          }
        }
      }
    }
@@ -139,35 +133,34 @@ trait WikiService {
  def deleteWikiPage(owner: String, repository: String, pageName: String,
                     committer: String, mailAddress: String, message: String): Unit = {
    LockUtil.lock(s"${owner}/${repository}/wiki"){
-      // clone working copy
-      val workDir = Directory.getWikiWorkDir(owner, repository)
-      cloneOrPullWorkingCopy(workDir, owner, repository)
+      defining(Directory.getWikiWorkDir(owner, repository)){ workDir =>
+        // clone working copy
+        cloneOrPullWorkingCopy(workDir, owner, repository)

-      // delete file
-      new File(workDir, pageName + ".md").delete
-    
-      using(Git.open(workDir)){ git =>
-        git.rm.addFilepattern(pageName + ".md").call
-    
-        // commit and push
-        git.commit.setAuthor(committer, mailAddress).setMessage(message).call
-        git.push.call
+        // delete file
+        new File(workDir, pageName + ".md").delete
+
+        using(Git.open(workDir)){ git =>
+          git.rm.addFilepattern(pageName + ".md").call
+
+          // commit and push
+          git.commit.setAuthor(committer, mailAddress).setMessage(message).call
+          git.push.call
+        }
      }
    }
  }

  private def cloneOrPullWorkingCopy(workDir: File, owner: String, repository: String): Unit = {
    if(!workDir.exists){
-      val git =
-        Git.cloneRepository
-          .setURI(Directory.getWikiRepositoryDir(owner, repository).toURI.toString)
-          .setDirectory(workDir)
-          .call
-      git.getRepository.close  // close .git resources.
-    } else {
-      using(Git.open(workDir)){ git =>
-        git.pull.call
-      }
+      Git.cloneRepository
+        .setURI(Directory.getWikiRepositoryDir(owner, repository).toURI.toString)
+        .setDirectory(workDir)
+        .call
+        .getRepository
+        .close
+    } else using(Git.open(workDir)){ git =>
+      git.pull.call
    }
  }