+ |--
+ |View it on GitBucket + """.stripMargin + + def msgPullRequest(url: String) = (content: String) => s""" + |${content}
+ |View, comment on, or merge it at:
+ |${url} + """.stripMargin + + def msgComment(url: String) = (content: String) => s""" + |${content}
+ |--
+ |View it on GitBucket + """.stripMargin + + def msgStatus(url: String) = (content: String) => s""" + |${content} #${url split('/') last} + """.stripMargin +} + +class Mailer(private val smtp: Smtp) extends Notifier { + private val logger = LoggerFactory.getLogger(classOf[Mailer]) + + def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String) + (msg: String => String)(implicit context: Context) = { + val database = Database() + + val f = Future { + database withSession { implicit session => + getIssue(r.owner, r.name, issueId.toString) foreach { issue => + defining( + s"[${r.name}] ${issue.title} (#${issueId})" -> + msg(Markdown.toHtml(content, r, false, true))) { case (subject, msg) => + recipients(issue) { to => + val email = new HtmlEmail + email.setHostName(smtp.host) + email.setSmtpPort(smtp.port.get) + smtp.user.foreach { user => + email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse(""))) + } + smtp.ssl.foreach { ssl => + email.setSSLOnConnect(ssl) + } + smtp.fromAddress + .map (_ -> smtp.fromName.orNull) + .orElse (Some("notifications@gitbucket.com" -> context.loginAccount.get.userName)) + .foreach { case (address, name) => + email.setFrom(address, name) + } + email.setCharset("UTF-8") + email.setSubject(subject) + email.setHtmlMsg(msg) + + email.addTo(to).send + } + } + } + } + "Notifications Successful." + } + f onSuccess { + case s => logger.debug(s) + } + f onFailure { + case t => logger.error("Notifications Failed.", t) + } + } +} +class MockMailer extends Notifier { + def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String) + (msg: String => String)(implicit context: Context): Unit = {} +} diff --git a/src/main/scala/gitbucket/core/util/RepoitoryName.scala b/src/main/scala/gitbucket/core/util/RepoitoryName.scala new file mode 100644 index 0000000..415b20b --- /dev/null +++ b/src/main/scala/gitbucket/core/util/RepoitoryName.scala @@ -0,0 +1,18 @@ +package gitbucket.core.util + +case class RepositoryName(owner:String, name:String){ + val fullName = s"${owner}/${name}" +} + +object RepositoryName{ + def apply(fullName: String): RepositoryName = { + fullName.split("/").toList match { + case owner :: name :: Nil => RepositoryName(owner, name) + case _ => throw new IllegalArgumentException(s"${fullName} is not repositoryName (only 'owner/name')") + } + } + def apply(repository: gitbucket.core.model.Repository): RepositoryName = RepositoryName(repository.userName, repository.repositoryName) + def apply(repository: gitbucket.core.util.JGitUtil.RepositoryInfo): RepositoryName = RepositoryName(repository.owner, repository.name) + def apply(repository: gitbucket.core.service.RepositoryService.RepositoryInfo): RepositoryName = RepositoryName(repository.owner, repository.name) + def apply(repository: gitbucket.core.model.CommitStatus): RepositoryName = RepositoryName(repository.userName, repository.repositoryName) +} diff --git a/src/main/scala/gitbucket/core/util/StringUtil.scala b/src/main/scala/gitbucket/core/util/StringUtil.scala new file mode 100644 index 0000000..4bb1cb0 --- /dev/null +++ b/src/main/scala/gitbucket/core/util/StringUtil.scala @@ -0,0 +1,83 @@ +package gitbucket.core.util + +import java.net.{URLDecoder, URLEncoder} +import org.mozilla.universalchardet.UniversalDetector +import ControlUtil._ +import org.apache.commons.io.input.BOMInputStream +import org.apache.commons.io.IOUtils + +object StringUtil { + + def sha1(value: String): String = + defining(java.security.MessageDigest.getInstance("SHA-1")){ md => + md.update(value.getBytes) + md.digest.map(b => "%02x".format(b)).mkString + } + + def md5(value: String): String = { + val md = java.security.MessageDigest.getInstance("MD5") + md.update(value.getBytes) + md.digest.map(b => "%02x".format(b)).mkString + } + + def urlEncode(value: String): String = URLEncoder.encode(value, "UTF-8") + + def urlDecode(value: String): String = URLDecoder.decode(value, "UTF-8") + + def splitWords(value: String): Array[String] = value.split("[ \\t ]+") + + def escapeHtml(value: String): String = + value.replace("&", "&").replace("<", "<").replace(">", ">").replace("\"", """) + + /** + * Make string from byte array. Character encoding is detected automatically by [[StringUtil.detectEncoding]]. + * And if given bytes contains UTF-8 BOM, it's removed from returned string. + */ + def convertFromByteArray(content: Array[Byte]): String = + IOUtils.toString(new BOMInputStream(new java.io.ByteArrayInputStream(content)), detectEncoding(content)) + + def detectEncoding(content: Array[Byte]): String = + defining(new UniversalDetector(null)){ detector => + detector.handleData(content, 0, content.length) + detector.dataEnd() + detector.getDetectedCharset match { + case null => "UTF-8" + case e => e + } + } + + /** + * Converts line separator in the given content. + * + * @param content the content + * @param lineSeparator "LF" or "CRLF" + * @return the converted content + */ + def convertLineSeparator(content: String, lineSeparator: String): String = { + val lf = content.replace("\r\n", "\n").replace("\r", "\n") + if(lineSeparator == "CRLF"){ + lf.replace("\n", "\r\n") + } else { + lf + } + } + + /** + * Extract issue id like ```#issueId``` from the given message. + * + *@param message the message which may contains issue id + * @return the iterator of issue id + */ + def extractIssueId(message: String): Iterator[String] = + "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(message).matchData.map(_.group(2)) + + /** + * Extract close issue id like ```close #issueId ``` from the given message. + * + * @param message the message which may contains close command + * @return the iterator of issue id + */ + def extractCloseId(message: String): Iterator[String] = + "(?i)(? + if(in != null){ + val sql = IOUtils.toString(in, "UTF-8") + using(conn.createStatement()){ stmt => + logger.debug(sqlPath + "=" + sql) + stmt.executeUpdate(sql) + } + } + } + } + + + /** + * MAJOR.MINOR + */ + val versionString = s"${majorVersion}.${minorVersion}" + +} + +object Versions { + + private val logger = LoggerFactory.getLogger(Versions.getClass) + + def update(conn: Connection, headVersion: Version, currentVersion: Version, versions: Seq[Version], cl: ClassLoader) + (save: Connection => Unit): Unit = { + logger.debug("Start schema update") + try { + if(currentVersion == headVersion){ + logger.debug("No update") + } else if(currentVersion.versionString != "0.0" && !versions.contains(currentVersion)){ + logger.warn(s"Skip migration because ${currentVersion.versionString} is illegal version.") + } else { + versions.takeWhile(_ != currentVersion).reverse.foreach(_.update(conn, cl)) + save(conn) + logger.debug(s"Updated from ${currentVersion.versionString} to ${headVersion.versionString}") + } + } catch { + case ex: Throwable => { + logger.error("Failed to schema update", ex) + ex.printStackTrace() + conn.rollback() + } + } + logger.debug("End schema update") + } + +} + diff --git a/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala b/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala new file mode 100644 index 0000000..8d316ab --- /dev/null +++ b/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala @@ -0,0 +1,52 @@ +package gitbucket.core.view + +import gitbucket.core.controller.Context +import gitbucket.core.service.RequestCache +import gitbucket.core.util.StringUtil +import play.twirl.api.Html + +trait AvatarImageProvider { self: RequestCache => + + /** + * Returns <img> which displays the avatar icon. + * Looks up Gravatar if avatar icon has not been configured in user settings. + */ + protected def getAvatarImageHtml(userName: String, size: Int, + mailAddress: String = "", tooltip: Boolean = false)(implicit context: Context): Html = { + + val src = if(mailAddress.isEmpty){ + // by user name + getAccountByUserName(userName).map { account => + if(account.image.isEmpty && context.settings.gravatar){ + s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}&d=retro&r=g""" + } else { + s"""${context.path}/${account.userName}/_avatar""" + } + } getOrElse { + s"""${context.path}/_unknown/_avatar""" + } + } else { + // by mail address + getAccountByMailAddress(mailAddress).map { account => + if(account.image.isEmpty && context.settings.gravatar){ + s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}&d=retro&r=g""" + } else { + s"""${context.path}/${account.userName}/_avatar""" + } + } getOrElse { + if(context.settings.gravatar){ + s"""https://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}&d=retro&r=g""" + } else { + s"""${context.path}/_unknown/_avatar""" + } + } + } + + if(tooltip){ + Html(s"""
") + text = text.substring(1) + } + printer.printEncoded(text) + printer.print("") + } +} + +class GitBucketHtmlSerializer( + markdown: String, + repository: RepositoryService.RepositoryInfo, + enableWikiLink: Boolean, + enableRefsLink: Boolean, + enableTaskList: Boolean, + hasWritePermission: Boolean, + pages: List[String] + )(implicit val context: Context) extends ToHtmlSerializer( + new GitBucketLinkRender(context, repository, enableWikiLink, pages), + Map[String, VerbatimSerializer](VerbatimSerializer.DEFAULT -> new GitBucketVerbatimSerializer).asJava + ) with LinkConverter with RequestCache { + + override protected def printImageTag(imageNode: SuperNode, url: String): Unit = { + printer.print("") + .print("
- """).indent(+2)
+ visitChildren(node)
+ printer.indent(-2).println().print("
") + }" + ) + } + } + + /** + * Returns <img> which displays the avatar icon for the given user name. + * This method looks up Gravatar if avatar icon has not been configured in user settings. + */ + def avatar(userName: String, size: Int, tooltip: Boolean = false)(implicit context: Context): Html = + getAvatarImageHtml(userName, size, "", tooltip) + + /** + * Returns <img> which displays the avatar icon for the given mail address. + * This method looks up Gravatar if avatar icon has not been configured in user settings. + */ + def avatar(commit: JGitUtil.CommitInfo, size: Int)(implicit context: Context): Html = + getAvatarImageHtml(commit.authorName, size, commit.authorEmailAddress) + + /** + * Converts commit id, issue id and username to the link. + */ + def link(value: String, repository: RepositoryService.RepositoryInfo)(implicit context: Context): Html = + Html(convertRefsLinks(value, repository)) + + def cut(value: String, length: Int): String = + if(value.length > length){ + value.substring(0, length) + "..." + } else { + value + } + + import scala.util.matching.Regex._ + implicit class RegexReplaceString(s: String) { + def replaceAll(pattern: String, replacer: (Match) => String): String = { + pattern.r.replaceAllIn(s, replacer) + } + } + + /** + * Convert link notations in the activity message. + */ + def activityMessage(message: String)(implicit context: Context): Html = + Html(message + .replaceAll("\\[issue:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]" , s"""$$1/$$2#$$3""") + .replaceAll("\\[pullreq:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]" , s"""$$1/$$2#$$3""") + .replaceAll("\\[repo:([^\\s]+?)/([^\\s]+?)\\]" , s"""$$1/$$2""") + .replaceAll("\\[branch:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]" , (m: Match) => s"""${m.group(3)}""") + .replaceAll("\\[tag:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]" , (m: Match) => s"""${m.group(3)}""") + .replaceAll("\\[user:([^\\s]+?)\\]" , (m: Match) => user(m.group(1)).body) + .replaceAll("\\[commit:([^\\s]+?)/([^\\s]+?)\\@([^\\s]+?)\\]", (m: Match) => s"""${m.group(1)}/${m.group(2)}@${m.group(3).substring(0, 7)}""") + ) + + /** + * URL encode except '/'. + */ + def encodeRefName(value: String): String = StringUtil.urlEncode(value).replace("%2F", "/") + + def urlEncode(value: String): String = StringUtil.urlEncode(value) + + def urlEncode(value: Option[String]): String = value.map(urlEncode).getOrElse("") + + /** + * Generates the url to the repository. + */ + def url(repository: RepositoryService.RepositoryInfo)(implicit context: Context): String = + s"${context.path}/${repository.owner}/${repository.name}" + + /** + * Generates the url to the account page. + */ + def url(userName: String)(implicit context: Context): String = s"${context.path}/${userName}" + + /** + * Returns the url to the root of assets. + */ + def assets(implicit context: Context): String = s"${context.path}/assets" + + /** + * Generates the text link to the account page. + * If user does not exist or disabled, this method returns user name as text without link. + */ + def user(userName: String, mailAddress: String = "", styleClass: String = "")(implicit context: Context): Html = + userWithContent(userName, mailAddress, styleClass)(Html(userName)) + + /** + * Generates the avatar link to the account page. + * If user does not exist or disabled, this method returns avatar image without link. + */ + def avatarLink(userName: String, size: Int, mailAddress: String = "", tooltip: Boolean = false)(implicit context: Context): Html = + userWithContent(userName, mailAddress)(avatar(userName, size, tooltip)) + + private def userWithContent(userName: String, mailAddress: String = "", styleClass: String = "")(content: Html)(implicit context: Context): Html = + (if(mailAddress.isEmpty){ + getAccountByUserName(userName) + } else { + getAccountByMailAddress(mailAddress) + }).map { account => + Html(s"""${content}""") + } getOrElse content + + + /** + * Test whether the given Date is past date. + */ + def isPast(date: Date): Boolean = System.currentTimeMillis > date.getTime + + /** + * Returns file type for AceEditor. + */ + def editorType(fileName: String): String = { + fileName.toLowerCase match { + case x if(x.endsWith(".bat")) => "batchfile" + case x if(x.endsWith(".java")) => "java" + case x if(x.endsWith(".scala")) => "scala" + case x if(x.endsWith(".js")) => "javascript" + case x if(x.endsWith(".css")) => "css" + case x if(x.endsWith(".md")) => "markdown" + case x if(x.endsWith(".html")) => "html" + case x if(x.endsWith(".xml")) => "xml" + case x if(x.endsWith(".c")) => "c_cpp" + case x if(x.endsWith(".cpp")) => "c_cpp" + case x if(x.endsWith(".coffee")) => "coffee" + case x if(x.endsWith(".ejs")) => "ejs" + case x if(x.endsWith(".hs")) => "haskell" + case x if(x.endsWith(".json")) => "json" + case x if(x.endsWith(".jsp")) => "jsp" + case x if(x.endsWith(".jsx")) => "jsx" + case x if(x.endsWith(".cl")) => "lisp" + case x if(x.endsWith(".clojure")) => "lisp" + case x if(x.endsWith(".lua")) => "lua" + case x if(x.endsWith(".php")) => "php" + case x if(x.endsWith(".py")) => "python" + case x if(x.endsWith(".rdoc")) => "rdoc" + case x if(x.endsWith(".rhtml")) => "rhtml" + case x if(x.endsWith(".ruby")) => "ruby" + case x if(x.endsWith(".sh")) => "sh" + case x if(x.endsWith(".sql")) => "sql" + case x if(x.endsWith(".tcl")) => "tcl" + case x if(x.endsWith(".vbs")) => "vbscript" + case x if(x.endsWith(".yml")) => "yaml" + case _ => "plain_text" + } + } + + def pre(value: Html): Html = Html(s"
${value.body.trim.split("\n").map(_.trim).mkString("\n")}")
+
+ /**
+ * Implicit conversion to add mkHtml() to Seq[Html].
+ */
+ implicit class RichHtmlSeq(seq: Seq[Html]) {
+ def mkHtml(separator: String) = Html(seq.mkString(separator))
+ def mkHtml(separator: scala.xml.Elem) = Html(seq.mkString(separator.toString))
+ }
+
+ def commitStateIcon(state: CommitState) = Html(state match {
+ case CommitState.PENDING => "●"
+ case CommitState.SUCCESS => "✔"
+ case CommitState.ERROR => "×"
+ case CommitState.FAILURE => "×"
+ })
+
+ def commitStateText(state: CommitState, commitId:String) = state match {
+ case CommitState.PENDING => "Waiting to hear about "+commitId.substring(0,8)
+ case CommitState.SUCCESS => "All is well"
+ case CommitState.ERROR => "Failed"
+ case CommitState.FAILURE => "Failed"
+ }
+}
diff --git a/src/main/scala/model/AccessToken.scala b/src/main/scala/model/AccessToken.scala
deleted file mode 100644
index 2695c2f..0000000
--- a/src/main/scala/model/AccessToken.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package model
-
-trait AccessTokenComponent { self: Profile =>
- import profile.simple._
- lazy val AccessTokens = TableQuery[AccessTokens]
-
- class AccessTokens(tag: Tag) extends Table[AccessToken](tag, "ACCESS_TOKEN") {
- val accessTokenId = column[Int]("ACCESS_TOKEN_ID", O AutoInc)
- val userName = column[String]("USER_NAME")
- val tokenHash = column[String]("TOKEN_HASH")
- val note = column[String]("NOTE")
- def * = (accessTokenId, userName, tokenHash, note) <> (AccessToken.tupled, AccessToken.unapply)
- }
-}
-case class AccessToken(
- accessTokenId: Int = 0,
- userName: String,
- tokenHash: String,
- note: String
-)
diff --git a/src/main/scala/model/Account.scala b/src/main/scala/model/Account.scala
deleted file mode 100644
index 012c559..0000000
--- a/src/main/scala/model/Account.scala
+++ /dev/null
@@ -1,39 +0,0 @@
-package model
-
-trait AccountComponent { self: Profile =>
- import profile.simple._
- import self._
-
- lazy val Accounts = TableQuery[Accounts]
-
- class Accounts(tag: Tag) extends Table[Account](tag, "ACCOUNT") {
- val userName = column[String]("USER_NAME", O PrimaryKey)
- val fullName = column[String]("FULL_NAME")
- val mailAddress = column[String]("MAIL_ADDRESS")
- val password = column[String]("PASSWORD")
- val isAdmin = column[Boolean]("ADMINISTRATOR")
- val url = column[String]("URL")
- val registeredDate = column[java.util.Date]("REGISTERED_DATE")
- val updatedDate = column[java.util.Date]("UPDATED_DATE")
- val lastLoginDate = column[java.util.Date]("LAST_LOGIN_DATE")
- val image = column[String]("IMAGE")
- val groupAccount = column[Boolean]("GROUP_ACCOUNT")
- val removed = column[Boolean]("REMOVED")
- def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed) <> (Account.tupled, Account.unapply)
- }
-}
-
-case class Account(
- userName: String,
- fullName: String,
- mailAddress: String,
- password: String,
- isAdmin: Boolean,
- url: Option[String],
- registeredDate: java.util.Date,
- updatedDate: java.util.Date,
- lastLoginDate: Option[java.util.Date],
- image: Option[String],
- isGroupAccount: Boolean,
- isRemoved: Boolean
-)
diff --git a/src/main/scala/model/Activity.scala b/src/main/scala/model/Activity.scala
deleted file mode 100644
index 8e3960e..0000000
--- a/src/main/scala/model/Activity.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-package model
-
-trait ActivityComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
- import self._
-
- lazy val Activities = TableQuery[Activities]
-
- class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate {
- val activityId = column[Int]("ACTIVITY_ID", O AutoInc)
- val activityUserName = column[String]("ACTIVITY_USER_NAME")
- val activityType = column[String]("ACTIVITY_TYPE")
- val message = column[String]("MESSAGE")
- val additionalInfo = column[String]("ADDITIONAL_INFO")
- val activityDate = column[java.util.Date]("ACTIVITY_DATE")
- def * = (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply)
- }
-}
-
-case class Activity(
- userName: String,
- repositoryName: String,
- activityUserName: String,
- activityType: String,
- message: String,
- additionalInfo: Option[String],
- activityDate: java.util.Date,
- activityId: Int = 0
-)
diff --git a/src/main/scala/model/BasicTemplate.scala b/src/main/scala/model/BasicTemplate.scala
deleted file mode 100644
index 1d012c1..0000000
--- a/src/main/scala/model/BasicTemplate.scala
+++ /dev/null
@@ -1,57 +0,0 @@
-package model
-
-protected[model] trait TemplateComponent { self: Profile =>
- import profile.simple._
-
- trait BasicTemplate { self: Table[_] =>
- val userName = column[String]("USER_NAME")
- val repositoryName = column[String]("REPOSITORY_NAME")
-
- def byRepository(owner: String, repository: String) =
- (userName === owner.bind) && (repositoryName === repository.bind)
-
- def byRepository(userName: Column[String], repositoryName: Column[String]) =
- (this.userName === userName) && (this.repositoryName === repositoryName)
- }
-
- trait IssueTemplate extends BasicTemplate { self: Table[_] =>
- val issueId = column[Int]("ISSUE_ID")
-
- def byIssue(owner: String, repository: String, issueId: Int) =
- byRepository(owner, repository) && (this.issueId === issueId.bind)
-
- def byIssue(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) =
- byRepository(userName, repositoryName) && (this.issueId === issueId)
- }
-
- trait LabelTemplate extends BasicTemplate { self: Table[_] =>
- val labelId = column[Int]("LABEL_ID")
-
- def byLabel(owner: String, repository: String, labelId: Int) =
- byRepository(owner, repository) && (this.labelId === labelId.bind)
-
- def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
- byRepository(userName, repositoryName) && (this.labelId === labelId)
- }
-
- trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
- val milestoneId = column[Int]("MILESTONE_ID")
-
- def byMilestone(owner: String, repository: String, milestoneId: Int) =
- byRepository(owner, repository) && (this.milestoneId === milestoneId.bind)
-
- def byMilestone(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) =
- byRepository(userName, repositoryName) && (this.milestoneId === milestoneId)
- }
-
- trait CommitTemplate extends BasicTemplate { self: Table[_] =>
- val commitId = column[String]("COMMIT_ID")
-
- def byCommit(owner: String, repository: String, commitId: String) =
- byRepository(owner, repository) && (this.commitId === commitId)
-
- def byCommit(owner: Column[String], repository: Column[String], commitId: Column[String]) =
- byRepository(userName, repositoryName) && (this.commitId === commitId)
- }
-
-}
diff --git a/src/main/scala/model/Collaborator.scala b/src/main/scala/model/Collaborator.scala
deleted file mode 100644
index 88311e1..0000000
--- a/src/main/scala/model/Collaborator.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-package model
-
-trait CollaboratorComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
-
- lazy val Collaborators = TableQuery[Collaborators]
-
- class Collaborators(tag: Tag) extends Table[Collaborator](tag, "COLLABORATOR") with BasicTemplate {
- val collaboratorName = column[String]("COLLABORATOR_NAME")
- def * = (userName, repositoryName, collaboratorName) <> (Collaborator.tupled, Collaborator.unapply)
-
- def byPrimaryKey(owner: String, repository: String, collaborator: String) =
- byRepository(owner, repository) && (collaboratorName === collaborator.bind)
- }
-}
-
-case class Collaborator(
- userName: String,
- repositoryName: String,
- collaboratorName: String
-)
diff --git a/src/main/scala/model/Comment.scala b/src/main/scala/model/Comment.scala
deleted file mode 100644
index 9569871..0000000
--- a/src/main/scala/model/Comment.scala
+++ /dev/null
@@ -1,78 +0,0 @@
-package model
-
-trait Comment {
- val commentedUserName: String
- val registeredDate: java.util.Date
-}
-
-trait IssueCommentComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
- import self._
-
- lazy val IssueComments = new TableQuery(tag => new IssueComments(tag)){
- def autoInc = this returning this.map(_.commentId)
- }
-
- class IssueComments(tag: Tag) extends Table[IssueComment](tag, "ISSUE_COMMENT") with IssueTemplate {
- val commentId = column[Int]("COMMENT_ID", O AutoInc)
- val action = column[String]("ACTION")
- val commentedUserName = column[String]("COMMENTED_USER_NAME")
- val content = column[String]("CONTENT")
- val registeredDate = column[java.util.Date]("REGISTERED_DATE")
- val updatedDate = column[java.util.Date]("UPDATED_DATE")
- def * = (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate) <> (IssueComment.tupled, IssueComment.unapply)
-
- def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
- }
-}
-
-case class IssueComment (
- userName: String,
- repositoryName: String,
- issueId: Int,
- commentId: Int = 0,
- action: String,
- commentedUserName: String,
- content: String,
- registeredDate: java.util.Date,
- updatedDate: java.util.Date
-) extends Comment
-
-trait CommitCommentComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
- import self._
-
- lazy val CommitComments = new TableQuery(tag => new CommitComments(tag)){
- def autoInc = this returning this.map(_.commentId)
- }
-
- class CommitComments(tag: Tag) extends Table[CommitComment](tag, "COMMIT_COMMENT") with CommitTemplate {
- val commentId = column[Int]("COMMENT_ID", O AutoInc)
- val commentedUserName = column[String]("COMMENTED_USER_NAME")
- val content = column[String]("CONTENT")
- val fileName = column[Option[String]]("FILE_NAME")
- val oldLine = column[Option[Int]]("OLD_LINE_NUMBER")
- val newLine = column[Option[Int]]("NEW_LINE_NUMBER")
- val registeredDate = column[java.util.Date]("REGISTERED_DATE")
- val updatedDate = column[java.util.Date]("UPDATED_DATE")
- val pullRequest = column[Boolean]("PULL_REQUEST")
- def * = (userName, repositoryName, commitId, commentId, commentedUserName, content, fileName, oldLine, newLine, registeredDate, updatedDate, pullRequest) <> (CommitComment.tupled, CommitComment.unapply)
-
- def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
- }
-}
-
-case class CommitComment(
- userName: String,
- repositoryName: String,
- commitId: String,
- commentId: Int = 0,
- commentedUserName: String,
- content: String,
- fileName: Option[String],
- oldLine: Option[Int],
- newLine: Option[Int],
- registeredDate: java.util.Date,
- updatedDate: java.util.Date,
- pullRequest: Boolean
- ) extends Comment
diff --git a/src/main/scala/model/CommitStatus.scala b/src/main/scala/model/CommitStatus.scala
deleted file mode 100644
index 47a2343..0000000
--- a/src/main/scala/model/CommitStatus.scala
+++ /dev/null
@@ -1,71 +0,0 @@
-package model
-
-import scala.slick.lifted.MappedTo
-import scala.slick.jdbc._
-
-trait CommitStatusComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
- import self._
-
- implicit val commitStateColumnType = MappedColumnType.base[CommitState, String](b => b.name , i => CommitState(i))
-
- lazy val CommitStatuses = TableQuery[CommitStatuses]
- class CommitStatuses(tag: Tag) extends Table[CommitStatus](tag, "COMMIT_STATUS") with CommitTemplate {
- val commitStatusId = column[Int]("COMMIT_STATUS_ID", O AutoInc)
- val context = column[String]("CONTEXT")
- val state = column[CommitState]("STATE")
- val targetUrl = column[Option[String]]("TARGET_URL")
- val description = column[Option[String]]("DESCRIPTION")
- val creator = column[String]("CREATOR")
- val registeredDate = column[java.util.Date]("REGISTERED_DATE")
- val updatedDate = column[java.util.Date]("UPDATED_DATE")
- def * = (commitStatusId, userName, repositoryName, commitId, context, state, targetUrl, description, creator, registeredDate, updatedDate) <> (CommitStatus.tupled, CommitStatus.unapply)
- def byPrimaryKey(id: Int) = commitStatusId === id.bind
- }
-}
-
-case class CommitStatus(
- commitStatusId: Int = 0,
- userName: String,
- repositoryName: String,
- commitId: String,
- context: String,
- state: CommitState,
- targetUrl: Option[String],
- description: Option[String],
- creator: String,
- registeredDate: java.util.Date,
- updatedDate: java.util.Date
-)
-sealed abstract class CommitState(val name: String)
-object CommitState {
- object ERROR extends CommitState("error")
- object FAILURE extends CommitState("failure")
- object PENDING extends CommitState("pending")
- object SUCCESS extends CommitState("success")
-
- val values: Vector[CommitState] = Vector(PENDING, SUCCESS, ERROR, FAILURE)
- private val map: Map[String, CommitState] = values.map(enum => enum.name -> enum).toMap
- def apply(name: String): CommitState = map(name)
- def valueOf(name: String): Option[CommitState] = map.get(name)
-
- /**
- * failure if any of the contexts report as error or failure
- * pending if there are no statuses or a context is pending
- * success if the latest status for all contexts is success
- */
- def combine(statuses: Set[CommitState]): CommitState = {
- if(statuses.isEmpty){
- PENDING
- }else if(statuses.contains(CommitState.ERROR) || statuses.contains(CommitState.FAILURE)){
- FAILURE
- }else if(statuses.contains(CommitState.PENDING)){
- PENDING
- }else{
- SUCCESS
- }
- }
-
- implicit val getResult: GetResult[CommitState] = GetResult(r => CommitState(r.<<))
- implicit val getResultOpt: GetResult[Option[CommitState]] = GetResult(r => r.<
- import profile.simple._
-
- lazy val GroupMembers = TableQuery[GroupMembers]
-
- class GroupMembers(tag: Tag) extends Table[GroupMember](tag, "GROUP_MEMBER") {
- val groupName = column[String]("GROUP_NAME", O PrimaryKey)
- val userName = column[String]("USER_NAME", O PrimaryKey)
- val isManager = column[Boolean]("MANAGER")
- def * = (groupName, userName, isManager) <> (GroupMember.tupled, GroupMember.unapply)
- }
-}
-
-case class GroupMember(
- groupName: String,
- userName: String,
- isManager: Boolean
-)
diff --git a/src/main/scala/model/Issue.scala b/src/main/scala/model/Issue.scala
deleted file mode 100644
index 85c6014..0000000
--- a/src/main/scala/model/Issue.scala
+++ /dev/null
@@ -1,49 +0,0 @@
-package model
-
-trait IssueComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
- import self._
-
- lazy val IssueId = TableQuery[IssueId]
- lazy val IssueOutline = TableQuery[IssueOutline]
- lazy val Issues = TableQuery[Issues]
-
- class IssueId(tag: Tag) extends Table[(String, String, Int)](tag, "ISSUE_ID") with IssueTemplate {
- def * = (userName, repositoryName, issueId)
- def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
- }
-
- class IssueOutline(tag: Tag) extends Table[(String, String, Int, Int)](tag, "ISSUE_OUTLINE_VIEW") with IssueTemplate {
- val commentCount = column[Int]("COMMENT_COUNT")
- def * = (userName, repositoryName, issueId, commentCount)
- }
-
- class Issues(tag: Tag) extends Table[Issue](tag, "ISSUE") with IssueTemplate with MilestoneTemplate {
- val openedUserName = column[String]("OPENED_USER_NAME")
- val assignedUserName = column[String]("ASSIGNED_USER_NAME")
- val title = column[String]("TITLE")
- val content = column[String]("CONTENT")
- val closed = column[Boolean]("CLOSED")
- val registeredDate = column[java.util.Date]("REGISTERED_DATE")
- val updatedDate = column[java.util.Date]("UPDATED_DATE")
- val pullRequest = column[Boolean]("PULL_REQUEST")
- def * = (userName, repositoryName, issueId, openedUserName, milestoneId.?, assignedUserName.?, title, content.?, closed, registeredDate, updatedDate, pullRequest) <> (Issue.tupled, Issue.unapply)
-
- def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
- }
-}
-
-case class Issue(
- userName: String,
- repositoryName: String,
- issueId: Int,
- openedUserName: String,
- milestoneId: Option[Int],
- assignedUserName: Option[String],
- title: String,
- content: Option[String],
- closed: Boolean,
- registeredDate: java.util.Date,
- updatedDate: java.util.Date,
- isPullRequest: Boolean
-)
diff --git a/src/main/scala/model/IssueLabels.scala b/src/main/scala/model/IssueLabels.scala
deleted file mode 100644
index 5d42272..0000000
--- a/src/main/scala/model/IssueLabels.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package model
-
-trait IssueLabelComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
-
- lazy val IssueLabels = TableQuery[IssueLabels]
-
- class IssueLabels(tag: Tag) extends Table[IssueLabel](tag, "ISSUE_LABEL") with IssueTemplate with LabelTemplate {
- def * = (userName, repositoryName, issueId, labelId) <> (IssueLabel.tupled, IssueLabel.unapply)
- def byPrimaryKey(owner: String, repository: String, issueId: Int, labelId: Int) =
- byIssue(owner, repository, issueId) && (this.labelId === labelId.bind)
- }
-}
-
-case class IssueLabel(
- userName: String,
- repositoryName: String,
- issueId: Int,
- labelId: Int
-)
diff --git a/src/main/scala/model/Labels.scala b/src/main/scala/model/Labels.scala
deleted file mode 100644
index 47c6a2b..0000000
--- a/src/main/scala/model/Labels.scala
+++ /dev/null
@@ -1,37 +0,0 @@
-package model
-
-trait LabelComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
-
- lazy val Labels = TableQuery[Labels]
-
- class Labels(tag: Tag) extends Table[Label](tag, "LABEL") with LabelTemplate {
- override val labelId = column[Int]("LABEL_ID", O AutoInc)
- val labelName = column[String]("LABEL_NAME")
- val color = column[String]("COLOR")
- def * = (userName, repositoryName, labelId, labelName, color) <> (Label.tupled, Label.unapply)
-
- def byPrimaryKey(owner: String, repository: String, labelId: Int) = byLabel(owner, repository, labelId)
- def byPrimaryKey(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) = byLabel(userName, repositoryName, labelId)
- }
-}
-
-case class Label(
- userName: String,
- repositoryName: String,
- labelId: Int = 0,
- labelName: String,
- color: String){
-
- val fontColor = {
- val r = color.substring(0, 2)
- val g = color.substring(2, 4)
- val b = color.substring(4, 6)
-
- if(Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408){
- "000000"
- } else {
- "ffffff"
- }
- }
-}
diff --git a/src/main/scala/model/Milestone.scala b/src/main/scala/model/Milestone.scala
deleted file mode 100644
index c392219..0000000
--- a/src/main/scala/model/Milestone.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-package model
-
-trait MilestoneComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
- import self._
-
- lazy val Milestones = TableQuery[Milestones]
-
- class Milestones(tag: Tag) extends Table[Milestone](tag, "MILESTONE") with MilestoneTemplate {
- override val milestoneId = column[Int]("MILESTONE_ID", O AutoInc)
- val title = column[String]("TITLE")
- val description = column[String]("DESCRIPTION")
- val dueDate = column[java.util.Date]("DUE_DATE")
- val closedDate = column[java.util.Date]("CLOSED_DATE")
- def * = (userName, repositoryName, milestoneId, title, description.?, dueDate.?, closedDate.?) <> (Milestone.tupled, Milestone.unapply)
-
- def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId)
- def byPrimaryKey(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) = byMilestone(userName, repositoryName, milestoneId)
- }
-}
-
-case class Milestone(
- userName: String,
- repositoryName: String,
- milestoneId: Int = 0,
- title: String,
- description: Option[String],
- dueDate: Option[java.util.Date],
- closedDate: Option[java.util.Date]
-)
diff --git a/src/main/scala/model/Plugin.scala b/src/main/scala/model/Plugin.scala
deleted file mode 100644
index bc85ca0..0000000
--- a/src/main/scala/model/Plugin.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package model
-
-trait PluginComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
- import self._
-
- lazy val Plugins = TableQuery[Plugins]
-
- class Plugins(tag: Tag) extends Table[Plugin](tag, "PLUGIN"){
- val pluginId = column[String]("PLUGIN_ID", O PrimaryKey)
- val version = column[String]("VERSION")
- def * = (pluginId, version) <> (Plugin.tupled, Plugin.unapply)
- }
-}
-
-case class Plugin(
- pluginId: String,
- version: String
-)
diff --git a/src/main/scala/model/Profile.scala b/src/main/scala/model/Profile.scala
deleted file mode 100644
index b88bb05..0000000
--- a/src/main/scala/model/Profile.scala
+++ /dev/null
@@ -1,45 +0,0 @@
-package model
-
-trait Profile {
- val profile: slick.driver.JdbcProfile
- import profile.simple._
-
- // java.util.Date Mapped Column Types
- implicit val dateColumnType = MappedColumnType.base[java.util.Date, java.sql.Timestamp](
- d => new java.sql.Timestamp(d.getTime),
- t => new java.util.Date(t.getTime)
- )
-
- implicit class RichColumn(c1: Column[Boolean]){
- def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
- }
-
-}
-
-object Profile extends {
- val profile = slick.driver.H2Driver
-
-} with AccessTokenComponent
- with AccountComponent
- with ActivityComponent
- with CollaboratorComponent
- with CommitCommentComponent
- with CommitStatusComponent
- with GroupMemberComponent
- with IssueComponent
- with IssueCommentComponent
- with IssueLabelComponent
- with LabelComponent
- with MilestoneComponent
- with PullRequestComponent
- with RepositoryComponent
- with SshKeyComponent
- with WebHookComponent
- with PluginComponent with Profile {
-
- /**
- * Returns system date.
- */
- def currentDate = new java.util.Date()
-
-}
diff --git a/src/main/scala/model/PullRequest.scala b/src/main/scala/model/PullRequest.scala
deleted file mode 100644
index 3ba87ea..0000000
--- a/src/main/scala/model/PullRequest.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package model
-
-trait PullRequestComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
-
- lazy val PullRequests = TableQuery[PullRequests]
-
- class PullRequests(tag: Tag) extends Table[PullRequest](tag, "PULL_REQUEST") with IssueTemplate {
- val branch = column[String]("BRANCH")
- val requestUserName = column[String]("REQUEST_USER_NAME")
- val requestRepositoryName = column[String]("REQUEST_REPOSITORY_NAME")
- val requestBranch = column[String]("REQUEST_BRANCH")
- val commitIdFrom = column[String]("COMMIT_ID_FROM")
- val commitIdTo = column[String]("COMMIT_ID_TO")
- def * = (userName, repositoryName, issueId, branch, requestUserName, requestRepositoryName, requestBranch, commitIdFrom, commitIdTo) <> (PullRequest.tupled, PullRequest.unapply)
-
- def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
- def byPrimaryKey(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) = byIssue(userName, repositoryName, issueId)
- }
-}
-
-case class PullRequest(
- userName: String,
- repositoryName: String,
- issueId: Int,
- branch: String,
- requestUserName: String,
- requestRepositoryName: String,
- requestBranch: String,
- commitIdFrom: String,
- commitIdTo: String
-)
diff --git a/src/main/scala/model/Repository.scala b/src/main/scala/model/Repository.scala
deleted file mode 100644
index 5a888fc..0000000
--- a/src/main/scala/model/Repository.scala
+++ /dev/null
@@ -1,39 +0,0 @@
-package model
-
-trait RepositoryComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
- import self._
-
- lazy val Repositories = TableQuery[Repositories]
-
- class Repositories(tag: Tag) extends Table[Repository](tag, "REPOSITORY") with BasicTemplate {
- val isPrivate = column[Boolean]("PRIVATE")
- val description = column[String]("DESCRIPTION")
- val defaultBranch = column[String]("DEFAULT_BRANCH")
- val registeredDate = column[java.util.Date]("REGISTERED_DATE")
- val updatedDate = column[java.util.Date]("UPDATED_DATE")
- val lastActivityDate = column[java.util.Date]("LAST_ACTIVITY_DATE")
- val originUserName = column[String]("ORIGIN_USER_NAME")
- val originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
- val parentUserName = column[String]("PARENT_USER_NAME")
- val parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME")
- def * = (userName, repositoryName, isPrivate, description.?, defaultBranch, registeredDate, updatedDate, lastActivityDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?) <> (Repository.tupled, Repository.unapply)
-
- def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
- }
-}
-
-case class Repository(
- userName: String,
- repositoryName: String,
- isPrivate: Boolean,
- description: Option[String],
- defaultBranch: String,
- registeredDate: java.util.Date,
- updatedDate: java.util.Date,
- lastActivityDate: java.util.Date,
- originUserName: Option[String],
- originRepositoryName: Option[String],
- parentUserName: Option[String],
- parentRepositoryName: Option[String]
-)
diff --git a/src/main/scala/model/SshKey.scala b/src/main/scala/model/SshKey.scala
deleted file mode 100644
index dcf3463..0000000
--- a/src/main/scala/model/SshKey.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package model
-
-trait SshKeyComponent { self: Profile =>
- import profile.simple._
-
- lazy val SshKeys = TableQuery[SshKeys]
-
- class SshKeys(tag: Tag) extends Table[SshKey](tag, "SSH_KEY") {
- val userName = column[String]("USER_NAME")
- val sshKeyId = column[Int]("SSH_KEY_ID", O AutoInc)
- val title = column[String]("TITLE")
- val publicKey = column[String]("PUBLIC_KEY")
- def * = (userName, sshKeyId, title, publicKey) <> (SshKey.tupled, SshKey.unapply)
-
- def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName === userName.bind) && (this.sshKeyId === sshKeyId.bind)
- }
-}
-
-case class SshKey(
- userName: String,
- sshKeyId: Int = 0,
- title: String,
- publicKey: String
-)
diff --git a/src/main/scala/model/WebHook.scala b/src/main/scala/model/WebHook.scala
deleted file mode 100644
index 4c13c87..0000000
--- a/src/main/scala/model/WebHook.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package model
-
-trait WebHookComponent extends TemplateComponent { self: Profile =>
- import profile.simple._
-
- lazy val WebHooks = TableQuery[WebHooks]
-
- class WebHooks(tag: Tag) extends Table[WebHook](tag, "WEB_HOOK") with BasicTemplate {
- val url = column[String]("URL")
- def * = (userName, repositoryName, url) <> (WebHook.tupled, WebHook.unapply)
-
- def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
- }
-}
-
-case class WebHook(
- userName: String,
- repositoryName: String,
- url: String
-)
diff --git a/src/main/scala/model/package.scala b/src/main/scala/model/package.scala
deleted file mode 100644
index c65e72e..0000000
--- a/src/main/scala/model/package.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-package object model {
- type Session = slick.jdbc.JdbcBackend#Session
-}
diff --git a/src/main/scala/plugin/Plugin.scala b/src/main/scala/plugin/Plugin.scala
deleted file mode 100644
index c176874..0000000
--- a/src/main/scala/plugin/Plugin.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-package plugin
-
-import javax.servlet.ServletContext
-
-import util.Version
-
-/**
- * Trait for define plugin interface.
- * To provide plugin, put Plugin class which mixed in this trait into the package root.
- */
-trait Plugin {
-
- val pluginId: String
- val pluginName: String
- val description: String
- val versions: Seq[Version]
-
- /**
- * This method is invoked in initialization of plugin system.
- * Register plugin functionality to PluginRegistry.
- */
- def initialize(registry: PluginRegistry): Unit
-
- /**
- * This method is invoked in shutdown of plugin system.
- * If the plugin has any resources, release them in this method.
- */
- def shutdown(registry: PluginRegistry): Unit
-
-}
diff --git a/src/main/scala/plugin/PluginRegistory.scala b/src/main/scala/plugin/PluginRegistory.scala
deleted file mode 100644
index bb7c2cb..0000000
--- a/src/main/scala/plugin/PluginRegistory.scala
+++ /dev/null
@@ -1,145 +0,0 @@
-package plugin
-
-import java.io.{FilenameFilter, File}
-import java.net.URLClassLoader
-import javax.servlet.ServletContext
-import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
-
-import org.slf4j.LoggerFactory
-import service.RepositoryService.RepositoryInfo
-import util.Directory._
-import util.JDBCUtil._
-import util.{Version, Versions}
-
-import scala.collection.mutable.ListBuffer
-import app.{ControllerBase, Context}
-
-class PluginRegistry {
-
- private val plugins = new ListBuffer[PluginInfo]
- private val javaScripts = new ListBuffer[(String, String)]
- private val controllers = new ListBuffer[(ControllerBase, String)]
-
- def addPlugin(pluginInfo: PluginInfo): Unit = {
- plugins += pluginInfo
- }
-
- def getPlugins(): List[PluginInfo] = plugins.toList
-
- def addController(controller: ControllerBase, path: String): Unit = {
- controllers += ((controller, path))
- }
-
- def getControllers(): List[(ControllerBase, String)] = controllers.toList
-
- def addJavaScript(path: String, script: String): Unit = {
- javaScripts += Tuple2(path, script)
- }
-
- //def getJavaScripts(): List[(String, String)] = javaScripts.toList
-
- def getJavaScript(currentPath: String): Option[String] = {
- javaScripts.find(x => currentPath.matches(x._1)).map(_._2)
- }
-
- private case class GlobalAction(
- method: String,
- path: String,
- function: (HttpServletRequest, HttpServletResponse, Context) => Any
- )
-
- private case class RepositoryAction(
- method: String,
- path: String,
- function: (HttpServletRequest, HttpServletResponse, Context, RepositoryInfo) => Any
- )
-
-}
-
-/**
- * Provides entry point to PluginRegistry.
- */
-object PluginRegistry {
-
- private val logger = LoggerFactory.getLogger(classOf[PluginRegistry])
-
- private val instance = new PluginRegistry()
-
- /**
- * Returns the PluginRegistry singleton instance.
- */
- def apply(): PluginRegistry = instance
-
- /**
- * Initializes all installed plugins.
- */
- def initialize(context: ServletContext, conn: java.sql.Connection): Unit = {
- val pluginDir = new File(PluginHome)
- if(pluginDir.exists && pluginDir.isDirectory){
- pluginDir.listFiles(new FilenameFilter {
- override def accept(dir: File, name: String): Boolean = name.endsWith(".jar")
- }).foreach { pluginJar =>
- val classLoader = new URLClassLoader(Array(pluginJar.toURI.toURL), Thread.currentThread.getContextClassLoader)
- try {
- val plugin = classLoader.loadClass("Plugin").newInstance().asInstanceOf[Plugin]
-
- // Migration
- val headVersion = plugin.versions.head
- val currentVersion = conn.find("SELECT * FROM PLUGIN WHERE PLUGIN_ID = ?", plugin.pluginId)(_.getString("VERSION")) match {
- case Some(x) => {
- val dim = x.split("\\.")
- Version(dim(0).toInt, dim(1).toInt)
- }
- case None => Version(0, 0)
- }
-
- Versions.update(conn, headVersion, currentVersion, plugin.versions, new URLClassLoader(Array(pluginJar.toURI.toURL))){ conn =>
- currentVersion.versionString match {
- case "0.0" =>
- conn.update("INSERT INTO PLUGIN (PLUGIN_ID, VERSION) VALUES (?, ?)", plugin.pluginId, headVersion.versionString)
- case _ =>
- conn.update("UPDATE PLUGIN SET VERSION = ? WHERE PLUGIN_ID = ?", headVersion.versionString, plugin.pluginId)
- }
- }
-
- // Initialize
- plugin.initialize(instance)
- instance.addPlugin(PluginInfo(
- pluginId = plugin.pluginId,
- pluginName = plugin.pluginName,
- version = plugin.versions.head.versionString,
- description = plugin.description,
- pluginClass = plugin
- ))
-
- } catch {
- case e: Exception => {
- logger.error(s"Error during plugin initialization", e)
- }
- }
- }
- }
- }
-
- def shutdown(context: ServletContext): Unit = {
- instance.getPlugins().foreach { pluginInfo =>
- try {
- pluginInfo.pluginClass.shutdown(instance)
- } catch {
- case e: Exception => {
- logger.error(s"Error during plugin shutdown", e)
- }
- }
- }
- }
-
-
-}
-
-case class PluginInfo(
- pluginId: String,
- pluginName: String,
- version: String,
- description: String,
- pluginClass: Plugin
-)
\ No newline at end of file
diff --git a/src/main/scala/plugin/Results.scala b/src/main/scala/plugin/Results.scala
deleted file mode 100644
index 18fdb7f..0000000
--- a/src/main/scala/plugin/Results.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package plugin
-
-import play.twirl.api.Html
-
-/**
- * Defines result case classes returned by plugin controller.
- */
-object Results {
- case class Redirect(path: String)
- case class Fragment(html: Html)
-}
diff --git a/src/main/scala/plugin/Sessions.scala b/src/main/scala/plugin/Sessions.scala
deleted file mode 100644
index 7398c9a..0000000
--- a/src/main/scala/plugin/Sessions.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package plugin
-
-import slick.jdbc.JdbcBackend.Session
-
-/**
- * Provides Slick Session to Plug-ins.
- */
-object Sessions {
- val sessions = new ThreadLocal[Session]
- implicit def session: Session = sessions.get()
-}
diff --git a/src/main/scala/service/AccesTokenService.scala b/src/main/scala/service/AccesTokenService.scala
deleted file mode 100644
index 4de5816..0000000
--- a/src/main/scala/service/AccesTokenService.scala
+++ /dev/null
@@ -1,52 +0,0 @@
-package service
-
-import model.Profile._
-import profile.simple._
-import model.{Account, AccessToken}
-import util.StringUtil
-import scala.util.Random
-
-trait AccessTokenService {
-
- def makeAccessTokenString: String = {
- val bytes = new Array[Byte](20)
- Random.nextBytes(bytes)
- bytes.map("%02x".format(_)).mkString
- }
-
- def tokenToHash(token: String): String = StringUtil.sha1(token)
-
- /**
- * @retuen (TokenId, Token)
- */
- def generateAccessToken(userName: String, note: String)(implicit s: Session): (Int, String) = {
- var token: String = null
- var hash: String = null
- do{
- token = makeAccessTokenString
- hash = tokenToHash(token)
- }while(AccessTokens.filter(_.tokenHash === hash.bind).exists.run)
- val newToken = AccessToken(
- userName = userName,
- note = note,
- tokenHash = hash)
- val tokenId = (AccessTokens returning AccessTokens.map(_.accessTokenId)) += newToken
- (tokenId, token)
- }
-
- def getAccountByAccessToken(token: String)(implicit s: Session): Option[Account] =
- Accounts
- .innerJoin(AccessTokens)
- .filter{ case (ac, t) => (ac.userName === t.userName) && (t.tokenHash === tokenToHash(token).bind) && (ac.removed === false.bind) }
- .map{ case (ac, t) => ac }
- .firstOption
-
- def getAccessTokens(userName: String)(implicit s: Session): List[AccessToken] =
- AccessTokens.filter(_.userName === userName.bind).sortBy(_.accessTokenId.desc).list
-
- def deleteAccessToken(userName: String, accessTokenId: Int)(implicit s: Session): Unit =
- AccessTokens filter (t => t.userName === userName.bind && t.accessTokenId === accessTokenId) delete
-
-}
-
-object AccessTokenService extends AccessTokenService
diff --git a/src/main/scala/service/AccountService.scala b/src/main/scala/service/AccountService.scala
deleted file mode 100644
index 88d95fa..0000000
--- a/src/main/scala/service/AccountService.scala
+++ /dev/null
@@ -1,188 +0,0 @@
-package service
-
-import model.Profile._
-import profile.simple._
-import model.{Account, GroupMember}
-// TODO [Slick 2.0]NOT import directly?
-import model.Profile.dateColumnType
-import service.SystemSettingsService.SystemSettings
-import util.StringUtil._
-import util.LDAPUtil
-import org.slf4j.LoggerFactory
-
-trait AccountService {
-
- private val logger = LoggerFactory.getLogger(classOf[AccountService])
-
- def authenticate(settings: SystemSettings, userName: String, password: String)(implicit s: Session): Option[Account] =
- if(settings.ldapAuthentication){
- ldapAuthentication(settings, userName, password)
- } else {
- defaultAuthentication(userName, password)
- }
-
- /**
- * Authenticate by internal database.
- */
- private def defaultAuthentication(userName: String, password: String)(implicit s: Session) = {
- getAccountByUserName(userName).collect {
- case account if(!account.isGroupAccount && account.password == sha1(password)) => Some(account)
- } getOrElse None
- }
-
- /**
- * Authenticate by LDAP.
- */
- private def ldapAuthentication(settings: SystemSettings, userName: String, password: String)
- (implicit s: Session): Option[Account] = {
- LDAPUtil.authenticate(settings.ldap.get, userName, password) match {
- case Right(ldapUserInfo) => {
- // Create or update account by LDAP information
- getAccountByUserName(ldapUserInfo.userName, true) match {
- case Some(x) if(!x.isRemoved) => {
- if(settings.ldap.get.mailAttribute.getOrElse("").isEmpty) {
- updateAccount(x.copy(fullName = ldapUserInfo.fullName))
- } else {
- updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))
- }
- getAccountByUserName(ldapUserInfo.userName)
- }
- case Some(x) if(x.isRemoved) => {
- logger.info("LDAP Authentication Failed: Account is already registered but disabled.")
- defaultAuthentication(userName, password)
- }
- case None => getAccountByMailAddress(ldapUserInfo.mailAddress, true) match {
- case Some(x) if(!x.isRemoved) => {
- updateAccount(x.copy(fullName = ldapUserInfo.fullName))
- getAccountByUserName(ldapUserInfo.userName)
- }
- case Some(x) if(x.isRemoved) => {
- logger.info("LDAP Authentication Failed: Account is already registered but disabled.")
- defaultAuthentication(userName, password)
- }
- case None => {
- createAccount(ldapUserInfo.userName, "", ldapUserInfo.fullName, ldapUserInfo.mailAddress, false, None)
- getAccountByUserName(ldapUserInfo.userName)
- }
- }
- }
- }
- case Left(errorMessage) => {
- logger.info(s"LDAP Authentication Failed: ${errorMessage}")
- defaultAuthentication(userName, password)
- }
- }
- }
-
- def getAccountByUserName(userName: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
- Accounts filter(t => (t.userName === userName.bind) && (t.removed === false.bind, !includeRemoved)) firstOption
-
- def getAccountsByUserNames(userNames: Set[String], knowns:Set[Account], includeRemoved: Boolean = false)(implicit s: Session): Map[String, Account] = {
- val map = knowns.map(a => a.userName -> a).toMap
- val needs = userNames -- map.keySet
- if(needs.isEmpty){
- map
- }else{
- map ++ Accounts.filter(t => (t.userName inSetBind needs) && (t.removed === false.bind, !includeRemoved)).list.map(a => a.userName -> a).toMap
- }
- }
-
- def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
- Accounts filter(t => (t.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) && (t.removed === false.bind, !includeRemoved)) firstOption
-
- def getAllUsers(includeRemoved: Boolean = true)(implicit s: Session): List[Account] =
- if(includeRemoved){
- Accounts sortBy(_.userName) list
- } else {
- Accounts filter (_.removed === false.bind) sortBy(_.userName) list
- }
-
- def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String])
- (implicit s: Session): Unit =
- Accounts insert Account(
- userName = userName,
- password = password,
- fullName = fullName,
- mailAddress = mailAddress,
- isAdmin = isAdmin,
- url = url,
- registeredDate = currentDate,
- updatedDate = currentDate,
- lastLoginDate = None,
- image = None,
- isGroupAccount = false,
- isRemoved = false)
-
- def updateAccount(account: Account)(implicit s: Session): Unit =
- Accounts
- .filter { a => a.userName === account.userName.bind }
- .map { a => (a.password, a.fullName, a.mailAddress, a.isAdmin, a.url.?, a.registeredDate, a.updatedDate, a.lastLoginDate.?, a.removed) }
- .update (
- account.password,
- account.fullName,
- account.mailAddress,
- account.isAdmin,
- account.url,
- account.registeredDate,
- currentDate,
- account.lastLoginDate,
- account.isRemoved)
-
- def updateAvatarImage(userName: String, image: Option[String])(implicit s: Session): Unit =
- Accounts.filter(_.userName === userName.bind).map(_.image.?).update(image)
-
- def updateLastLoginDate(userName: String)(implicit s: Session): Unit =
- Accounts.filter(_.userName === userName.bind).map(_.lastLoginDate).update(currentDate)
-
- def createGroup(groupName: String, url: Option[String])(implicit s: Session): Unit =
- Accounts insert Account(
- userName = groupName,
- password = "",
- fullName = groupName,
- mailAddress = groupName + "@devnull",
- isAdmin = false,
- url = url,
- registeredDate = currentDate,
- updatedDate = currentDate,
- lastLoginDate = None,
- image = None,
- isGroupAccount = true,
- isRemoved = false)
-
- def updateGroup(groupName: String, url: Option[String], removed: Boolean)(implicit s: Session): Unit =
- Accounts.filter(_.userName === groupName.bind).map(t => t.url.? -> t.removed).update(url, removed)
-
- def updateGroupMembers(groupName: String, members: List[(String, Boolean)])(implicit s: Session): Unit = {
- GroupMembers.filter(_.groupName === groupName.bind).delete
- members.foreach { case (userName, isManager) =>
- GroupMembers insert GroupMember (groupName, userName, isManager)
- }
- }
-
- def getGroupMembers(groupName: String)(implicit s: Session): List[GroupMember] =
- GroupMembers
- .filter(_.groupName === groupName.bind)
- .sortBy(_.userName)
- .list
-
- def getGroupsByUserName(userName: String)(implicit s: Session): List[String] =
- GroupMembers
- .filter(_.userName === userName.bind)
- .sortBy(_.groupName)
- .map(_.groupName)
- .list
-
- def removeUserRelatedData(userName: String)(implicit s: Session): Unit = {
- GroupMembers.filter(_.userName === userName.bind).delete
- Collaborators.filter(_.collaboratorName === userName.bind).delete
- Repositories.filter(_.userName === userName.bind).delete
- }
-
- def getGroupNames(userName: String)(implicit s: Session): List[String] = {
- List(userName) ++
- Collaborators.filter(_.collaboratorName === userName.bind).sortBy(_.userName).map(_.userName).list
- }
-
-}
-
-object AccountService extends AccountService
diff --git a/src/main/scala/service/ActivityService.scala b/src/main/scala/service/ActivityService.scala
deleted file mode 100644
index b1e8202..0000000
--- a/src/main/scala/service/ActivityService.scala
+++ /dev/null
@@ -1,188 +0,0 @@
-package service
-
-import model.Profile._
-import profile.simple._
-import model.Activity
-
-trait ActivityService {
-
- def getActivitiesByUser(activityUserName: String, isPublic: Boolean)(implicit s: Session): List[Activity] =
- Activities
- .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
- .filter { case (t1, t2) =>
- if(isPublic){
- (t1.activityUserName === activityUserName.bind) && (t2.isPrivate === false.bind)
- } else {
- (t1.activityUserName === activityUserName.bind)
- }
- }
- .sortBy { case (t1, t2) => t1.activityId desc }
- .map { case (t1, t2) => t1 }
- .take(30)
- .list
-
- def getRecentActivities()(implicit s: Session): List[Activity] =
- Activities
- .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
- .filter { case (t1, t2) => t2.isPrivate === false.bind }
- .sortBy { case (t1, t2) => t1.activityId desc }
- .map { case (t1, t2) => t1 }
- .take(30)
- .list
-
- def getRecentActivitiesByOwners(owners : Set[String])(implicit s: Session): List[Activity] =
- Activities
- .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
- .filter { case (t1, t2) => (t2.isPrivate === false.bind) || (t2.userName inSetBind owners) }
- .sortBy { case (t1, t2) => t1.activityId desc }
- .map { case (t1, t2) => t1 }
- .take(30)
- .list
-
- def recordCreateRepositoryActivity(userName: String, repositoryName: String, activityUserName: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "create_repository",
- s"[user:${activityUserName}] created [repo:${userName}/${repositoryName}]",
- None,
- currentDate)
-
- def recordCreateIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "open_issue",
- s"[user:${activityUserName}] opened issue [issue:${userName}/${repositoryName}#${issueId}]",
- Some(title),
- currentDate)
-
- def recordCloseIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "close_issue",
- s"[user:${activityUserName}] closed issue [issue:${userName}/${repositoryName}#${issueId}]",
- Some(title),
- currentDate)
-
- def recordClosePullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "close_issue",
- s"[user:${activityUserName}] closed pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
- Some(title),
- currentDate)
-
- def recordReopenIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "reopen_issue",
- s"[user:${activityUserName}] reopened issue [issue:${userName}/${repositoryName}#${issueId}]",
- Some(title),
- currentDate)
-
- def recordCommentIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "comment_issue",
- s"[user:${activityUserName}] commented on issue [issue:${userName}/${repositoryName}#${issueId}]",
- Some(cut(comment, 200)),
- currentDate)
-
- def recordCommentPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "comment_issue",
- s"[user:${activityUserName}] commented on pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
- Some(cut(comment, 200)),
- currentDate)
-
- def recordCommentCommitActivity(userName: String, repositoryName: String, activityUserName: String, commitId: String, comment: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "comment_commit",
- s"[user:${activityUserName}] commented on commit [commit:${userName}/${repositoryName}@${commitId}]",
- Some(cut(comment, 200)),
- currentDate
- )
-
- def recordCreateWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "create_wiki",
- s"[user:${activityUserName}] created the [repo:${userName}/${repositoryName}] wiki",
- Some(pageName),
- currentDate)
-
- def recordEditWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String, commitId: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "edit_wiki",
- s"[user:${activityUserName}] edited the [repo:${userName}/${repositoryName}] wiki",
- Some(pageName + ":" + commitId),
- currentDate)
-
- def recordPushActivity(userName: String, repositoryName: String, activityUserName: String,
- branchName: String, commits: List[util.JGitUtil.CommitInfo])(implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "push",
- s"[user:${activityUserName}] pushed to [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
- Some(commits.map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")),
- currentDate)
-
- def recordCreateTagActivity(userName: String, repositoryName: String, activityUserName: String,
- tagName: String, commits: List[util.JGitUtil.CommitInfo])(implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "create_tag",
- s"[user:${activityUserName}] created tag [tag:${userName}/${repositoryName}#${tagName}] at [repo:${userName}/${repositoryName}]",
- None,
- currentDate)
-
- def recordDeleteTagActivity(userName: String, repositoryName: String, activityUserName: String,
- tagName: String, commits: List[util.JGitUtil.CommitInfo])(implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "delete_tag",
- s"[user:${activityUserName}] deleted tag ${tagName} at [repo:${userName}/${repositoryName}]",
- None,
- currentDate)
-
- def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "create_branch",
- s"[user:${activityUserName}] created branch [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
- None,
- currentDate)
-
- def recordDeleteBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "delete_branch",
- s"[user:${activityUserName}] deleted branch ${branchName} at [repo:${userName}/${repositoryName}]",
- None,
- currentDate)
-
- def recordForkActivity(userName: String, repositoryName: String, activityUserName: String, forkedUserName: String)(implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "fork",
- s"[user:${activityUserName}] forked [repo:${userName}/${repositoryName}] to [repo:${forkedUserName}/${repositoryName}]",
- None,
- currentDate)
-
- def recordPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "open_pullreq",
- s"[user:${activityUserName}] opened pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
- Some(title),
- currentDate)
-
- def recordMergeActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, message: String)
- (implicit s: Session): Unit =
- Activities insert Activity(userName, repositoryName, activityUserName,
- "merge_pullreq",
- s"[user:${activityUserName}] merged pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
- Some(message),
- currentDate)
-
- private def cut(value: String, length: Int): String =
- if(value.length > length) value.substring(0, length) + "..." else value
-}
diff --git a/src/main/scala/service/CommitStatusService.scala b/src/main/scala/service/CommitStatusService.scala
deleted file mode 100644
index 8860f77..0000000
--- a/src/main/scala/service/CommitStatusService.scala
+++ /dev/null
@@ -1,50 +0,0 @@
-package service
-
-import model.Profile._
-import profile.simple._
-import model.{CommitState, CommitStatus, Account}
-import util.Implicits._
-import util.StringUtil._
-import service.RepositoryService.RepositoryInfo
-
-trait CommitStatusService {
- /** insert or update */
- def createCommitStatus(userName: String, repositoryName: String, sha:String, context:String, state:CommitState, targetUrl:Option[String], description:Option[String], now:java.util.Date, creator:Account)(implicit s: Session): Int =
- CommitStatuses.filter(t => t.byCommit(userName, repositoryName, sha) && t.context===context.bind )
- .map(_.commitStatusId).firstOption match {
- case Some(id:Int) => {
- CommitStatuses.filter(_.byPrimaryKey(id)).map{
- t => (t.state , t.targetUrl , t.updatedDate , t.creator, t.description)
- }.update( (state, targetUrl, now, creator.userName, description) )
- id
- }
- case None => (CommitStatuses returning CommitStatuses.map(_.commitStatusId)) += CommitStatus(
- userName = userName,
- repositoryName = repositoryName,
- commitId = sha,
- context = context,
- state = state,
- targetUrl = targetUrl,
- description = description,
- creator = creator.userName,
- registeredDate = now,
- updatedDate = now)
- }
-
- def getCommitStatus(userName: String, repositoryName: String, id: Int)(implicit s: Session) :Option[CommitStatus] =
- CommitStatuses.filter(t => t.byPrimaryKey(id) && t.byRepository(userName, repositoryName)).firstOption
-
- def getCommitStatus(userName: String, repositoryName: String, sha: String, context: String)(implicit s: Session) :Option[CommitStatus] =
- CommitStatuses.filter(t => t.byCommit(userName, repositoryName, sha) && t.context===context.bind ).firstOption
-
- def getCommitStatues(userName: String, repositoryName: String, sha: String)(implicit s: Session) :List[CommitStatus] =
- byCommitStatues(userName, repositoryName, sha).list
-
- def getCommitStatuesWithCreator(userName: String, repositoryName: String, sha: String)(implicit s: Session) :List[(CommitStatus, Account)] =
- byCommitStatues(userName, repositoryName, sha).innerJoin(Accounts)
- .filter{ case (t,a) => t.creator === a.userName }.list
-
- protected def byCommitStatues(userName: String, repositoryName: String, sha: String)(implicit s: Session) =
- CommitStatuses.filter(t => t.byCommit(userName, repositoryName, sha) ).sortBy(_.updatedDate desc)
-
-}
\ No newline at end of file
diff --git a/src/main/scala/service/CommitsService.scala b/src/main/scala/service/CommitsService.scala
deleted file mode 100644
index 6f70e3c..0000000
--- a/src/main/scala/service/CommitsService.scala
+++ /dev/null
@@ -1,52 +0,0 @@
-package service
-
-import scala.slick.jdbc.{StaticQuery => Q}
-import Q.interpolation
-
-import model.Profile._
-import profile.simple._
-import model.CommitComment
-import util.Implicits._
-import util.StringUtil._
-
-
-trait CommitsService {
-
- def getCommitComments(owner: String, repository: String, commitId: String, pullRequest: Boolean)(implicit s: Session) =
- CommitComments filter {
- t => t.byCommit(owner, repository, commitId) && (t.pullRequest === pullRequest || pullRequest)
- } list
-
- def getCommitComment(owner: String, repository: String, commentId: String)(implicit s: Session) =
- if (commentId forall (_.isDigit))
- CommitComments filter { t =>
- t.byPrimaryKey(commentId.toInt) && t.byRepository(owner, repository)
- } firstOption
- else
- None
-
- def createCommitComment(owner: String, repository: String, commitId: String, loginUser: String,
- content: String, fileName: Option[String], oldLine: Option[Int], newLine: Option[Int], pullRequest: Boolean)(implicit s: Session): Int =
- CommitComments.autoInc insert CommitComment(
- userName = owner,
- repositoryName = repository,
- commitId = commitId,
- commentedUserName = loginUser,
- content = content,
- fileName = fileName,
- oldLine = oldLine,
- newLine = newLine,
- registeredDate = currentDate,
- updatedDate = currentDate,
- pullRequest = pullRequest)
-
- def updateCommitComment(commentId: Int, content: String)(implicit s: Session) =
- CommitComments
- .filter (_.byPrimaryKey(commentId))
- .map { t =>
- t.content -> t.updatedDate
- }.update (content, currentDate)
-
- def deleteCommitComment(commentId: Int)(implicit s: Session) =
- CommitComments filter (_.byPrimaryKey(commentId)) delete
-}
diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala
deleted file mode 100644
index 0edc884..0000000
--- a/src/main/scala/service/IssuesService.scala
+++ /dev/null
@@ -1,540 +0,0 @@
-package service
-
-import scala.slick.jdbc.{StaticQuery => Q}
-import Q.interpolation
-
-import model.Profile._
-import profile.simple._
-import model.{Issue, IssueComment, IssueLabel, Label}
-import util.Implicits._
-import util.StringUtil._
-
-trait IssuesService {
- import IssuesService._
-
- def getIssue(owner: String, repository: String, issueId: String)(implicit s: Session) =
- if (issueId forall (_.isDigit))
- Issues filter (_.byPrimaryKey(owner, repository, issueId.toInt)) firstOption
- else None
-
- def getComments(owner: String, repository: String, issueId: Int)(implicit s: Session) =
- IssueComments filter (_.byIssue(owner, repository, issueId)) list
-
- def getCommentsForApi(owner: String, repository: String, issueId: Int)(implicit s: Session) =
- IssueComments.filter(_.byIssue(owner, repository, issueId))
- .filter(_.action inSetBind Set("comment" , "close_comment", "reopen_comment"))
- .innerJoin(Accounts).on( (t1, t2) => t1.userName === t2.userName )
- .list
-
- def getComment(owner: String, repository: String, commentId: String)(implicit s: Session) =
- if (commentId forall (_.isDigit))
- IssueComments filter { t =>
- t.byPrimaryKey(commentId.toInt) && t.byRepository(owner, repository)
- } firstOption
- else None
-
- def getIssueLabels(owner: String, repository: String, issueId: Int)(implicit s: Session) =
- IssueLabels
- .innerJoin(Labels).on { (t1, t2) =>
- t1.byLabel(t2.userName, t2.repositoryName, t2.labelId)
- }
- .filter ( _._1.byIssue(owner, repository, issueId) )
- .map ( _._2 )
- .list
-
- def getIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session) =
- IssueLabels filter (_.byPrimaryKey(owner, repository, issueId, labelId)) firstOption
-
- /**
- * Returns the count of the search result against issues.
- *
- * @param condition the search condition
- * @param onlyPullRequest if true then counts only pull request, false then counts both of issue and pull request.
- * @param repos Tuple of the repository owner and the repository name
- * @return the count of the search result
- */
- def countIssue(condition: IssueSearchCondition, onlyPullRequest: Boolean,
- repos: (String, String)*)(implicit s: Session): Int =
- Query(searchIssueQuery(repos, condition, onlyPullRequest).length).first
-
- /**
- * Returns the Map which contains issue count for each labels.
- *
- * @param owner the repository owner
- * @param repository the repository name
- * @param condition the search condition
- * @return the Map which contains issue count for each labels (key is label name, value is issue count)
- */
- def countIssueGroupByLabels(owner: String, repository: String, condition: IssueSearchCondition,
- filterUser: Map[String, String])(implicit s: Session): Map[String, Int] = {
-
- searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), false)
- .innerJoin(IssueLabels).on { (t1, t2) =>
- t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
- }
- .innerJoin(Labels).on { case ((t1, t2), t3) =>
- t2.byLabel(t3.userName, t3.repositoryName, t3.labelId)
- }
- .groupBy { case ((t1, t2), t3) =>
- t3.labelName
- }
- .map { case (labelName, t) =>
- labelName -> t.length
- }
- .toMap
- }
-
- def getCommitStatues(issueList:Seq[(String, String, Int)])(implicit s: Session) :Map[(String, String, Int), CommitStatusInfo] ={
- if(issueList.isEmpty){
- Map.empty
- }else{
- import scala.slick.jdbc._
- val issueIdQuery = issueList.map(i => "(PR.USER_NAME=? AND PR.REPOSITORY_NAME=? AND PR.ISSUE_ID=?)").mkString(" OR ")
- implicit val qset = SetParameter[Seq[(String, String, Int)]] {
- case (seq, pp) =>
- for (a <- seq) {
- pp.setString(a._1)
- pp.setString(a._2)
- pp.setInt(a._3)
- }
- }
- import model.Profile.commitStateColumnType
- val query = Q.query[Seq[(String, String, Int)], (String, String, Int, Int, Int, Option[String], Option[model.CommitState], Option[String], Option[String])](s"""
- SELECT SUMM.USER_NAME, SUMM.REPOSITORY_NAME, SUMM.ISSUE_ID, CS_ALL, CS_SUCCESS
- , CSD.CONTEXT, CSD.STATE, CSD.TARGET_URL, CSD.DESCRIPTION
- FROM (SELECT
- PR.USER_NAME
- , PR.REPOSITORY_NAME
- , PR.ISSUE_ID
- , COUNT(CS.STATE) AS CS_ALL
- , SUM(CS.STATE='success') AS CS_SUCCESS
- , PR.COMMIT_ID_TO AS COMMIT_ID
- FROM PULL_REQUEST PR
- JOIN COMMIT_STATUS CS
- ON PR.USER_NAME=CS.USER_NAME
- AND PR.REPOSITORY_NAME=CS.REPOSITORY_NAME
- AND PR.COMMIT_ID_TO=CS.COMMIT_ID
- WHERE $issueIdQuery
- GROUP BY PR.USER_NAME, PR.REPOSITORY_NAME, PR.ISSUE_ID) as SUMM
- LEFT OUTER JOIN COMMIT_STATUS CSD
- ON SUMM.CS_ALL = 1 AND SUMM.COMMIT_ID = CSD.COMMIT_ID""");
- query(issueList).list.map{
- case(userName, repositoryName, issueId, count, successCount, context, state, targetUrl, description) =>
- (userName, repositoryName, issueId) -> CommitStatusInfo(count, successCount, context, state, targetUrl, description)
- }.toMap
- }
- }
-
- /**
- * Returns the search result against issues.
- *
- * @param condition the search condition
- * @param pullRequest if true then returns only pull requests, false then returns only issues.
- * @param offset the offset for pagination
- * @param limit the limit for pagination
- * @param repos Tuple of the repository owner and the repository name
- * @return the search result (list of tuples which contain issue, labels and comment count)
- */
- def searchIssue(condition: IssueSearchCondition, pullRequest: Boolean, offset: Int, limit: Int, repos: (String, String)*)
- (implicit s: Session): List[IssueInfo] = {
- // get issues and comment count and labels
- val result = searchIssueQueryBase(condition, pullRequest, offset, limit, repos)
- .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
- .leftJoin (Labels) .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
- .leftJoin (Milestones) .on { case ((((t1, t2), t3), t4), t5) => t1.byMilestone(t5.userName, t5.repositoryName, t5.milestoneId) }
- .map { case ((((t1, t2), t3), t4), t5) =>
- (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?, t5.title.?)
- }
- .list
- .splitWith { (c1, c2) =>
- c1._1.userName == c2._1.userName &&
- c1._1.repositoryName == c2._1.repositoryName &&
- c1._1.issueId == c2._1.issueId
- }
- val status = getCommitStatues(result.map(_.head._1).map(is => (is.userName, is.repositoryName, is.issueId)))
-
- result.map { issues => issues.head match {
- case (issue, commentCount, _, _, _, milestone) =>
- IssueInfo(issue,
- issues.flatMap { t => t._3.map (
- Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get)
- )} toList,
- milestone,
- commentCount,
- status.get(issue.userName, issue.repositoryName, issue.issueId))
- }} toList
- }
-
- /** for api
- * @return (issue, commentCount, pullRequest, headRepository, headOwner)
- */
- def searchPullRequestByApi(condition: IssueSearchCondition, offset: Int, limit: Int, repos: (String, String)*)
- (implicit s: Session): List[(Issue, model.Account, Int, model.PullRequest, model.Repository, model.Account)] = {
- // get issues and comment count and labels
- searchIssueQueryBase(condition, true, offset, limit, repos)
- .innerJoin(PullRequests).on { case ((t1, t2), t3) => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) }
- .innerJoin(Repositories).on { case (((t1, t2), t3), t4) => t4.byRepository(t1.userName, t1.repositoryName) }
- .innerJoin(Accounts).on { case ((((t1, t2), t3), t4), t5) => t5.userName === t1.userName }
- .innerJoin(Accounts).on { case (((((t1, t2), t3), t4), t5), t6) => t6.userName === t4.userName }
- .map { case (((((t1, t2), t3), t4), t5), t6) =>
- (t1, t5, t2.commentCount, t3, t4, t6)
- }
- .list
- }
-
- private def searchIssueQueryBase(condition: IssueSearchCondition, pullRequest: Boolean, offset: Int, limit: Int, repos: Seq[(String, String)])
- (implicit s: Session) =
- searchIssueQuery(repos, condition, pullRequest)
- .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
- .sortBy { case (t1, t2) =>
- (condition.sort match {
- case "created" => t1.registeredDate
- case "comments" => t2.commentCount
- case "updated" => t1.updatedDate
- }) match {
- case sort => condition.direction match {
- case "asc" => sort asc
- case "desc" => sort desc
- }
- }
- }
- .drop(offset).take(limit)
-
-
- /**
- * Assembles query for conditional issue searching.
- */
- private def searchIssueQuery(repos: Seq[(String, String)], condition: IssueSearchCondition, pullRequest: Boolean)(implicit s: Session) =
- Issues filter { t1 =>
- repos
- .map { case (owner, repository) => t1.byRepository(owner, repository) }
- .foldLeft[Column[Boolean]](false) ( _ || _ ) &&
- (t1.closed === (condition.state == "closed").bind) &&
- //(t1.milestoneId === condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
- (t1.milestoneId.? isEmpty, condition.milestone == Some(None)) &&
- (t1.assignedUserName === condition.assigned.get.bind, condition.assigned.isDefined) &&
- (t1.openedUserName === condition.author.get.bind, condition.author.isDefined) &&
- (t1.pullRequest === pullRequest.bind) &&
- // Milestone filter
- (Milestones filter { t2 =>
- (t2.byPrimaryKey(t1.userName, t1.repositoryName, t1.milestoneId)) &&
- (t2.title === condition.milestone.get.get.bind)
- } exists, condition.milestone.flatten.isDefined) &&
- // Label filter
- (IssueLabels filter { t2 =>
- (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) &&
- (t2.labelId in
- (Labels filter { t3 =>
- (t3.byRepository(t1.userName, t1.repositoryName)) &&
- (t3.labelName inSetBind condition.labels)
- } map(_.labelId)))
- } exists, condition.labels.nonEmpty) &&
- // Visibility filter
- (Repositories filter { t2 =>
- (t2.byRepository(t1.userName, t1.repositoryName)) &&
- (t2.isPrivate === (condition.visibility == Some("private")).bind)
- } exists, condition.visibility.nonEmpty) &&
- // Organization (group) filter
- (t1.userName inSetBind condition.groups, condition.groups.nonEmpty) &&
- // Mentioned filter
- ((t1.openedUserName === condition.mentioned.get.bind) || t1.assignedUserName === condition.mentioned.get.bind ||
- (IssueComments filter { t2 =>
- (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) && (t2.commentedUserName === condition.mentioned.get.bind)
- } exists), condition.mentioned.isDefined)
- }
-
- def createIssue(owner: String, repository: String, loginUser: String, title: String, content: Option[String],
- assignedUserName: Option[String], milestoneId: Option[Int],
- isPullRequest: Boolean = false)(implicit s: Session) =
- // next id number
- sql"SELECT ISSUE_ID + 1 FROM ISSUE_ID WHERE USER_NAME = $owner AND REPOSITORY_NAME = $repository FOR UPDATE".as[Int]
- .firstOption.filter { id =>
- Issues insert Issue(
- owner,
- repository,
- id,
- loginUser,
- milestoneId,
- assignedUserName,
- title,
- content,
- false,
- currentDate,
- currentDate,
- isPullRequest)
-
- // increment issue id
- IssueId
- .filter (_.byPrimaryKey(owner, repository))
- .map (_.issueId)
- .update (id) > 0
- } get
-
- def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session) =
- IssueLabels insert IssueLabel(owner, repository, issueId, labelId)
-
- def deleteIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session) =
- IssueLabels filter(_.byPrimaryKey(owner, repository, issueId, labelId)) delete
-
- def createComment(owner: String, repository: String, loginUser: String,
- issueId: Int, content: String, action: String)(implicit s: Session): Int =
- IssueComments.autoInc insert IssueComment(
- userName = owner,
- repositoryName = repository,
- issueId = issueId,
- action = action,
- commentedUserName = loginUser,
- content = content,
- registeredDate = currentDate,
- updatedDate = currentDate)
-
- def updateIssue(owner: String, repository: String, issueId: Int,
- title: String, content: Option[String])(implicit s: Session) =
- Issues
- .filter (_.byPrimaryKey(owner, repository, issueId))
- .map { t =>
- (t.title, t.content.?, t.updatedDate)
- }
- .update (title, content, currentDate)
-
- def updateAssignedUserName(owner: String, repository: String, issueId: Int,
- assignedUserName: Option[String])(implicit s: Session) =
- Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.assignedUserName?).update (assignedUserName)
-
- def updateMilestoneId(owner: String, repository: String, issueId: Int,
- milestoneId: Option[Int])(implicit s: Session) =
- Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.milestoneId?).update (milestoneId)
-
- def updateComment(commentId: Int, content: String)(implicit s: Session) =
- IssueComments
- .filter (_.byPrimaryKey(commentId))
- .map { t =>
- t.content -> t.updatedDate
- }
- .update (content, currentDate)
-
- def deleteComment(commentId: Int)(implicit s: Session) =
- IssueComments filter (_.byPrimaryKey(commentId)) delete
-
- def updateClosed(owner: String, repository: String, issueId: Int, closed: Boolean)(implicit s: Session) =
- Issues
- .filter (_.byPrimaryKey(owner, repository, issueId))
- .map { t =>
- t.closed -> t.updatedDate
- }
- .update (closed, currentDate)
-
- /**
- * Search issues by keyword.
- *
- * @param owner the repository owner
- * @param repository the repository name
- * @param query the keywords separated by whitespace.
- * @return issues with comment count and matched content of issue or comment
- */
- def searchIssuesByKeyword(owner: String, repository: String, query: String)
- (implicit s: Session): List[(Issue, Int, String)] = {
- import slick.driver.JdbcDriver.likeEncode
- val keywords = splitWords(query.toLowerCase)
-
- // Search Issue
- val issues = Issues
- .filter(_.byRepository(owner, repository))
- .innerJoin(IssueOutline).on { case (t1, t2) =>
- t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
- }
- .filter { case (t1, t2) =>
- keywords.map { keyword =>
- (t1.title.toLowerCase like (s"%${likeEncode(keyword)}%", '^')) ||
- (t1.content.toLowerCase like (s"%${likeEncode(keyword)}%", '^'))
- } .reduceLeft(_ && _)
- }
- .map { case (t1, t2) =>
- (t1, 0, t1.content.?, t2.commentCount)
- }
-
- // Search IssueComment
- val comments = IssueComments
- .filter(_.byRepository(owner, repository))
- .innerJoin(Issues).on { case (t1, t2) =>
- t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
- }
- .innerJoin(IssueOutline).on { case ((t1, t2), t3) =>
- t2.byIssue(t3.userName, t3.repositoryName, t3.issueId)
- }
- .filter { case ((t1, t2), t3) =>
- keywords.map { query =>
- t1.content.toLowerCase like (s"%${likeEncode(query)}%", '^')
- }.reduceLeft(_ && _)
- }
- .map { case ((t1, t2), t3) =>
- (t2, t1.commentId, t1.content.?, t3.commentCount)
- }
-
- issues.union(comments).sortBy { case (issue, commentId, _, _) =>
- issue.issueId -> commentId
- }.list.splitWith { case ((issue1, _, _, _), (issue2, _, _, _)) =>
- issue1.issueId == issue2.issueId
- }.map { _.head match {
- case (issue, _, content, commentCount) => (issue, commentCount, content.getOrElse(""))
- }
- }.toList
- }
-
- def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String)(implicit s: Session) = {
- extractCloseId(message).foreach { issueId =>
- for(issue <- getIssue(owner, repository, issueId) if !issue.closed){
- createComment(owner, repository, userName, issue.issueId, "Close", "close")
- updateClosed(owner, repository, issue.issueId, true)
- }
- }
- }
-}
-
-object IssuesService {
- import javax.servlet.http.HttpServletRequest
-
- val IssueLimit = 30
-
- case class IssueSearchCondition(
- labels: Set[String] = Set.empty,
- milestone: Option[Option[String]] = None,
- author: Option[String] = None,
- assigned: Option[String] = None,
- mentioned: Option[String] = None,
- state: String = "open",
- sort: String = "created",
- direction: String = "desc",
- visibility: Option[String] = None,
- groups: Set[String] = Set.empty){
-
- def isEmpty: Boolean = {
- labels.isEmpty && milestone.isEmpty && author.isEmpty && assigned.isEmpty &&
- state == "open" && sort == "created" && direction == "desc" && visibility.isEmpty
- }
-
- def nonEmpty: Boolean = !isEmpty
-
- def toFilterString: String = (
- List(
- Some(s"is:${state}"),
- author.map(author => s"author:${author}"),
- assigned.map(assignee => s"assignee:${assignee}"),
- mentioned.map(mentioned => s"mentions:${mentioned}")
- ).flatten ++
- labels.map(label => s"label:${label}") ++
- List(
- milestone.map { _ match {
- case Some(x) => s"milestone:${x}"
- case None => "no:milestone"
- }},
- (sort, direction) match {
- case ("created" , "desc") => None
- case ("created" , "asc" ) => Some("sort:created-asc")
- case ("comments", "desc") => Some("sort:comments-desc")
- case ("comments", "asc" ) => Some("sort:comments-asc")
- case ("updated" , "desc") => Some("sort:updated-desc")
- case ("updated" , "asc" ) => Some("sort:updated-asc")
- },
- visibility.map(visibility => s"visibility:${visibility}")
- ).flatten ++
- groups.map(group => s"group:${group}")
- ).mkString(" ")
-
- def toURL: String =
- "?" + List(
- if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(","))),
- milestone.map { _ match {
- case Some(x) => "milestone=" + urlEncode(x)
- case None => "milestone=none"
- }},
- author .map(x => "author=" + urlEncode(x)),
- assigned .map(x => "assigned=" + urlEncode(x)),
- mentioned.map(x => "mentioned=" + urlEncode(x)),
- Some("state=" + urlEncode(state)),
- Some("sort=" + urlEncode(sort)),
- Some("direction=" + urlEncode(direction)),
- visibility.map(x => "visibility=" + urlEncode(x)),
- if(groups.isEmpty) None else Some("groups=" + urlEncode(groups.mkString(",")))
- ).flatten.mkString("&")
-
- }
-
- object IssueSearchCondition {
-
- private def param(request: HttpServletRequest, name: String, allow: Seq[String] = Nil): Option[String] = {
- val value = request.getParameter(name)
- if(value == null || value.isEmpty || (allow.nonEmpty && !allow.contains(value))) None else Some(value)
- }
-
- /**
- * Restores IssueSearchCondition instance from filter query.
- */
- def apply(filter: String, milestones: Map[String, Int]): IssueSearchCondition = {
- val conditions = filter.split("[ \t]+").map { x =>
- val dim = x.split(":")
- dim(0) -> dim(1)
- }.groupBy(_._1).map { case (key, values) =>
- key -> values.map(_._2).toSeq
- }
-
- val (sort, direction) = conditions.get("sort").flatMap(_.headOption).getOrElse("created-desc") match {
- case "created-asc" => ("created" , "asc" )
- case "comments-desc" => ("comments", "desc")
- case "comments-asc" => ("comments", "asc" )
- case "updated-desc" => ("comments", "desc")
- case "updated-asc" => ("comments", "asc" )
- case _ => ("created" , "desc")
- }
-
- IssueSearchCondition(
- conditions.get("label").map(_.toSet).getOrElse(Set.empty),
- conditions.get("milestone").flatMap(_.headOption) match {
- case None => None
- case Some("none") => Some(None)
- case Some(x) => Some(Some(x)) //milestones.get(x).map(x => Some(x))
- },
- conditions.get("author").flatMap(_.headOption),
- conditions.get("assignee").flatMap(_.headOption),
- conditions.get("mentions").flatMap(_.headOption),
- conditions.get("is").getOrElse(Seq.empty).find(x => x == "open" || x == "closed").getOrElse("open"),
- sort,
- direction,
- conditions.get("visibility").flatMap(_.headOption),
- conditions.get("group").map(_.toSet).getOrElse(Set.empty)
- )
- }
-
- /**
- * Restores IssueSearchCondition instance from request parameters.
- */
- def apply(request: HttpServletRequest): IssueSearchCondition =
- IssueSearchCondition(
- param(request, "labels").map(_.split(",").toSet).getOrElse(Set.empty),
- param(request, "milestone").map {
- case "none" => None
- case x => Some(x)
- },
- param(request, "author"),
- param(request, "assigned"),
- param(request, "mentioned"),
- param(request, "state", Seq("open", "closed")).getOrElse("open"),
- param(request, "sort", Seq("created", "comments", "updated")).getOrElse("created"),
- param(request, "direction", Seq("asc", "desc")).getOrElse("desc"),
- param(request, "visibility"),
- param(request, "groups").map(_.split(",").toSet).getOrElse(Set.empty)
- )
-
- def page(request: HttpServletRequest) = try {
- val i = param(request, "page").getOrElse("1").toInt
- if(i <= 0) 1 else i
- } catch {
- case e: NumberFormatException => 1
- }
- }
-
- case class CommitStatusInfo(count: Int, successCount: Int, context: Option[String], state: Option[model.CommitState], targetUrl: Option[String], description: Option[String])
-
- case class IssueInfo(issue: Issue, labels: List[Label], milestone: Option[String], commentCount: Int, status:Option[CommitStatusInfo])
-
-}
diff --git a/src/main/scala/service/LabelsService.scala b/src/main/scala/service/LabelsService.scala
deleted file mode 100644
index de1dcb8..0000000
--- a/src/main/scala/service/LabelsService.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package service
-
-import model.Profile._
-import profile.simple._
-import model.Label
-
-trait LabelsService {
-
- def getLabels(owner: String, repository: String)(implicit s: Session): List[Label] =
- Labels.filter(_.byRepository(owner, repository)).sortBy(_.labelName asc).list
-
- def getLabel(owner: String, repository: String, labelId: Int)(implicit s: Session): Option[Label] =
- Labels.filter(_.byPrimaryKey(owner, repository, labelId)).firstOption
-
- def createLabel(owner: String, repository: String, labelName: String, color: String)(implicit s: Session): Int =
- Labels returning Labels.map(_.labelId) += Label(
- userName = owner,
- repositoryName = repository,
- labelName = labelName,
- color = color
- )
-
- def updateLabel(owner: String, repository: String, labelId: Int, labelName: String, color: String)
- (implicit s: Session): Unit =
- Labels.filter(_.byPrimaryKey(owner, repository, labelId))
- .map(t => t.labelName -> t.color)
- .update(labelName, color)
-
- def deleteLabel(owner: String, repository: String, labelId: Int)(implicit s: Session): Unit = {
- IssueLabels.filter(_.byLabel(owner, repository, labelId)).delete
- Labels.filter(_.byPrimaryKey(owner, repository, labelId)).delete
- }
-
-}
diff --git a/src/main/scala/service/MergeService.scala b/src/main/scala/service/MergeService.scala
deleted file mode 100644
index b2168ac..0000000
--- a/src/main/scala/service/MergeService.scala
+++ /dev/null
@@ -1,168 +0,0 @@
-package service
-import util.LockUtil
-import util.Directory._
-import util.Implicits._
-import util.ControlUtil._
-import org.eclipse.jgit.merge.MergeStrategy
-import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.transport.RefSpec
-import org.eclipse.jgit.errors.NoMergeBaseException
-import org.eclipse.jgit.lib.{ObjectId, CommitBuilder, PersonIdent}
-import model.Account
-import org.eclipse.jgit.revwalk.RevWalk
-trait MergeService {
- import MergeService._
- /**
- * Checks whether conflict will be caused in merging within pull request.
- * Returns true if conflict will be caused.
- */
- def checkConflict(userName: String, repositoryName: String, branch: String, issueId: Int): Boolean = {
- using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
- MergeCacheInfo(git, branch, issueId).checkConflict()
- }
- }
- /**
- * Checks whether conflict will be caused in merging within pull request.
- * only cache check.
- * Returns Some(true) if conflict will be caused.
- * Returns None if cache has not created yet.
- */
- def checkConflictCache(userName: String, repositoryName: String, branch: String, issueId: Int): Option[Boolean] = {
- using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
- MergeCacheInfo(git, branch, issueId).checkConflictCache()
- }
- }
- /** merge pull request */
- def mergePullRequest(git:Git, branch: String, issueId: Int, message:String, committer:PersonIdent): Unit = {
- MergeCacheInfo(git, branch, issueId).merge(message, committer)
- }
- /** fetch remote branch to my repository refs/pull/{issueId}/head */
- def fetchAsPullRequest(userName: String, repositoryName: String, requestUserName: String, requestRepositoryName: String, requestBranch:String, issueId:Int){
- using(Git.open(getRepositoryDir(userName, repositoryName))){ git =>
- git.fetch
- .setRemote(getRepositoryDir(requestUserName, requestRepositoryName).toURI.toString)
- .setRefSpecs(new RefSpec(s"refs/heads/${requestBranch}:refs/pull/${issueId}/head"))
- .call
- }
- }
- /**
- * Checks whether conflict will be caused in merging. Returns true if conflict will be caused.
- */
- def checkConflict(userName: String, repositoryName: String, branch: String,
- requestUserName: String, requestRepositoryName: String, requestBranch: String): Boolean = {
- using(Git.open(getRepositoryDir(requestUserName, requestRepositoryName))) { git =>
- val remoteRefName = s"refs/heads/${branch}"
- val tmpRefName = s"refs/merge-check/${userName}/${branch}"
- val refSpec = new RefSpec(s"${remoteRefName}:${tmpRefName}").setForceUpdate(true)
- try {
- // fetch objects from origin repository branch
- git.fetch
- .setRemote(getRepositoryDir(userName, repositoryName).toURI.toString)
- .setRefSpecs(refSpec)
- .call
- // merge conflict check
- val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
- val mergeBaseTip = git.getRepository.resolve(s"refs/heads/${requestBranch}")
- val mergeTip = git.getRepository.resolve(tmpRefName)
- try {
- !merger.merge(mergeBaseTip, mergeTip)
- } catch {
- case e: NoMergeBaseException => true
- }
- } finally {
- val refUpdate = git.getRepository.updateRef(refSpec.getDestination)
- refUpdate.setForceUpdate(true)
- refUpdate.delete()
- }
- }
- }
-}
-object MergeService{
- case class MergeCacheInfo(git:Git, branch:String, issueId:Int){
- val repository = git.getRepository
- val mergedBranchName = s"refs/pull/${issueId}/merge"
- val conflictedBranchName = s"refs/pull/${issueId}/conflict"
- lazy val mergeBaseTip = repository.resolve(s"refs/heads/${branch}")
- lazy val mergeTip = repository.resolve(s"refs/pull/${issueId}/head")
- def checkConflictCache(): Option[Boolean] = {
- Option(repository.resolve(mergedBranchName)).flatMap{ merged =>
- if(parseCommit( merged ).getParents().toSet == Set( mergeBaseTip, mergeTip )){
- // merged branch exists
- Some(false)
- }else{
- None
- }
- }.orElse(Option(repository.resolve(conflictedBranchName)).flatMap{ conflicted =>
- if(parseCommit( conflicted ).getParents().toSet == Set( mergeBaseTip, mergeTip )){
- // conflict branch exists
- Some(true)
- }else{
- None
- }
- })
- }
- def checkConflict():Boolean ={
- checkConflictCache.getOrElse(checkConflictForce)
- }
- def checkConflictForce():Boolean ={
- val merger = MergeStrategy.RECURSIVE.newMerger(repository, true)
- val conflicted = try {
- !merger.merge(mergeBaseTip, mergeTip)
- } catch {
- case e: NoMergeBaseException => true
- }
- val mergeTipCommit = using(new RevWalk( repository ))(_.parseCommit( mergeTip ))
- val committer = mergeTipCommit.getCommitterIdent;
- def updateBranch(treeId:ObjectId, message:String, branchName:String){
- // creates merge commit
- val mergeCommitId = createMergeCommit(treeId, committer, message)
- // update refs
- val refUpdate = repository.updateRef(branchName)
- refUpdate.setNewObjectId(mergeCommitId)
- refUpdate.setForceUpdate(true)
- refUpdate.setRefLogIdent(committer)
- refUpdate.update()
- }
- if(!conflicted){
- updateBranch(merger.getResultTreeId, s"Merge ${mergeTip.name} into ${mergeBaseTip.name}", mergedBranchName)
- git.branchDelete().setForce(true).setBranchNames(conflictedBranchName).call()
- }else{
- updateBranch(mergeTipCommit.getTree().getId(), s"can't merge ${mergeTip.name} into ${mergeBaseTip.name}", conflictedBranchName)
- git.branchDelete().setForce(true).setBranchNames(mergedBranchName).call()
- }
- conflicted
- }
- // update branch from cache
- def merge(message:String, committer:PersonIdent) = {
- if(checkConflict()){
- throw new RuntimeException("This pull request can't merge automatically.")
- }
- val mergeResultCommit = parseCommit( Option(repository.resolve(mergedBranchName)).getOrElse(throw new RuntimeException(s"not found branch ${mergedBranchName}")) )
- // creates merge commit
- val mergeCommitId = createMergeCommit(mergeResultCommit.getTree().getId(), committer, message)
- // update refs
- val refUpdate = repository.updateRef(s"refs/heads/${branch}")
- refUpdate.setNewObjectId(mergeCommitId)
- refUpdate.setForceUpdate(false)
- refUpdate.setRefLogIdent(committer)
- refUpdate.setRefLogMessage("merged", true)
- refUpdate.update()
- }
- // return treeId
- private def createMergeCommit(treeId:ObjectId, committer:PersonIdent, message:String) = {
- val mergeCommit = new CommitBuilder()
- mergeCommit.setTreeId(treeId)
- mergeCommit.setParentIds(Array[ObjectId](mergeBaseTip, mergeTip): _*)
- mergeCommit.setAuthor(committer)
- mergeCommit.setCommitter(committer)
- mergeCommit.setMessage(message)
- // insertObject and got mergeCommit Object Id
- val inserter = repository.newObjectInserter
- val mergeCommitId = inserter.insert(mergeCommit)
- inserter.flush()
- inserter.release()
- mergeCommitId
- }
- private def parseCommit(id:ObjectId) = using(new RevWalk( repository ))(_.parseCommit(id))
- }
-}
\ No newline at end of file
diff --git a/src/main/scala/service/MilestonesService.scala b/src/main/scala/service/MilestonesService.scala
deleted file mode 100644
index 476e0c4..0000000
--- a/src/main/scala/service/MilestonesService.scala
+++ /dev/null
@@ -1,57 +0,0 @@
-package service
-
-import model.Profile._
-import profile.simple._
-import model.Milestone
-// TODO [Slick 2.0]NOT import directly?
-import model.Profile.dateColumnType
-
-trait MilestonesService {
-
- def createMilestone(owner: String, repository: String, title: String, description: Option[String],
- dueDate: Option[java.util.Date])(implicit s: Session): Unit =
- Milestones insert Milestone(
- userName = owner,
- repositoryName = repository,
- title = title,
- description = description,
- dueDate = dueDate,
- closedDate = None
- )
-
- def updateMilestone(milestone: Milestone)(implicit s: Session): Unit =
- Milestones
- .filter (t => t.byPrimaryKey(milestone.userName, milestone.repositoryName, milestone.milestoneId))
- .map (t => (t.title, t.description.?, t.dueDate.?, t.closedDate.?))
- .update (milestone.title, milestone.description, milestone.dueDate, milestone.closedDate)
-
- def openMilestone(milestone: Milestone)(implicit s: Session): Unit =
- updateMilestone(milestone.copy(closedDate = None))
-
- def closeMilestone(milestone: Milestone)(implicit s: Session): Unit =
- updateMilestone(milestone.copy(closedDate = Some(currentDate)))
-
- def deleteMilestone(owner: String, repository: String, milestoneId: Int)(implicit s: Session): Unit = {
- Issues.filter(_.byMilestone(owner, repository, milestoneId)).map(_.milestoneId.?).update(None)
- Milestones.filter(_.byPrimaryKey(owner, repository, milestoneId)).delete
- }
-
- def getMilestone(owner: String, repository: String, milestoneId: Int)(implicit s: Session): Option[Milestone] =
- Milestones.filter(_.byPrimaryKey(owner, repository, milestoneId)).firstOption
-
- def getMilestonesWithIssueCount(owner: String, repository: String)(implicit s: Session): List[(Milestone, Int, Int)] = {
- val counts = Issues
- .filter { t => (t.byRepository(owner, repository)) && (t.milestoneId.? isDefined) }
- .groupBy { t => t.milestoneId -> t.closed }
- .map { case (t1, t2) => t1._1 -> t1._2 -> t2.length }
- .toMap
-
- getMilestones(owner, repository).map { milestone =>
- (milestone, counts.getOrElse((milestone.milestoneId, false), 0), counts.getOrElse((milestone.milestoneId, true), 0))
- }
- }
-
- def getMilestones(owner: String, repository: String)(implicit s: Session): List[Milestone] =
- Milestones.filter(_.byRepository(owner, repository)).sortBy(_.milestoneId asc).list
-
-}
diff --git a/src/main/scala/service/PluginService.scala b/src/main/scala/service/PluginService.scala
deleted file mode 100644
index d1bb9d8..0000000
--- a/src/main/scala/service/PluginService.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package service
-
-import model.Profile._
-import profile.simple._
-import model.Plugin
-
-trait PluginService {
-
- def getPlugins()(implicit s: Session): List[Plugin] =
- Plugins.sortBy(_.pluginId).list
-
- def registerPlugin(plugin: Plugin)(implicit s: Session): Unit =
- Plugins.insert(plugin)
-
- def updatePlugin(plugin: Plugin)(implicit s: Session): Unit =
- Plugins.filter(_.pluginId === plugin.pluginId.bind).map(_.version).update(plugin.version)
-
- def deletePlugin(pluginId: String)(implicit s: Session): Unit =
- Plugins.filter(_.pluginId === pluginId.bind).delete
-
- def getPlugin(pluginId: String)(implicit s: Session): Option[Plugin] =
- Plugins.filter(_.pluginId === pluginId.bind).firstOption
-
-}
diff --git a/src/main/scala/service/PullRequestService.scala b/src/main/scala/service/PullRequestService.scala
deleted file mode 100644
index 19c20d9..0000000
--- a/src/main/scala/service/PullRequestService.scala
+++ /dev/null
@@ -1,125 +0,0 @@
-package service
-
-import model.Profile._
-import profile.simple._
-import model.{PullRequest, Issue, WebHook, Account}
-import util.JGitUtil
-
-trait PullRequestService { self: IssuesService =>
- import PullRequestService._
-
- def getPullRequest(owner: String, repository: String, issueId: Int)
- (implicit s: Session): Option[(Issue, PullRequest)] =
- getIssue(owner, repository, issueId.toString).flatMap{ issue =>
- PullRequests.filter(_.byPrimaryKey(owner, repository, issueId)).firstOption.map{
- pullreq => (issue, pullreq)
- }
- }
-
- def updateCommitId(owner: String, repository: String, issueId: Int, commitIdTo: String, commitIdFrom: String)
- (implicit s: Session): Unit =
- PullRequests.filter(_.byPrimaryKey(owner, repository, issueId))
- .map(pr => pr.commitIdTo -> pr.commitIdFrom)
- .update((commitIdTo, commitIdFrom))
-
- def getPullRequestCountGroupByUser(closed: Boolean, owner: Option[String], repository: Option[String])
- (implicit s: Session): List[PullRequestCount] =
- PullRequests
- .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
- .filter { case (t1, t2) =>
- (t2.closed === closed.bind) &&
- (t1.userName === owner.get.bind, owner.isDefined) &&
- (t1.repositoryName === repository.get.bind, repository.isDefined)
- }
- .groupBy { case (t1, t2) => t2.openedUserName }
- .map { case (userName, t) => userName -> t.length }
- .sortBy(_._2 desc)
- .list
- .map { x => PullRequestCount(x._1, x._2) }
-
-// def getAllPullRequestCountGroupByUser(closed: Boolean, userName: String)(implicit s: Session): List[PullRequestCount] =
-// PullRequests
-// .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
-// .innerJoin(Repositories).on { case ((t1, t2), t3) => t2.byRepository(t3.userName, t3.repositoryName) }
-// .filter { case ((t1, t2), t3) =>
-// (t2.closed === closed.bind) &&
-// (
-// (t3.isPrivate === false.bind) ||
-// (t3.userName === userName.bind) ||
-// (Collaborators.filter { t4 => t4.byRepository(t3.userName, t3.repositoryName) && (t4.collaboratorName === userName.bind)} exists)
-// )
-// }
-// .groupBy { case ((t1, t2), t3) => t2.openedUserName }
-// .map { case (userName, t) => userName -> t.length }
-// .sortBy(_._2 desc)
-// .list
-// .map { x => PullRequestCount(x._1, x._2) }
-
- def createPullRequest(originUserName: String, originRepositoryName: String, issueId: Int,
- originBranch: String, requestUserName: String, requestRepositoryName: String, requestBranch: String,
- commitIdFrom: String, commitIdTo: String)(implicit s: Session): Unit =
- PullRequests insert PullRequest(
- originUserName,
- originRepositoryName,
- issueId,
- originBranch,
- requestUserName,
- requestRepositoryName,
- requestBranch,
- commitIdFrom,
- commitIdTo)
-
- def getPullRequestsByRequest(userName: String, repositoryName: String, branch: String, closed: Boolean)
- (implicit s: Session): List[PullRequest] =
- PullRequests
- .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
- .filter { case (t1, t2) =>
- (t1.requestUserName === userName.bind) &&
- (t1.requestRepositoryName === repositoryName.bind) &&
- (t1.requestBranch === branch.bind) &&
- (t2.closed === closed.bind)
- }
- .map { case (t1, t2) => t1 }
- .list
-
- /**
- * Fetch pull request contents into refs/pull/${issueId}/head and update pull request table.
- */
- def updatePullRequests(owner: String, repository: String, branch: String)(implicit s: Session): Unit =
- getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq =>
- if(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists.run){
- val (commitIdTo, commitIdFrom) = JGitUtil.updatePullRequest(
- pullreq.userName, pullreq.repositoryName, pullreq.branch, pullreq.issueId,
- pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch)
- updateCommitId(pullreq.userName, pullreq.repositoryName, pullreq.issueId, commitIdTo, commitIdFrom)
- }
- }
-
- def getPullRequestByRequestCommit(userName: String, repositoryName: String, toBranch:String, fromBranch: String, commitId: String)
- (implicit s: Session): Option[(PullRequest, Issue)] = {
- if(toBranch == fromBranch){
- None
- } else {
- PullRequests
- .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
- .filter { case (t1, t2) =>
- (t1.userName === userName.bind) &&
- (t1.repositoryName === repositoryName.bind) &&
- (t1.branch === toBranch.bind) &&
- (t1.requestUserName === userName.bind) &&
- (t1.requestRepositoryName === repositoryName.bind) &&
- (t1.requestBranch === fromBranch.bind) &&
- (t1.commitIdTo === commitId.bind)
- }
- .firstOption
- }
- }
-}
-
-object PullRequestService {
-
- val PullRequestLimit = 25
-
- case class PullRequestCount(userName: String, count: Int)
-
-}
diff --git a/src/main/scala/service/RepositorySearchService.scala b/src/main/scala/service/RepositorySearchService.scala
deleted file mode 100644
index f727af1..0000000
--- a/src/main/scala/service/RepositorySearchService.scala
+++ /dev/null
@@ -1,128 +0,0 @@
-package service
-
-import util.{FileUtil, StringUtil, JGitUtil}
-import util.Directory._
-import util.ControlUtil._
-import org.eclipse.jgit.revwalk.RevWalk
-import org.eclipse.jgit.treewalk.TreeWalk
-import org.eclipse.jgit.lib.FileMode
-import org.eclipse.jgit.api.Git
-import model.Profile._
-import profile.simple._
-
-trait RepositorySearchService { self: IssuesService =>
- import RepositorySearchService._
-
- def countIssues(owner: String, repository: String, query: String)(implicit session: Session): Int =
- searchIssuesByKeyword(owner, repository, query).length
-
- def searchIssues(owner: String, repository: String, query: String)(implicit session: Session): List[IssueSearchResult] =
- searchIssuesByKeyword(owner, repository, query).map { case (issue, commentCount, content) =>
- IssueSearchResult(
- issue.issueId,
- issue.isPullRequest,
- issue.title,
- issue.openedUserName,
- issue.registeredDate,
- commentCount,
- getHighlightText(content, query)._1)
- }
-
- def countFiles(owner: String, repository: String, query: String): Int =
- using(Git.open(getRepositoryDir(owner, repository))){ git =>
- if(JGitUtil.isEmpty(git)) 0 else searchRepositoryFiles(git, query).length
- }
-
- def searchFiles(owner: String, repository: String, query: String): List[FileSearchResult] =
- using(Git.open(getRepositoryDir(owner, repository))){ git =>
- if(JGitUtil.isEmpty(git)){
- Nil
- } else {
- val files = searchRepositoryFiles(git, query)
- val commits = JGitUtil.getLatestCommitFromPaths(git, files.map(_._1), "HEAD")
- files.map { case (path, text) =>
- val (highlightText, lineNumber) = getHighlightText(text, query)
- FileSearchResult(
- path,
- commits(path).getCommitterIdent.getWhen,
- highlightText,
- lineNumber)
- }
- }
- }
-
- private def searchRepositoryFiles(git: Git, query: String): List[(String, String)] = {
- val revWalk = new RevWalk(git.getRepository)
- val objectId = git.getRepository.resolve("HEAD")
- val revCommit = revWalk.parseCommit(objectId)
- val treeWalk = new TreeWalk(git.getRepository)
- treeWalk.setRecursive(true)
- treeWalk.addTree(revCommit.getTree)
-
- val keywords = StringUtil.splitWords(query.toLowerCase)
- val list = new scala.collection.mutable.ListBuffer[(String, String)]
-
- while (treeWalk.next()) {
- val mode = treeWalk.getFileMode(0)
- if(mode == FileMode.REGULAR_FILE || mode == FileMode.EXECUTABLE_FILE){
- JGitUtil.getContentFromId(git, treeWalk.getObjectId(0), false).foreach { bytes =>
- if(FileUtil.isText(bytes)){
- val text = StringUtil.convertFromByteArray(bytes)
- val lowerText = text.toLowerCase
- val indices = keywords.map(lowerText.indexOf _)
- if(!indices.exists(_ < 0)){
- list.append((treeWalk.getPathString, text))
- }
- }
- }
- }
- }
- treeWalk.release
- revWalk.release
-
- list.toList
- }
-
-}
-
-object RepositorySearchService {
-
- val CodeLimit = 10
- val IssueLimit = 10
-
- def getHighlightText(content: String, query: String): (String, Int) = {
- val keywords = StringUtil.splitWords(query.toLowerCase)
- val lowerText = content.toLowerCase
- val indices = keywords.map(lowerText.indexOf _)
-
- if(!indices.exists(_ < 0)){
- val lineNumber = content.substring(0, indices.min).split("\n").size - 1
- val highlightText = StringUtil.escapeHtml(content.split("\n").drop(lineNumber).take(5).mkString("\n"))
- .replaceAll("(?i)(" + keywords.map("\\Q" + _ + "\\E").mkString("|") + ")",
- "$1")
- (highlightText, lineNumber + 1)
- } else {
- (content.split("\n").take(5).mkString("\n"), 1)
- }
- }
-
- case class SearchResult(
- files : List[(String, String)],
- issues: List[(model.Issue, Int, String)])
-
- case class IssueSearchResult(
- issueId: Int,
- isPullRequest: Boolean,
- title: String,
- openedUserName: String,
- registeredDate: java.util.Date,
- commentCount: Int,
- highlightText: String)
-
- case class FileSearchResult(
- path: String,
- lastModified: java.util.Date,
- highlightText: String,
- highlightLineNumber: Int)
-
-}
diff --git a/src/main/scala/service/RepositoryService.scala b/src/main/scala/service/RepositoryService.scala
deleted file mode 100644
index 34ece5b..0000000
--- a/src/main/scala/service/RepositoryService.scala
+++ /dev/null
@@ -1,400 +0,0 @@
-package service
-
-import model.Profile._
-import profile.simple._
-import model.{Repository, Account, Collaborator, Label}
-import util.JGitUtil
-
-trait RepositoryService { self: AccountService =>
- import RepositoryService._
-
- /**
- * Creates a new repository.
- *
- * @param repositoryName the repository name
- * @param userName the user name of the repository owner
- * @param description the repository description
- * @param isPrivate the repository type (private is true, otherwise false)
- * @param originRepositoryName specify for the forked repository. (default is None)
- * @param originUserName specify for the forked repository. (default is None)
- */
- def createRepository(repositoryName: String, userName: String, description: Option[String], isPrivate: Boolean,
- originRepositoryName: Option[String] = None, originUserName: Option[String] = None,
- parentRepositoryName: Option[String] = None, parentUserName: Option[String] = None)
- (implicit s: Session): Unit = {
- Repositories insert
- Repository(
- userName = userName,
- repositoryName = repositoryName,
- isPrivate = isPrivate,
- description = description,
- defaultBranch = "master",
- registeredDate = currentDate,
- updatedDate = currentDate,
- lastActivityDate = currentDate,
- originUserName = originUserName,
- originRepositoryName = originRepositoryName,
- parentUserName = parentUserName,
- parentRepositoryName = parentRepositoryName)
-
- IssueId insert (userName, repositoryName, 0)
- }
-
- def renameRepository(oldUserName: String, oldRepositoryName: String, newUserName: String, newRepositoryName: String)
- (implicit s: Session): Unit = {
- getAccountByUserName(newUserName).foreach { account =>
- (Repositories filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
- Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
-
- val webHooks = WebHooks .filter(_.byRepository(oldUserName, oldRepositoryName)).list
- val milestones = Milestones .filter(_.byRepository(oldUserName, oldRepositoryName)).list
- val issueId = IssueId .filter(_.byRepository(oldUserName, oldRepositoryName)).list
- val issues = Issues .filter(_.byRepository(oldUserName, oldRepositoryName)).list
- val pullRequests = PullRequests .filter(_.byRepository(oldUserName, oldRepositoryName)).list
- val labels = Labels .filter(_.byRepository(oldUserName, oldRepositoryName)).list
- val issueComments = IssueComments .filter(_.byRepository(oldUserName, oldRepositoryName)).list
- val issueLabels = IssueLabels .filter(_.byRepository(oldUserName, oldRepositoryName)).list
- val commitComments = CommitComments.filter(_.byRepository(oldUserName, oldRepositoryName)).list
- val commitStatuses = CommitStatuses.filter(_.byRepository(oldUserName, oldRepositoryName)).list
- val collaborators = Collaborators .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-
- Repositories.filter { t =>
- (t.originUserName === oldUserName.bind) && (t.originRepositoryName === oldRepositoryName.bind)
- }.map { t => t.originUserName -> t.originRepositoryName }.update(newUserName, newRepositoryName)
-
- Repositories.filter { t =>
- (t.parentUserName === oldUserName.bind) && (t.parentRepositoryName === oldRepositoryName.bind)
- }.map { t => t.originUserName -> t.originRepositoryName }.update(newUserName, newRepositoryName)
-
- PullRequests.filter { t =>
- t.requestRepositoryName === oldRepositoryName.bind
- }.map { t => t.requestUserName -> t.requestRepositoryName }.update(newUserName, newRepositoryName)
-
- // Updates activity fk before deleting repository because activity is sorted by activityId
- // and it can't be changed by deleting-and-inserting record.
- Activities.filter(_.byRepository(oldUserName, oldRepositoryName)).list.foreach { activity =>
- Activities.filter(_.activityId === activity.activityId.bind)
- .map(x => (x.userName, x.repositoryName)).update(newUserName, newRepositoryName)
- }
-
- deleteRepository(oldUserName, oldRepositoryName)
-
- WebHooks .insertAll(webHooks .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
- Milestones.insertAll(milestones .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
- IssueId .insertAll(issueId .map(_.copy(_1 = newUserName, _2 = newRepositoryName)) :_*)
-
- val newMilestones = Milestones.filter(_.byRepository(newUserName, newRepositoryName)).list
- Issues.insertAll(issues.map { x => x.copy(
- userName = newUserName,
- repositoryName = newRepositoryName,
- milestoneId = x.milestoneId.map { id =>
- newMilestones.find(_.title == milestones.find(_.milestoneId == id).get.title).get.milestoneId
- }
- )} :_*)
-
- PullRequests .insertAll(pullRequests .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
- IssueComments .insertAll(issueComments .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
- Labels .insertAll(labels .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
- CommitComments.insertAll(commitComments.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
- CommitStatuses.insertAll(commitStatuses.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-
- // Convert labelId
- val oldLabelMap = labels.map(x => (x.labelId, x.labelName)).toMap
- val newLabelMap = Labels.filter(_.byRepository(newUserName, newRepositoryName)).map(x => (x.labelName, x.labelId)).list.toMap
- IssueLabels.insertAll(issueLabels.map(x => x.copy(
- labelId = newLabelMap(oldLabelMap(x.labelId)),
- userName = newUserName,
- repositoryName = newRepositoryName
- )) :_*)
-
- if(account.isGroupAccount){
- Collaborators.insertAll(getGroupMembers(newUserName).map(m => Collaborator(newUserName, newRepositoryName, m.userName)) :_*)
- } else {
- Collaborators.insertAll(collaborators.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
- }
-
- // Update activity messages
- Activities.filter { t =>
- (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") ||
- (t.message like s"%:${oldUserName}/${oldRepositoryName}#%") ||
- (t.message like s"%:${oldUserName}/${oldRepositoryName}@%")
- }.map { t => t.activityId -> t.message }.list.foreach { case (activityId, message) =>
- Activities.filter(_.activityId === activityId.bind).map(_.message).update(
- message
- .replace(s"[repo:${oldUserName}/${oldRepositoryName}]" ,s"[repo:${newUserName}/${newRepositoryName}]")
- .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#")
- .replace(s"[tag:${oldUserName}/${oldRepositoryName}#" ,s"[tag:${newUserName}/${newRepositoryName}#")
- .replace(s"[pullreq:${oldUserName}/${oldRepositoryName}#",s"[pullreq:${newUserName}/${newRepositoryName}#")
- .replace(s"[issue:${oldUserName}/${oldRepositoryName}#" ,s"[issue:${newUserName}/${newRepositoryName}#")
- .replace(s"[commit:${oldUserName}/${oldRepositoryName}@" ,s"[commit:${newUserName}/${newRepositoryName}@")
- )
- }
- }
- }
- }
-
- def deleteRepository(userName: String, repositoryName: String)(implicit s: Session): Unit = {
- Activities .filter(_.byRepository(userName, repositoryName)).delete
- Collaborators .filter(_.byRepository(userName, repositoryName)).delete
- CommitComments.filter(_.byRepository(userName, repositoryName)).delete
- IssueLabels .filter(_.byRepository(userName, repositoryName)).delete
- Labels .filter(_.byRepository(userName, repositoryName)).delete
- IssueComments .filter(_.byRepository(userName, repositoryName)).delete
- PullRequests .filter(_.byRepository(userName, repositoryName)).delete
- Issues .filter(_.byRepository(userName, repositoryName)).delete
- IssueId .filter(_.byRepository(userName, repositoryName)).delete
- Milestones .filter(_.byRepository(userName, repositoryName)).delete
- WebHooks .filter(_.byRepository(userName, repositoryName)).delete
- Repositories .filter(_.byRepository(userName, repositoryName)).delete
-
- // Update ORIGIN_USER_NAME and ORIGIN_REPOSITORY_NAME
- Repositories
- .filter { x => (x.originUserName === userName.bind) && (x.originRepositoryName === repositoryName.bind) }
- .map { x => (x.userName, x.repositoryName) }
- .list
- .foreach { case (userName, repositoryName) =>
- Repositories
- .filter(_.byRepository(userName, repositoryName))
- .map(x => (x.originUserName?, x.originRepositoryName?))
- .update(None, None)
- }
-
- // Update PARENT_USER_NAME and PARENT_REPOSITORY_NAME
- Repositories
- .filter { x => (x.parentUserName === userName.bind) && (x.parentRepositoryName === repositoryName.bind) }
- .map { x => (x.userName, x.repositoryName) }
- .list
- .foreach { case (userName, repositoryName) =>
- Repositories
- .filter(_.byRepository(userName, repositoryName))
- .map(x => (x.parentUserName?, x.parentRepositoryName?))
- .update(None, None)
- }
- }
-
- /**
- * Returns the repository names of the specified user.
- *
- * @param userName the user name of repository owner
- * @return the list of repository names
- */
- def getRepositoryNamesOfUser(userName: String)(implicit s: Session): List[String] =
- Repositories filter(_.userName === userName.bind) map (_.repositoryName) list
-
- /**
- * Returns the specified repository information.
- *
- * @param userName the user name of the repository owner
- * @param repositoryName the repository name
- * @param baseUrl the base url of this application
- * @return the repository information
- */
- def getRepository(userName: String, repositoryName: String, baseUrl: String)(implicit s: Session): Option[RepositoryInfo] = {
- (Repositories filter { t => t.byRepository(userName, repositoryName) } firstOption) map { repository =>
- // for getting issue count and pull request count
- val issues = Issues.filter { t =>
- t.byRepository(repository.userName, repository.repositoryName) && (t.closed === false.bind)
- }.map(_.pullRequest).list
-
- new RepositoryInfo(
- JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
- repository,
- issues.count(_ == false),
- issues.count(_ == true),
- getForkedCount(
- repository.originUserName.getOrElse(repository.userName),
- repository.originRepositoryName.getOrElse(repository.repositoryName)
- ),
- getRepositoryManagers(repository.userName))
- }
- }
-
- /**
- * Returns the repositories without private repository that user does not have access right.
- * Include public repository, private own repository and private but collaborator repository.
- *
- * @param userName the user name of collaborator
- * @return the repository infomation list
- */
- def getAllRepositories(userName: String)(implicit s: Session): List[(String, String)] = {
- Repositories.filter { t1 =>
- (t1.isPrivate === false.bind) ||
- (t1.userName === userName.bind) ||
- (Collaborators.filter { t2 => t2.byRepository(t1.userName, t1.repositoryName) && (t2.collaboratorName === userName.bind)} exists)
- }.sortBy(_.lastActivityDate desc).map{ t =>
- (t.userName, t.repositoryName)
- }.list
- }
-
- def getUserRepositories(userName: String, baseUrl: String, withoutPhysicalInfo: Boolean = false)
- (implicit s: Session): List[RepositoryInfo] = {
- Repositories.filter { t1 =>
- (t1.userName === userName.bind) ||
- (Collaborators.filter { t2 => t2.byRepository(t1.userName, t1.repositoryName) && (t2.collaboratorName === userName.bind)} exists)
- }.sortBy(_.lastActivityDate desc).list.map{ repository =>
- new RepositoryInfo(
- if(withoutPhysicalInfo){
- new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
- } else {
- JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
- },
- repository,
- getForkedCount(
- repository.originUserName.getOrElse(repository.userName),
- repository.originRepositoryName.getOrElse(repository.repositoryName)
- ),
- getRepositoryManagers(repository.userName))
- }
- }
-
- /**
- * Returns the list of visible repositories for the specified user.
- * If repositoryUserName is given then filters results by repository owner.
- *
- * @param loginAccount the logged in account
- * @param baseUrl the base url of this application
- * @param repositoryUserName the repository owner (if None then returns all repositories which are visible for logged in user)
- * @param withoutPhysicalInfo if true then the result does not include physical repository information such as commit count,
- * branches and tags
- * @return the repository information which is sorted in descending order of lastActivityDate.
- */
- def getVisibleRepositories(loginAccount: Option[Account], baseUrl: String, repositoryUserName: Option[String] = None,
- withoutPhysicalInfo: Boolean = false)
- (implicit s: Session): List[RepositoryInfo] = {
- (loginAccount match {
- // for Administrators
- case Some(x) if(x.isAdmin) => Repositories
- // for Normal Users
- case Some(x) if(!x.isAdmin) =>
- Repositories filter { t => (t.isPrivate === false.bind) || (t.userName === x.userName) ||
- (Collaborators.filter { t2 => t2.byRepository(t.userName, t.repositoryName) && (t2.collaboratorName === x.userName.bind)} exists)
- }
- // for Guests
- case None => Repositories filter(_.isPrivate === false.bind)
- }).filter { t =>
- repositoryUserName.map { userName => t.userName === userName.bind } getOrElse LiteralColumn(true)
- }.sortBy(_.lastActivityDate desc).list.map{ repository =>
- new RepositoryInfo(
- if(withoutPhysicalInfo){
- new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
- } else {
- JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
- },
- repository,
- getForkedCount(
- repository.originUserName.getOrElse(repository.userName),
- repository.originRepositoryName.getOrElse(repository.repositoryName)
- ),
- getRepositoryManagers(repository.userName))
- }
- }
-
- private def getRepositoryManagers(userName: String)(implicit s: Session): Seq[String] =
- if(getAccountByUserName(userName).exists(_.isGroupAccount)){
- getGroupMembers(userName).collect { case x if(x.isManager) => x.userName }
- } else {
- Seq(userName)
- }
-
- /**
- * Updates the last activity date of the repository.
- */
- def updateLastActivityDate(userName: String, repositoryName: String)(implicit s: Session): Unit =
- Repositories.filter(_.byRepository(userName, repositoryName)).map(_.lastActivityDate).update(currentDate)
-
- /**
- * Save repository options.
- */
- def saveRepositoryOptions(userName: String, repositoryName: String,
- description: Option[String], defaultBranch: String, isPrivate: Boolean)(implicit s: Session): Unit =
- Repositories.filter(_.byRepository(userName, repositoryName))
- .map { r => (r.description.?, r.defaultBranch, r.isPrivate, r.updatedDate) }
- .update (description, defaultBranch, isPrivate, currentDate)
-
- /**
- * Add collaborator to the repository.
- *
- * @param userName the user name of the repository owner
- * @param repositoryName the repository name
- * @param collaboratorName the collaborator name
- */
- def addCollaborator(userName: String, repositoryName: String, collaboratorName: String)(implicit s: Session): Unit =
- Collaborators insert Collaborator(userName, repositoryName, collaboratorName)
-
- /**
- * Remove collaborator from the repository.
- *
- * @param userName the user name of the repository owner
- * @param repositoryName the repository name
- * @param collaboratorName the collaborator name
- */
- def removeCollaborator(userName: String, repositoryName: String, collaboratorName: String)(implicit s: Session): Unit =
- Collaborators.filter(_.byPrimaryKey(userName, repositoryName, collaboratorName)).delete
-
- /**
- * Remove all collaborators from the repository.
- *
- * @param userName the user name of the repository owner
- * @param repositoryName the repository name
- */
- def removeCollaborators(userName: String, repositoryName: String)(implicit s: Session): Unit =
- Collaborators.filter(_.byRepository(userName, repositoryName)).delete
-
- /**
- * Returns the list of collaborators name which is sorted with ascending order.
- *
- * @param userName the user name of the repository owner
- * @param repositoryName the repository name
- * @return the list of collaborators name
- */
- def getCollaborators(userName: String, repositoryName: String)(implicit s: Session): List[String] =
- Collaborators.filter(_.byRepository(userName, repositoryName)).sortBy(_.collaboratorName).map(_.collaboratorName).list
-
- def hasWritePermission(owner: String, repository: String, loginAccount: Option[Account])(implicit s: Session): Boolean = {
- loginAccount match {
- case Some(a) if(a.isAdmin) => true
- case Some(a) if(a.userName == owner) => true
- case Some(a) if(getCollaborators(owner, repository).contains(a.userName)) => true
- case _ => false
- }
- }
-
- private def getForkedCount(userName: String, repositoryName: String)(implicit s: Session): Int =
- Query(Repositories.filter { t =>
- (t.originUserName === userName.bind) && (t.originRepositoryName === repositoryName.bind)
- }.length).first
-
-
- def getForkedRepositories(userName: String, repositoryName: String)(implicit s: Session): List[(String, String)] =
- Repositories.filter { t =>
- (t.originUserName === userName.bind) && (t.originRepositoryName === repositoryName.bind)
- }
- .sortBy(_.userName asc).map(t => t.userName -> t.repositoryName).list
-
-}
-
-object RepositoryService {
-
- case class RepositoryInfo(owner: String, name: String, httpUrl: String, repository: Repository,
- issueCount: Int, pullCount: Int, commitCount: Int, forkedCount: Int,
- branchList: Seq[String], tags: Seq[util.JGitUtil.TagInfo], managers: Seq[String]){
-
- lazy val host = """^https?://(.+?)(:\d+)?/""".r.findFirstMatchIn(httpUrl).get.group(1)
-
- def sshUrl(port: Int, userName: String) = s"ssh://${userName}@${host}:${port}/${owner}/${name}.git"
-
- /**
- * Creates instance with issue count and pull request count.
- */
- def this(repo: JGitUtil.RepositoryInfo, model: Repository, issueCount: Int, pullCount: Int, forkedCount: Int, managers: Seq[String]) =
- this(repo.owner, repo.name, repo.url, model, issueCount, pullCount, repo.commitCount, forkedCount, repo.branchList, repo.tags, managers)
-
- /**
- * Creates instance without issue count and pull request count.
- */
- def this(repo: JGitUtil.RepositoryInfo, model: Repository, forkedCount: Int, managers: Seq[String]) =
- this(repo.owner, repo.name, repo.url, model, 0, 0, repo.commitCount, forkedCount, repo.branchList, repo.tags, managers)
- }
-
- case class RepositoryTreeNode(owner: String, name: String, children: List[RepositoryTreeNode])
-}
diff --git a/src/main/scala/service/RequestCache.scala b/src/main/scala/service/RequestCache.scala
deleted file mode 100644
index 4ff502b..0000000
--- a/src/main/scala/service/RequestCache.scala
+++ /dev/null
@@ -1,37 +0,0 @@
-package service
-
-import model.{Account, Issue, Session}
-import util.Implicits.request2Session
-
-/**
- * This service is used for a view helper mainly.
- *
- * It may be called many times in one request, so each method stores
- * its result into the cache which available during a request.
- */
-trait RequestCache extends SystemSettingsService with AccountService with IssuesService {
-
- private implicit def context2Session(implicit context: app.Context): Session =
- request2Session(context.request)
-
- def getIssue(userName: String, repositoryName: String, issueId: String)
- (implicit context: app.Context): Option[Issue] = {
- context.cache(s"issue.${userName}/${repositoryName}#${issueId}"){
- super.getIssue(userName, repositoryName, issueId)
- }
- }
-
- def getAccountByUserName(userName: String)
- (implicit context: app.Context): Option[Account] = {
- context.cache(s"account.${userName}"){
- super.getAccountByUserName(userName)
- }
- }
-
- def getAccountByMailAddress(mailAddress: String)
- (implicit context: app.Context): Option[Account] = {
- context.cache(s"account.${mailAddress}"){
- super.getAccountByMailAddress(mailAddress)
- }
- }
-}
diff --git a/src/main/scala/service/SshKeyService.scala b/src/main/scala/service/SshKeyService.scala
deleted file mode 100644
index 4446084..0000000
--- a/src/main/scala/service/SshKeyService.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-package service
-
-import model.Profile._
-import profile.simple._
-import model.SshKey
-
-trait SshKeyService {
-
- def addPublicKey(userName: String, title: String, publicKey: String)(implicit s: Session): Unit =
- SshKeys insert SshKey(userName = userName, title = title, publicKey = publicKey)
-
- def getPublicKeys(userName: String)(implicit s: Session): List[SshKey] =
- SshKeys.filter(_.userName === userName.bind).sortBy(_.sshKeyId).list
-
- def deletePublicKey(userName: String, sshKeyId: Int)(implicit s: Session): Unit =
- SshKeys filter (_.byPrimaryKey(userName, sshKeyId)) delete
-
-}
diff --git a/src/main/scala/service/SystemSettingsService.scala b/src/main/scala/service/SystemSettingsService.scala
deleted file mode 100644
index 156a23b..0000000
--- a/src/main/scala/service/SystemSettingsService.scala
+++ /dev/null
@@ -1,213 +0,0 @@
-package service
-
-import util.Directory._
-import util.ControlUtil._
-import SystemSettingsService._
-import javax.servlet.http.HttpServletRequest
-
-trait SystemSettingsService {
-
- def baseUrl(implicit request: HttpServletRequest): String = loadSystemSettings().baseUrl(request)
-
- def saveSystemSettings(settings: SystemSettings): Unit = {
- defining(new java.util.Properties()){ props =>
- settings.baseUrl.foreach(x => props.setProperty(BaseURL, x.replaceFirst("/\\Z", "")))
- settings.information.foreach(x => props.setProperty(Information, x))
- props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
- props.setProperty(AllowAnonymousAccess, settings.allowAnonymousAccess.toString)
- props.setProperty(IsCreateRepoOptionPublic, settings.isCreateRepoOptionPublic.toString)
- props.setProperty(Gravatar, settings.gravatar.toString)
- props.setProperty(Notification, settings.notification.toString)
- props.setProperty(Ssh, settings.ssh.toString)
- settings.sshPort.foreach(x => props.setProperty(SshPort, x.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))
- smtp.fromAddress.foreach(props.setProperty(SmtpFromAddress, _))
- smtp.fromName.foreach(props.setProperty(SmtpFromName, _))
- }
- }
- 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)
- ldap.additionalFilterCondition.foreach(x => props.setProperty(LdapAdditionalFilterCondition, x))
- ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
- ldap.mailAttribute.foreach(x => props.setProperty(LdapMailAddressAttribute, x))
- ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
- ldap.ssl.foreach(x => props.setProperty(LdapSsl, x.toString))
- ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
- }
- }
- using(new java.io.FileOutputStream(GitBucketConf)){ out =>
- props.store(out, null)
- }
- }
- }
-
-
- def loadSystemSettings(): SystemSettings = {
- defining(new java.util.Properties()){ props =>
- if(GitBucketConf.exists){
- using(new java.io.FileInputStream(GitBucketConf)){ in =>
- props.load(in)
- }
- }
- SystemSettings(
- getOptionValue[String](props, BaseURL, None).map(x => x.replaceFirst("/\\Z", "")),
- getOptionValue[String](props, Information, None),
- getValue(props, AllowAccountRegistration, false),
- getValue(props, AllowAnonymousAccess, true),
- getValue(props, IsCreateRepoOptionPublic, true),
- getValue(props, Gravatar, true),
- getValue(props, Notification, false),
- getValue(props, Ssh, false),
- getOptionValue(props, SshPort, Some(DefaultSshPort)),
- 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),
- getOptionValue(props, SmtpFromAddress, None),
- getOptionValue(props, SmtpFromName, 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, ""),
- getOptionValue(props, LdapAdditionalFilterCondition, None),
- getOptionValue(props, LdapFullNameAttribute, None),
- getOptionValue(props, LdapMailAddressAttribute, None),
- getOptionValue[Boolean](props, LdapTls, None),
- getOptionValue[Boolean](props, LdapSsl, None),
- getOptionValue(props, LdapKeystore, None)))
- } else {
- None
- }
- )
- }
- }
-
-}
-
-object SystemSettingsService {
- import scala.reflect.ClassTag
-
- case class SystemSettings(
- baseUrl: Option[String],
- information: Option[String],
- allowAccountRegistration: Boolean,
- allowAnonymousAccess: Boolean,
- isCreateRepoOptionPublic: Boolean,
- gravatar: Boolean,
- notification: Boolean,
- ssh: Boolean,
- sshPort: Option[Int],
- smtp: Option[Smtp],
- ldapAuthentication: Boolean,
- ldap: Option[Ldap]){
- def baseUrl(request: HttpServletRequest): String = baseUrl.getOrElse {
- defining(request.getRequestURL.toString){ url =>
- url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
- }
- }.stripSuffix("/")
- }
-
- case class Ldap(
- host: String,
- port: Option[Int],
- bindDN: Option[String],
- bindPassword: Option[String],
- baseDN: String,
- userNameAttribute: String,
- additionalFilterCondition: Option[String],
- fullNameAttribute: Option[String],
- mailAttribute: Option[String],
- tls: Option[Boolean],
- ssl: Option[Boolean],
- keystore: Option[String])
-
- case class Smtp(
- host: String,
- port: Option[Int],
- user: Option[String],
- password: Option[String],
- ssl: Option[Boolean],
- fromAddress: Option[String],
- fromName: Option[String])
-
- val DefaultSshPort = 29418
- val DefaultSmtpPort = 25
- val DefaultLdapPort = 389
-
- private val BaseURL = "base_url"
- private val Information = "information"
- private val AllowAccountRegistration = "allow_account_registration"
- private val AllowAnonymousAccess = "allow_anonymous_access"
- private val IsCreateRepoOptionPublic = "is_create_repository_option_public"
- private val Gravatar = "gravatar"
- private val Notification = "notification"
- private val Ssh = "ssh"
- private val SshPort = "ssh.port"
- private val SmtpHost = "smtp.host"
- private val SmtpPort = "smtp.port"
- private val SmtpUser = "smtp.user"
- private val SmtpPassword = "smtp.password"
- private val SmtpSsl = "smtp.ssl"
- private val SmtpFromAddress = "smtp.from_address"
- private val SmtpFromName = "smtp.from_name"
- private val LdapAuthentication = "ldap_authentication"
- private val LdapHost = "ldap.host"
- private val LdapPort = "ldap.port"
- private val LdapBindDN = "ldap.bindDN"
- private val LdapBindPassword = "ldap.bind_password"
- private val LdapBaseDN = "ldap.baseDN"
- private val LdapUserNameAttribute = "ldap.username_attribute"
- private val LdapAdditionalFilterCondition = "ldap.additional_filter_condition"
- private val LdapFullNameAttribute = "ldap.fullname_attribute"
- private val LdapMailAddressAttribute = "ldap.mail_attribute"
- private val LdapTls = "ldap.tls"
- private val LdapSsl = "ldap.ssl"
- private val LdapKeystore = "ldap.keystore"
-
- 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] =
- 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) =
- defining(implicitly[ClassTag[A]].runtimeClass){ c =>
- if(c == classOf[Boolean]) value.toBoolean
- else if(c == classOf[Int]) value.toInt
- else value
- }
-
-// // TODO temporary flag
-// val enablePluginSystem = Option(System.getProperty("enable.plugin")).getOrElse("false").toBoolean
-
-}
diff --git a/src/main/scala/service/WebHookService.scala b/src/main/scala/service/WebHookService.scala
deleted file mode 100644
index 83c40ac..0000000
--- a/src/main/scala/service/WebHookService.scala
+++ /dev/null
@@ -1,271 +0,0 @@
-package service
-
-import model.Profile._
-import profile.simple._
-import model.{WebHook, Account, Issue, PullRequest, IssueComment, Repository, CommitStatus, CommitState}
-import org.slf4j.LoggerFactory
-import service.RepositoryService.RepositoryInfo
-import util.JGitUtil
-import util.JGitUtil.CommitInfo
-import org.eclipse.jgit.api.Git
-import org.apache.http.message.BasicNameValuePair
-import org.apache.http.client.entity.UrlEncodedFormEntity
-import org.apache.http.NameValuePair
-import java.util.Date
-import api._
-
-trait WebHookService {
- import WebHookService._
-
- private val logger = LoggerFactory.getLogger(classOf[WebHookService])
-
- def getWebHookURLs(owner: String, repository: String)(implicit s: Session): List[WebHook] =
- WebHooks.filter(_.byRepository(owner, repository)).sortBy(_.url).list
-
- def addWebHookURL(owner: String, repository: String, url :String)(implicit s: Session): Unit =
- WebHooks insert WebHook(owner, repository, url)
-
- def deleteWebHookURL(owner: String, repository: String, url :String)(implicit s: Session): Unit =
- WebHooks.filter(_.byPrimaryKey(owner, repository, url)).delete
-
- def callWebHookOf(owner: String, repository: String, eventName: String)(makePayload: => Option[WebHookPayload])(implicit s: Session, c: JsonFormat.Context): Unit = {
- val webHookURLs = getWebHookURLs(owner, repository)
- if(webHookURLs.nonEmpty){
- makePayload.map(callWebHook(eventName, webHookURLs, _))
- }
- }
-
- def callWebHook(eventName: String, webHookURLs: List[WebHook], payload: WebHookPayload)(implicit c: JsonFormat.Context): Unit = {
- import org.apache.http.client.methods.HttpPost
- import org.apache.http.impl.client.HttpClientBuilder
- import scala.concurrent._
- import ExecutionContext.Implicits.global
-
- if(webHookURLs.nonEmpty){
- val json = JsonFormat(payload)
- val httpClient = HttpClientBuilder.create.build
-
- webHookURLs.foreach { webHookUrl =>
- val f = Future {
- logger.debug(s"start web hook invocation for ${webHookUrl}")
- val httpPost = new HttpPost(webHookUrl.url)
- httpPost.addHeader("X-Github-Event", eventName)
-
- val params: java.util.List[NameValuePair] = new java.util.ArrayList()
- params.add(new BasicNameValuePair("payload", json))
- httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8"))
-
- httpClient.execute(httpPost)
- httpPost.releaseConnection()
- logger.debug(s"end web hook invocation for ${webHookUrl}")
- }
- f.onSuccess {
- case s => logger.debug(s"Success: web hook request to ${webHookUrl.url}")
- }
- f.onFailure {
- case t => logger.error(s"Failed: web hook request to ${webHookUrl.url}", t)
- }
- }
- }
- logger.debug("end callWebHook")
- }
-}
-
-
-trait WebHookPullRequestService extends WebHookService {
- self: AccountService with RepositoryService with PullRequestService with IssuesService =>
-
- import WebHookService._
- // https://developer.github.com/v3/activity/events/types/#issuesevent
- def callIssuesWebHook(action: String, repository: RepositoryService.RepositoryInfo, issue: Issue, baseUrl: String, sender: model.Account)(implicit s: Session, context:JsonFormat.Context): Unit = {
- callWebHookOf(repository.owner, repository.name, "issues"){
- val users = getAccountsByUserNames(Set(repository.owner, issue.userName), Set(sender))
- for{
- repoOwner <- users.get(repository.owner)
- issueUser <- users.get(issue.userName)
- } yield {
- WebHookIssuesPayload(
- action = action,
- number = issue.issueId,
- repository = ApiRepository(repository, ApiUser(repoOwner)),
- issue = ApiIssue(issue, ApiUser(issueUser)),
- sender = ApiUser(sender))
- }
- }
- }
-
- def callPullRequestWebHook(action: String, repository: RepositoryService.RepositoryInfo, issueId: Int, baseUrl: String, sender: model.Account)(implicit s: Session, context:JsonFormat.Context): Unit = {
- import WebHookService._
- callWebHookOf(repository.owner, repository.name, "pull_request"){
- for{
- (issue, pullRequest) <- getPullRequest(repository.owner, repository.name, issueId)
- users = getAccountsByUserNames(Set(repository.owner, pullRequest.requestUserName), Set(sender))
- baseOwner <- users.get(repository.owner)
- headOwner <- users.get(pullRequest.requestUserName)
- headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName, baseUrl)
- } yield {
- WebHookPullRequestPayload(
- action = action,
- issue = issue,
- pullRequest = pullRequest,
- headRepository = headRepo,
- headOwner = headOwner,
- baseRepository = repository,
- baseOwner = baseOwner,
- sender = sender)
- }
- }
- }
-
- def getPullRequestsByRequestForWebhook(userName:String, repositoryName:String, branch:String)
- (implicit s: Session): Map[(Issue, PullRequest, Account, Account), List[WebHook]] =
- (for{
- is <- Issues if is.closed === false.bind
- pr <- PullRequests if pr.byPrimaryKey(is.userName, is.repositoryName, is.issueId)
- if pr.requestUserName === userName.bind
- if pr.requestRepositoryName === repositoryName.bind
- if pr.requestBranch === branch.bind
- bu <- Accounts if bu.userName === pr.userName
- ru <- Accounts if ru.userName === pr.requestUserName
- wh <- WebHooks if wh.byRepository(is.userName , is.repositoryName)
- } yield {
- ((is, pr, bu, ru), wh)
- }).list.groupBy(_._1).mapValues(_.map(_._2))
-
- def callPullRequestWebHookByRequestBranch(action: String, requestRepository: RepositoryService.RepositoryInfo, requestBranch: String, baseUrl: String, sender: model.Account)(implicit s: Session, context:JsonFormat.Context): Unit = {
- import WebHookService._
- for{
- ((issue, pullRequest, baseOwner, headOwner), webHooks) <- getPullRequestsByRequestForWebhook(requestRepository.owner, requestRepository.name, requestBranch)
- baseRepo <- getRepository(pullRequest.userName, pullRequest.repositoryName, baseUrl)
- } yield {
- val payload = WebHookPullRequestPayload(
- action = action,
- issue = issue,
- pullRequest = pullRequest,
- headRepository = requestRepository,
- headOwner = headOwner,
- baseRepository = baseRepo,
- baseOwner = baseOwner,
- sender = sender)
- callWebHook("pull_request", webHooks, payload)
- }
- }
-}
-
-trait WebHookIssueCommentService extends WebHookPullRequestService {
- self: AccountService with RepositoryService with PullRequestService with IssuesService =>
-
- import WebHookService._
- def callIssueCommentWebHook(repository: RepositoryService.RepositoryInfo, issue: Issue, issueCommentId: Int, sender: model.Account)(implicit s: Session, context:JsonFormat.Context): Unit = {
- callWebHookOf(repository.owner, repository.name, "issue_comment"){
- for{
- issueComment <- getComment(repository.owner, repository.name, issueCommentId.toString())
- users = getAccountsByUserNames(Set(issue.userName, repository.owner, issueComment.userName), Set(sender))
- issueUser <- users.get(issue.userName)
- repoOwner <- users.get(repository.owner)
- commenter <- users.get(issueComment.userName)
- } yield {
- WebHookIssueCommentPayload(
- issue = issue,
- issueUser = issueUser,
- comment = issueComment,
- commentUser = commenter,
- repository = repository,
- repositoryUser = repoOwner,
- sender = sender)
- }
- }
- }
-}
-
-object WebHookService {
- trait WebHookPayload
-
- // https://developer.github.com/v3/activity/events/types/#pushevent
- case class WebHookPushPayload(
- pusher: ApiUser,
- ref: String,
- commits: List[ApiCommit],
- repository: ApiRepository
- ) extends WebHookPayload
-
- object WebHookPushPayload {
- def apply(git: Git, pusher: Account, refName: String, repositoryInfo: RepositoryInfo,
- commits: List[CommitInfo], repositoryOwner: Account): WebHookPushPayload =
- WebHookPushPayload(
- ApiUser(pusher),
- refName,
- commits.map{ commit => ApiCommit(git, util.RepositoryName(repositoryInfo), commit) },
- ApiRepository(
- repositoryInfo,
- owner= ApiUser(repositoryOwner)
- )
- )
- }
-
- // https://developer.github.com/v3/activity/events/types/#issuesevent
- case class WebHookIssuesPayload(
- action: String,
- number: Int,
- repository: ApiRepository,
- issue: ApiIssue,
- sender: ApiUser) extends WebHookPayload
-
- // https://developer.github.com/v3/activity/events/types/#pullrequestevent
- case class WebHookPullRequestPayload(
- action: String,
- number: Int,
- repository: ApiRepository,
- pull_request: ApiPullRequest,
- sender: ApiUser
- ) extends WebHookPayload
-
- object WebHookPullRequestPayload{
- def apply(action: String,
- issue: Issue,
- pullRequest: PullRequest,
- headRepository: RepositoryInfo,
- headOwner: Account,
- baseRepository: RepositoryInfo,
- baseOwner: Account,
- sender: model.Account): WebHookPullRequestPayload = {
- val headRepoPayload = ApiRepository(headRepository, headOwner)
- val baseRepoPayload = ApiRepository(baseRepository, baseOwner)
- val senderPayload = ApiUser(sender)
- val pr = ApiPullRequest(issue, pullRequest, headRepoPayload, baseRepoPayload, senderPayload)
- WebHookPullRequestPayload(
- action = action,
- number = issue.issueId,
- repository = pr.base.repo,
- pull_request = pr,
- sender = senderPayload
- )
- }
- }
-
- // https://developer.github.com/v3/activity/events/types/#issuecommentevent
- case class WebHookIssueCommentPayload(
- action: String,
- repository: ApiRepository,
- issue: ApiIssue,
- comment: ApiComment,
- sender: ApiUser
- ) extends WebHookPayload
-
- object WebHookIssueCommentPayload{
- def apply(
- issue: Issue,
- issueUser: Account,
- comment: IssueComment,
- commentUser: Account,
- repository: RepositoryInfo,
- repositoryUser: Account,
- sender: Account): WebHookIssueCommentPayload =
- WebHookIssueCommentPayload(
- action = "created",
- repository = ApiRepository(repository, repositoryUser),
- issue = ApiIssue(issue, ApiUser(issueUser)),
- comment = ApiComment(comment, ApiUser(commentUser)),
- sender = ApiUser(sender))
- }
-}
diff --git a/src/main/scala/service/WikiService.scala b/src/main/scala/service/WikiService.scala
deleted file mode 100644
index add5021..0000000
--- a/src/main/scala/service/WikiService.scala
+++ /dev/null
@@ -1,281 +0,0 @@
-package service
-
-import java.util.Date
-import org.eclipse.jgit.api.Git
-import util._
-import _root_.util.ControlUtil._
-import org.eclipse.jgit.treewalk.CanonicalTreeParser
-import org.eclipse.jgit.lib._
-import org.eclipse.jgit.dircache.DirCache
-import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter}
-import java.io.ByteArrayInputStream
-import org.eclipse.jgit.patch._
-import org.eclipse.jgit.api.errors.PatchFormatException
-import scala.collection.JavaConverters._
-import service.RepositoryService.RepositoryInfo
-
-object WikiService {
-
- /**
- * The model for wiki page.
- *
- * @param name the page name
- * @param content the page content
- * @param committer the last committer
- * @param time the last modified time
- * @param id the latest commit id
- */
- case class WikiPageInfo(name: String, content: String, committer: String, time: Date, id: String)
-
- /**
- * The model for wiki page history.
- *
- * @param name the page name
- * @param committer the committer the committer
- * @param message the commit message
- * @param date the commit date
- */
- case class WikiPageHistoryInfo(name: String, committer: String, message: String, date: Date)
-
- def httpUrl(repository: RepositoryInfo) = repository.httpUrl.replaceFirst("\\.git\\Z", ".wiki.git")
-
- def sshUrl(repository: RepositoryInfo, settings: SystemSettingsService.SystemSettings, userName: String) =
- repository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), userName).replaceFirst("\\.git\\Z", ".wiki.git")
-}
-
-trait WikiService {
- import WikiService._
-
- def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit =
- LockUtil.lock(s"${owner}/${repository}/wiki"){
- defining(Directory.getWikiRepositoryDir(owner, repository)){ dir =>
- if(!dir.exists){
- JGitUtil.initRepository(dir)
- saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit", None)
- }
- }
- }
-
- /**
- * 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)){
- JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
- WikiPageInfo(file.name, StringUtil.convertFromByteArray(git.getRepository.open(file.id).getBytes),
- file.author, file.time, file.commitId)
- }
- } else None
- }
- }
-
- /**
- * Returns the content of the specified file.
- */
- def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] =
- using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
- if(!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)
-
- 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.
- */
- def getWikiPageList(owner: String, repository: String): List[String] = {
- using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
- JGitUtil.getFileList(git, "master", ".")
- .filter(_.name.endsWith(".md"))
- .map(_.name.stripSuffix(".md"))
- .sortBy(x => x)
- }
- }
-
- /**
- * Reverts specified changes.
- */
- def revertWikiPage(owner: String, repository: String, from: String, to: String,
- committer: model.Account, pageName: Option[String]): Boolean = {
-
- case class RevertInfo(operation: String, filePath: String, source: String)
-
- try {
- LockUtil.lock(s"${owner}/${repository}/wiki"){
- using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-
- val reader = git.getRepository.newObjectReader
- val oldTreeIter = new CanonicalTreeParser
- oldTreeIter.reset(reader, git.getRepository.resolve(from + "^{tree}"))
-
- val newTreeIter = new CanonicalTreeParser
- newTreeIter.reset(reader, git.getRepository.resolve(to + "^{tree}"))
-
- val diffs = git.diff.setNewTree(oldTreeIter).setOldTree(newTreeIter).call.asScala.filter { diff =>
- pageName match {
- case Some(x) => diff.getNewPath == x + ".md"
- case None => true
- }
- }
-
- val patch = using(new java.io.ByteArrayOutputStream()){ out =>
- val formatter = new DiffFormatter(out)
- formatter.setRepository(git.getRepository)
- formatter.format(diffs.asJava)
- new String(out.toByteArray, "UTF-8")
- }
-
- val p = new Patch()
- p.parse(new ByteArrayInputStream(patch.getBytes("UTF-8")))
- if(!p.getErrors.isEmpty){
- throw new PatchFormatException(p.getErrors())
- }
- val revertInfo = (p.getFiles.asScala.map { fh =>
- fh.getChangeType match {
- case DiffEntry.ChangeType.MODIFY => {
- val source = getWikiPage(owner, repository, fh.getNewPath.stripSuffix(".md")).map(_.content).getOrElse("")
- val applied = PatchUtil.apply(source, patch, fh)
- if(applied != null){
- Seq(RevertInfo("ADD", fh.getNewPath, applied))
- } else Nil
- }
- case DiffEntry.ChangeType.ADD => {
- val applied = PatchUtil.apply("", patch, fh)
- if(applied != null){
- Seq(RevertInfo("ADD", fh.getNewPath, applied))
- } else Nil
- }
- case DiffEntry.ChangeType.DELETE => {
- Seq(RevertInfo("DELETE", fh.getNewPath, ""))
- }
- case DiffEntry.ChangeType.RENAME => {
- val applied = PatchUtil.apply("", patch, fh)
- if(applied != null){
- Seq(RevertInfo("DELETE", fh.getOldPath, ""), RevertInfo("ADD", fh.getNewPath, applied))
- } else {
- Seq(RevertInfo("DELETE", fh.getOldPath, ""))
- }
- }
- case _ => Nil
- }
- }).flatten
-
- if(revertInfo.nonEmpty){
- val builder = DirCache.newInCore.builder()
- val inserter = git.getRepository.newObjectInserter()
- val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}")
-
- JGitUtil.processTree(git, headId){ (path, tree) =>
- if(revertInfo.find(x => x.filePath == path).isEmpty){
- builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
- }
- }
-
- revertInfo.filter(_.operation == "ADD").foreach { x =>
- builder.add(JGitUtil.createDirCacheEntry(x.filePath, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, x.source.getBytes("UTF-8"))))
- }
- builder.finish()
-
- JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
- Constants.HEAD, committer.fullName, committer.mailAddress,
- pageName match {
- case Some(x) => s"Revert ${from} ... ${to} on ${x}"
- case None => s"Revert ${from} ... ${to}"
- })
- }
- }
- }
- true
- } catch {
- case e: Exception => {
- e.printStackTrace()
- false
- }
- }
- }
-
- /**
- * Save the wiki page.
- */
- def saveWikiPage(owner: String, repository: String, currentPageName: String, newPageName: String,
- content: String, committer: model.Account, message: String, currentId: Option[String]): Option[String] = {
- LockUtil.lock(s"${owner}/${repository}/wiki"){
- using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
- val builder = DirCache.newInCore.builder()
- val inserter = git.getRepository.newObjectInserter()
- val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}")
- var created = true
- var updated = false
- var removed = false
-
- if(headId != null){
- JGitUtil.processTree(git, headId){ (path, tree) =>
- if(path == currentPageName + ".md" && currentPageName != newPageName){
- removed = true
- } else if(path != newPageName + ".md"){
- builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
- } else {
- created = false
- updated = JGitUtil.getContentFromId(git, tree.getEntryObjectId, true).map(new String(_, "UTF-8") != content).getOrElse(false)
- }
- }
- }
-
- if(created || updated || removed){
- builder.add(JGitUtil.createDirCacheEntry(newPageName + ".md", FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
- builder.finish()
- val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
- Constants.HEAD, committer.fullName, committer.mailAddress,
- if(message.trim.length == 0) {
- if(removed){
- s"Rename ${currentPageName} to ${newPageName}"
- } else if(created){
- s"Created ${newPageName}"
- } else {
- s"Updated ${newPageName}"
- }
- } else {
- message
- })
-
- Some(newHeadId.getName)
- } else None
- }
- }
- }
-
- /**
- * Delete the wiki page.
- */
- def deleteWikiPage(owner: String, repository: String, pageName: String,
- committer: String, mailAddress: String, message: String): Unit = {
- LockUtil.lock(s"${owner}/${repository}/wiki"){
- using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
- val builder = DirCache.newInCore.builder()
- val inserter = git.getRepository.newObjectInserter()
- val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}")
- var removed = false
-
- JGitUtil.processTree(git, headId){ (path, tree) =>
- if(path != pageName + ".md"){
- builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
- } else {
- removed = true
- }
- }
- if(removed){
- builder.finish()
- JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
- Constants.HEAD, committer, mailAddress, message)
- }
- }
- }
- }
-
-}
diff --git a/src/main/scala/servlet/AccessTokenAuthenticationFilter.scala b/src/main/scala/servlet/AccessTokenAuthenticationFilter.scala
deleted file mode 100644
index 56e50c2..0000000
--- a/src/main/scala/servlet/AccessTokenAuthenticationFilter.scala
+++ /dev/null
@@ -1,41 +0,0 @@
-package servlet
-
-import javax.servlet._
-import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
-
-import service.AccessTokenService
-import util.Keys
-import org.scalatra.servlet.ServletApiImplicits._
-import model.Account
-import org.scalatra._
-
-class AccessTokenAuthenticationFilter extends Filter with AccessTokenService {
- private val tokenHeaderPrefix = "token "
-
- override def init(filterConfig: FilterConfig): Unit = {}
-
- override def destroy(): Unit = {}
-
- override def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
- implicit val request = req.asInstanceOf[HttpServletRequest]
- implicit val session = req.getAttribute(Keys.Request.DBSession).asInstanceOf[slick.jdbc.JdbcBackend#Session]
- val response = res.asInstanceOf[HttpServletResponse]
- Option(request.getHeader("Authorization")).map{
- case auth if auth.startsWith("token ") => AccessTokenService.getAccountByAccessToken(auth.substring(6).trim).toRight(Unit)
- // TODO Basic Authentication Support
- case _ => Left(Unit)
- }.orElse{
- Option(request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]).map(Right(_))
- } match {
- case Some(Right(account)) => request.setAttribute(Keys.Session.LoginAccount, account); chain.doFilter(req, res)
- case None => chain.doFilter(req, res)
- case Some(Left(_)) => {
- response.setStatus(HttpServletResponse.SC_UNAUTHORIZED)
- response.setContentType("Content-Type: application/json; charset=utf-8")
- val w = response.getWriter()
- w.print("""{ "message": "Bad credentials" }""")
- w.close()
- }
- }
- }
-}
diff --git a/src/main/scala/servlet/BasicAuthenticationFilter.scala b/src/main/scala/servlet/BasicAuthenticationFilter.scala
deleted file mode 100644
index cbecfc1..0000000
--- a/src/main/scala/servlet/BasicAuthenticationFilter.scala
+++ /dev/null
@@ -1,92 +0,0 @@
-package servlet
-
-import javax.servlet._
-import javax.servlet.http._
-import service.{SystemSettingsService, AccountService, RepositoryService}
-import model._
-import org.slf4j.LoggerFactory
-import util.Implicits._
-import util.ControlUtil._
-import util.Keys
-
-/**
- * Provides BASIC Authentication for [[servlet.GitRepositoryServlet]].
- */
-class BasicAuthenticationFilter extends Filter with RepositoryService with AccountService with SystemSettingsService {
-
- private val logger = LoggerFactory.getLogger(classOf[BasicAuthenticationFilter])
-
- def init(config: FilterConfig) = {}
-
- def destroy(): Unit = {}
-
- def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
- implicit val request = req.asInstanceOf[HttpServletRequest]
- val response = res.asInstanceOf[HttpServletResponse]
-
- val wrappedResponse = new HttpServletResponseWrapper(response){
- override def setCharacterEncoding(encoding: String) = {}
- }
-
- val isUpdating = request.getRequestURI.endsWith("/git-receive-pack") || "service=git-receive-pack".equals(request.getQueryString)
-
- val settings = loadSystemSettings()
-
- try {
- defining(request.paths){
- case Array(_, repositoryOwner, repositoryName, _*) =>
- getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki\\.git$|\\.git$", ""), "") match {
- case Some(repository) => {
- if(!isUpdating && !repository.repository.isPrivate && settings.allowAnonymousAccess){
- chain.doFilter(req, wrappedResponse)
- } else {
- request.getHeader("Authorization") match {
- case null => requireAuth(response)
- case auth => decodeAuthHeader(auth).split(":") match {
- case Array(username, password) => {
- authenticate(settings, username, password) match {
- case Some(account) => {
- if(isUpdating && hasWritePermission(repository.owner, repository.name, Some(account))){
- request.setAttribute(Keys.Request.UserName, account.userName)
- }
- chain.doFilter(req, wrappedResponse)
- }
- case None => requireAuth(response)
- }
- }
- case _ => requireAuth(response)
- }
- }
- }
- }
- case None => {
- logger.debug(s"Repository ${repositoryOwner}/${repositoryName} is not found.")
- response.sendError(HttpServletResponse.SC_NOT_FOUND)
- }
- }
- case _ => {
- logger.debug(s"Not enough path arguments: ${request.paths}")
- response.sendError(HttpServletResponse.SC_NOT_FOUND)
- }
- }
- } catch {
- case ex: Exception => {
- logger.error("error", ex)
- requireAuth(response)
- }
- }
- }
-
- private def requireAuth(response: HttpServletResponse): Unit = {
- response.setHeader("WWW-Authenticate", "BASIC realm=\"GitBucket\"")
- response.sendError(HttpServletResponse.SC_UNAUTHORIZED)
- }
-
- private def decodeAuthHeader(header: String): String = {
- try {
- new String(new sun.misc.BASE64Decoder().decodeBuffer(header.substring(6)))
- } catch {
- case _: Throwable => ""
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala
deleted file mode 100644
index 9ebb4ac..0000000
--- a/src/main/scala/servlet/GitRepositoryServlet.scala
+++ /dev/null
@@ -1,217 +0,0 @@
-package servlet
-
-import org.eclipse.jgit.http.server.GitServlet
-import org.eclipse.jgit.lib._
-import org.eclipse.jgit.transport._
-import org.eclipse.jgit.transport.resolver._
-import org.slf4j.LoggerFactory
-
-import javax.servlet.ServletConfig
-import javax.servlet.ServletContext
-import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
-import util.{StringUtil, Keys, JGitUtil, Directory}
-import util.ControlUtil._
-import util.Implicits._
-import service._
-import WebHookService._
-import org.eclipse.jgit.api.Git
-import util.JGitUtil.CommitInfo
-import service.IssuesService.IssueSearchCondition
-import model.Session
-
-/**
- * Provides Git repository via HTTP.
- *
- * This servlet provides only Git repository functionality.
- * Authentication is provided by [[servlet.BasicAuthenticationFilter]].
- */
-class GitRepositoryServlet extends GitServlet with SystemSettingsService {
-
- private val logger = LoggerFactory.getLogger(classOf[GitRepositoryServlet])
-
- override def init(config: ServletConfig): Unit = {
- setReceivePackFactory(new GitBucketReceivePackFactory())
-
- // TODO are there any other ways...?
- super.init(new ServletConfig(){
- def getInitParameter(name: String): String = name match {
- case "base-path" => Directory.RepositoryHome
- case "export-all" => "true"
- case name => config.getInitParameter(name)
- }
- def getInitParameterNames(): java.util.Enumeration[String] = {
- config.getInitParameterNames
- }
-
- def getServletContext(): ServletContext = config.getServletContext
- def getServletName(): String = config.getServletName
- })
-
- super.init(config)
- }
-
- override def service(req: HttpServletRequest, res: HttpServletResponse): Unit = {
- val agent = req.getHeader("USER-AGENT")
- val index = req.getRequestURI.indexOf(".git")
- if(index >= 0 && (agent == null || agent.toLowerCase.indexOf("git/") < 0)){
- // redirect for browsers
- val paths = req.getRequestURI.substring(0, index).split("/")
- res.sendRedirect(baseUrl(req) + "/" + paths.dropRight(1).last + "/" + paths.last)
- } else {
- // response for git client
- super.service(req, res)
- }
- }
-}
-
-class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] with SystemSettingsService {
-
- private val logger = LoggerFactory.getLogger(classOf[GitBucketReceivePackFactory])
-
- override def create(request: HttpServletRequest, db: Repository): ReceivePack = {
- val receivePack = new ReceivePack(db)
- val pusher = request.getAttribute(Keys.Request.UserName).asInstanceOf[String]
-
- logger.debug("requestURI: " + request.getRequestURI)
- logger.debug("pusher:" + pusher)
-
- defining(request.paths){ paths =>
- val owner = paths(1)
- val repository = paths(2).stripSuffix(".git")
-
- logger.debug("repository:" + owner + "/" + repository)
-
- if(!repository.endsWith(".wiki")){
- defining(request) { implicit r =>
- val hook = new CommitLogHook(owner, repository, pusher, baseUrl)
- receivePack.setPreReceiveHook(hook)
- receivePack.setPostReceiveHook(hook)
- }
- }
- receivePack
- }
- }
-}
-
-import scala.collection.JavaConverters._
-
-class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)(implicit session: Session)
- extends PostReceiveHook with PreReceiveHook
- with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService
- with WebHookPullRequestService {
-
- private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])
- private var existIds: Seq[String] = Nil
-
- def onPreReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
- try {
- using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
- existIds = JGitUtil.getAllCommitIds(git)
- }
- } catch {
- case ex: Exception => {
- logger.error(ex.toString, ex)
- throw ex
- }
- }
- }
-
- def onPostReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
- try {
- using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
- val pushedIds = scala.collection.mutable.Set[String]()
- commands.asScala.foreach { command =>
- logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
- implicit val apiContext = api.JsonFormat.Context(baseUrl)
- val refName = command.getRefName.split("/")
- val branchName = refName.drop(2).mkString("/")
- val commits = if (refName(1) == "tags") {
- Nil
- } else {
- command.getType match {
- case ReceiveCommand.Type.DELETE => Nil
- case _ => JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
- }
- }
-
- // Retrieve all issue count in the repository
- val issueCount =
- countIssue(IssueSearchCondition(state = "open"), false, owner -> repository) +
- countIssue(IssueSearchCondition(state = "closed"), false, owner -> repository)
-
- val repositoryInfo = getRepository(owner, repository, baseUrl).get
-
- // Extract new commit and apply issue comment
- val defaultBranch = repositoryInfo.repository.defaultBranch
- val newCommits = commits.flatMap { commit =>
- if (!existIds.contains(commit.id) && !pushedIds.contains(commit.id)) {
- if (issueCount > 0) {
- pushedIds.add(commit.id)
- createIssueComment(commit)
- // close issues
- if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){
- closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository)
- }
- }
- Some(commit)
- } else None
- }
-
- // record activity
- if(refName(1) == "heads"){
- command.getType match {
- case ReceiveCommand.Type.CREATE => recordCreateBranchActivity(owner, repository, pusher, branchName)
- case ReceiveCommand.Type.UPDATE => recordPushActivity(owner, repository, pusher, branchName, newCommits)
- case ReceiveCommand.Type.DELETE => recordDeleteBranchActivity(owner, repository, pusher, branchName)
- case _ =>
- }
- } else if(refName(1) == "tags"){
- command.getType match {
- case ReceiveCommand.Type.CREATE => recordCreateTagActivity(owner, repository, pusher, branchName, newCommits)
- case ReceiveCommand.Type.DELETE => recordDeleteTagActivity(owner, repository, pusher, branchName, newCommits)
- case _ =>
- }
- }
-
- if(refName(1) == "heads"){
- command.getType match {
- case ReceiveCommand.Type.CREATE |
- ReceiveCommand.Type.UPDATE |
- ReceiveCommand.Type.UPDATE_NONFASTFORWARD =>
- updatePullRequests(owner, repository, branchName)
- getAccountByUserName(pusher).map{ pusherAccount =>
- callPullRequestWebHookByRequestBranch("synchronize", repositoryInfo, branchName, baseUrl, pusherAccount)
- }
- case _ =>
- }
- }
-
- // call web hook
- callWebHookOf(owner, repository, "push"){
- for(pusherAccount <- getAccountByUserName(pusher);
- ownerAccount <- getAccountByUserName(owner)) yield {
- WebHookPushPayload(git, pusherAccount, command.getRefName, repositoryInfo, newCommits, ownerAccount)
- }
- }
- }
- }
- // update repository last modified time.
- updateLastActivityDate(owner, repository)
- } catch {
- case ex: Exception => {
- logger.error(ex.toString, ex)
- throw ex
- }
- }
- }
-
- private def createIssueComment(commit: CommitInfo) = {
- StringUtil.extractIssueId(commit.fullMessage).foreach { issueId =>
- if(getIssue(owner, repository, issueId).isDefined){
- getAccountByMailAddress(commit.committerEmailAddress).foreach { account =>
- createComment(owner, repository, account.userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
- }
- }
- }
- }
-}
diff --git a/src/main/scala/servlet/InitializeListener.scala b/src/main/scala/servlet/InitializeListener.scala
deleted file mode 100644
index a4b1e1e..0000000
--- a/src/main/scala/servlet/InitializeListener.scala
+++ /dev/null
@@ -1,205 +0,0 @@
-package servlet
-
-import java.io.File
-import java.sql.{DriverManager, Connection}
-import org.apache.commons.io.FileUtils
-import javax.servlet.{ServletContextListener, ServletContextEvent}
-import org.slf4j.LoggerFactory
-import util.Directory._
-import util.ControlUtil._
-import util.JDBCUtil._
-import org.eclipse.jgit.api.Git
-import util.{Version, Versions}
-import plugin._
-import util.{DatabaseConfig, Directory}
-
-object AutoUpdate {
-
- /**
- * The history of versions. A head of this sequence is the current BitBucket version.
- */
- val versions = Seq(
- new Version(2, 9),
- new Version(2, 8),
- new Version(2, 7) {
- override def update(conn: Connection, cl: ClassLoader): Unit = {
- super.update(conn, cl)
- conn.select("SELECT * FROM REPOSITORY"){ rs =>
- // Rename attached files directory from /issues to /comments
- val userName = rs.getString("USER_NAME")
- val repoName = rs.getString("REPOSITORY_NAME")
- defining(Directory.getAttachedDir(userName, repoName)){ newDir =>
- val oldDir = new File(newDir.getParentFile, "issues")
- if(oldDir.exists && oldDir.isDirectory){
- oldDir.renameTo(newDir)
- }
- }
- // Update ORIGIN_USER_NAME and ORIGIN_REPOSITORY_NAME if it does not exist
- val originalUserName = rs.getString("ORIGIN_USER_NAME")
- val originalRepoName = rs.getString("ORIGIN_REPOSITORY_NAME")
- if(originalUserName != null && originalRepoName != null){
- if(conn.selectInt("SELECT COUNT(*) FROM REPOSITORY WHERE USER_NAME = ? AND REPOSITORY_NAME = ?",
- originalUserName, originalRepoName) == 0){
- conn.update("UPDATE REPOSITORY SET ORIGIN_USER_NAME = NULL, ORIGIN_REPOSITORY_NAME = NULL " +
- "WHERE USER_NAME = ? AND REPOSITORY_NAME = ?", userName, repoName)
- }
- }
- // Update PARENT_USER_NAME and PARENT_REPOSITORY_NAME if it does not exist
- val parentUserName = rs.getString("PARENT_USER_NAME")
- val parentRepoName = rs.getString("PARENT_REPOSITORY_NAME")
- if(parentUserName != null && parentRepoName != null){
- if(conn.selectInt("SELECT COUNT(*) FROM REPOSITORY WHERE USER_NAME = ? AND REPOSITORY_NAME = ?",
- parentUserName, parentRepoName) == 0){
- conn.update("UPDATE REPOSITORY SET PARENT_USER_NAME = NULL, PARENT_REPOSITORY_NAME = NULL " +
- "WHERE USER_NAME = ? AND REPOSITORY_NAME = ?", userName, repoName)
- }
- }
- }
- }
- },
- new Version(2, 6),
- new Version(2, 5),
- new Version(2, 4),
- new Version(2, 3) {
- override def update(conn: Connection, cl: ClassLoader): Unit = {
- super.update(conn, cl)
- conn.select("SELECT ACTIVITY_ID, ADDITIONAL_INFO FROM ACTIVITY WHERE ACTIVITY_TYPE='push'"){ rs =>
- val curInfo = rs.getString("ADDITIONAL_INFO")
- val newInfo = curInfo.split("\n").filter(_ matches "^[0-9a-z]{40}:.*").mkString("\n")
- if (curInfo != newInfo) {
- conn.update("UPDATE ACTIVITY SET ADDITIONAL_INFO = ? WHERE ACTIVITY_ID = ?", newInfo, rs.getInt("ACTIVITY_ID"))
- }
- }
- ignore {
- FileUtils.deleteDirectory(Directory.getPluginCacheDir())
- //FileUtils.deleteDirectory(new File(Directory.PluginHome))
- }
- }
- },
- new Version(2, 2),
- new Version(2, 1),
- new Version(2, 0){
- override def update(conn: Connection, cl: ClassLoader): Unit = {
- import eu.medsea.mimeutil.{MimeUtil2, MimeType}
-
- val mimeUtil = new MimeUtil2()
- mimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector")
-
- super.update(conn, cl)
- conn.select("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY"){ rs =>
- defining(Directory.getAttachedDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME"))){ dir =>
- if(dir.exists && dir.isDirectory){
- dir.listFiles.foreach { file =>
- if(file.getName.indexOf('.') < 0){
- val mimeType = MimeUtil2.getMostSpecificMimeType(mimeUtil.getMimeTypes(file, new MimeType("application/octet-stream"))).toString
- if(mimeType.startsWith("image/")){
- file.renameTo(new File(file.getParent, file.getName + "." + mimeType.split("/")(1)))
- }
- }
- }
- }
- }
- }
- }
- },
- Version(1, 13),
- Version(1, 12),
- Version(1, 11),
- Version(1, 10),
- Version(1, 9),
- Version(1, 8),
- Version(1, 7),
- Version(1, 6),
- Version(1, 5),
- Version(1, 4),
- new Version(1, 3){
- override def update(conn: Connection, cl: ClassLoader): Unit = {
- super.update(conn, cl)
- // Fix wiki repository configuration
- conn.select("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY"){ rs =>
- using(Git.open(getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME")))){ git =>
- defining(git.getRepository.getConfig){ config =>
- if(!config.getBoolean("http", "receivepack", false)){
- config.setBoolean("http", null, "receivepack", true)
- config.save
- }
- }
- }
- }
- }
- },
- Version(1, 2),
- Version(1, 1),
- Version(1, 0),
- Version(0, 0)
- )
-
- /**
- * The head version of BitBucket.
- */
- val headVersion = versions.head
-
- /**
- * The version file (GITBUCKET_HOME/version).
- */
- lazy val versionFile = new File(GitBucketHome, "version")
-
- /**
- * Returns the current version from the version file.
- */
- def getCurrentVersion(): Version = {
- if(versionFile.exists){
- FileUtils.readFileToString(versionFile, "UTF-8").trim.split("\\.") match {
- case Array(majorVersion, minorVersion) => {
- versions.find { v =>
- v.majorVersion == majorVersion.toInt && v.minorVersion == minorVersion.toInt
- }.getOrElse(Version(0, 0))
- }
- case _ => Version(0, 0)
- }
- } else Version(0, 0)
- }
-
-}
-
-/**
- * Initialize GitBucket system.
- * Update database schema and load plug-ins automatically in the context initializing.
- */
-class InitializeListener extends ServletContextListener {
- import AutoUpdate._
-
- private val logger = LoggerFactory.getLogger(classOf[InitializeListener])
-
- override def contextInitialized(event: ServletContextEvent): Unit = {
- val dataDir = event.getServletContext.getInitParameter("gitbucket.home")
- if(dataDir != null){
- System.setProperty("gitbucket.home", dataDir)
- }
- org.h2.Driver.load()
-
- defining(getConnection()){ conn =>
- // Migration
- logger.debug("Start schema update")
- Versions.update(conn, headVersion, getCurrentVersion(), versions, Thread.currentThread.getContextClassLoader){ conn =>
- FileUtils.writeStringToFile(versionFile, headVersion.versionString, "UTF-8")
- }
- // Load plugins
- logger.debug("Initialize plugins")
- PluginRegistry.initialize(event.getServletContext, conn)
- }
-
- }
-
- def contextDestroyed(event: ServletContextEvent): Unit = {
- // Shutdown plugins
- PluginRegistry.shutdown(event.getServletContext)
- }
-
- private def getConnection(): Connection =
- DriverManager.getConnection(
- DatabaseConfig.url,
- DatabaseConfig.user,
- DatabaseConfig.password)
-
-}
diff --git a/src/main/scala/servlet/SessionCleanupListener.scala b/src/main/scala/servlet/SessionCleanupListener.scala
deleted file mode 100644
index ee4ea7b..0000000
--- a/src/main/scala/servlet/SessionCleanupListener.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-package servlet
-
-import javax.servlet.http.{HttpSessionEvent, HttpSessionListener}
-import org.apache.commons.io.FileUtils
-import util.Directory._
-
-/**
- * Removes session associated temporary files when session is destroyed.
- */
-class SessionCleanupListener extends HttpSessionListener {
-
- def sessionCreated(se: HttpSessionEvent): Unit = {}
-
- def sessionDestroyed(se: HttpSessionEvent): Unit = FileUtils.deleteDirectory(getTemporaryDir(se.getSession.getId))
-
-}
diff --git a/src/main/scala/servlet/TransactionFilter.scala b/src/main/scala/servlet/TransactionFilter.scala
deleted file mode 100644
index 20d37f5..0000000
--- a/src/main/scala/servlet/TransactionFilter.scala
+++ /dev/null
@@ -1,59 +0,0 @@
-package servlet
-
-import javax.servlet._
-import javax.servlet.http.HttpServletRequest
-import com.mchange.v2.c3p0.ComboPooledDataSource
-import org.slf4j.LoggerFactory
-import slick.jdbc.JdbcBackend.{Database => SlickDatabase, Session}
-import util.{DatabaseConfig, Keys}
-
-/**
- * Controls the transaction with the open session in view pattern.
- */
-class TransactionFilter extends Filter {
-
- private val logger = LoggerFactory.getLogger(classOf[TransactionFilter])
-
- def init(config: FilterConfig) = {}
-
- def destroy(): Unit = {}
-
- def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
- if(req.asInstanceOf[HttpServletRequest].getRequestURI().startsWith("/assets/")){
- // assets don't need transaction
- chain.doFilter(req, res)
- } else {
- Database() withTransaction { session =>
- logger.debug("begin transaction")
- req.setAttribute(Keys.Request.DBSession, session)
- chain.doFilter(req, res)
- logger.debug("end transaction")
- }
- }
- }
-
-}
-
-object Database {
-
- private val logger = LoggerFactory.getLogger(Database.getClass)
-
- private val db: SlickDatabase = {
- val datasource = new ComboPooledDataSource
-
- datasource.setDriverClass(DatabaseConfig.driver)
- datasource.setJdbcUrl(DatabaseConfig.url)
- datasource.setUser(DatabaseConfig.user)
- datasource.setPassword(DatabaseConfig.password)
-
- logger.debug("load database connection pool")
-
- SlickDatabase.forDataSource(datasource)
- }
-
- def apply(): SlickDatabase = db
-
- def getSession(req: ServletRequest): Session =
- req.getAttribute(Keys.Request.DBSession).asInstanceOf[Session]
-
-}
diff --git a/src/main/scala/ssh/GitCommand.scala b/src/main/scala/ssh/GitCommand.scala
deleted file mode 100644
index 35fb67b..0000000
--- a/src/main/scala/ssh/GitCommand.scala
+++ /dev/null
@@ -1,132 +0,0 @@
-package ssh
-
-import org.apache.sshd.server.{CommandFactory, Environment, ExitCallback, Command}
-import org.slf4j.LoggerFactory
-import java.io.{InputStream, OutputStream}
-import util.ControlUtil._
-import org.eclipse.jgit.api.Git
-import util.Directory._
-import org.eclipse.jgit.transport.{ReceivePack, UploadPack}
-import org.apache.sshd.server.command.UnknownCommand
-import servlet.{Database, CommitLogHook}
-import service.{AccountService, RepositoryService, SystemSettingsService}
-import org.eclipse.jgit.errors.RepositoryNotFoundException
-import model.Session
-
-object GitCommand {
- val CommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-_.]+).git'\Z""".r
-}
-
-abstract class GitCommand(val owner: String, val repoName: String) extends Command {
- self: RepositoryService with AccountService =>
-
- private val logger = LoggerFactory.getLogger(classOf[GitCommand])
- protected var err: OutputStream = null
- protected var in: InputStream = null
- protected var out: OutputStream = null
- protected var callback: ExitCallback = null
-
- protected def runTask(user: String)(implicit session: Session): Unit
-
- private def newTask(user: String): Runnable = new Runnable {
- override def run(): Unit = {
- Database() withSession { implicit session =>
- try {
- runTask(user)
- callback.onExit(0)
- } catch {
- case e: RepositoryNotFoundException =>
- logger.info(e.getMessage)
- callback.onExit(1, "Repository Not Found")
- case e: Throwable =>
- logger.error(e.getMessage, e)
- callback.onExit(1)
- }
- }
- }
- }
-
- override def start(env: Environment): Unit = {
- val user = env.getEnv.get("USER")
- val thread = new Thread(newTask(user))
- thread.start()
- }
-
- override def destroy(): Unit = {}
-
- override def setExitCallback(callback: ExitCallback): Unit = {
- this.callback = callback
- }
-
- override def setErrorStream(err: OutputStream): Unit = {
- this.err = err
- }
-
- override def setOutputStream(out: OutputStream): Unit = {
- this.out = out
- }
-
- override def setInputStream(in: InputStream): Unit = {
- this.in = in
- }
-
- protected def isWritableUser(username: String, repositoryInfo: RepositoryService.RepositoryInfo)
- (implicit session: Session): Boolean =
- getAccountByUserName(username) match {
- case Some(account) => hasWritePermission(repositoryInfo.owner, repositoryInfo.name, Some(account))
- case None => false
- }
-
-}
-
-class GitUploadPack(owner: String, repoName: String, baseUrl: String) extends GitCommand(owner, repoName)
- with RepositoryService with AccountService {
-
- override protected def runTask(user: String)(implicit session: Session): Unit = {
- getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
- if(!repositoryInfo.repository.isPrivate || isWritableUser(user, repositoryInfo)){
- using(Git.open(getRepositoryDir(owner, repoName))) { git =>
- val repository = git.getRepository
- val upload = new UploadPack(repository)
- upload.upload(in, out, err)
- }
- }
- }
- }
-
-}
-
-class GitReceivePack(owner: String, repoName: String, baseUrl: String) extends GitCommand(owner, repoName)
- with SystemSettingsService with RepositoryService with AccountService {
-
- override protected def runTask(user: String)(implicit session: Session): Unit = {
- getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
- if(isWritableUser(user, repositoryInfo)){
- using(Git.open(getRepositoryDir(owner, repoName))) { git =>
- val repository = git.getRepository
- val receive = new ReceivePack(repository)
- if(!repoName.endsWith(".wiki")){
- val hook = new CommitLogHook(owner, repoName, user, baseUrl)
- receive.setPreReceiveHook(hook)
- receive.setPostReceiveHook(hook)
- }
- receive.receive(in, out, err)
- }
- }
- }
- }
-
-}
-
-class GitCommandFactory(baseUrl: String) extends CommandFactory {
- private val logger = LoggerFactory.getLogger(classOf[GitCommandFactory])
-
- override def createCommand(command: String): Command = {
- logger.debug(s"command: $command")
- command match {
- case GitCommand.CommandRegex("upload", owner, repoName) => new GitUploadPack(owner, repoName, baseUrl)
- case GitCommand.CommandRegex("receive", owner, repoName) => new GitReceivePack(owner, repoName, baseUrl)
- case _ => new UnknownCommand(command)
- }
- }
-}
diff --git a/src/main/scala/ssh/NoShell.scala b/src/main/scala/ssh/NoShell.scala
deleted file mode 100644
index c107be6..0000000
--- a/src/main/scala/ssh/NoShell.scala
+++ /dev/null
@@ -1,62 +0,0 @@
-package ssh
-
-import org.apache.sshd.common.Factory
-import org.apache.sshd.server.{Environment, ExitCallback, Command}
-import java.io.{OutputStream, InputStream}
-import org.eclipse.jgit.lib.Constants
-import service.SystemSettingsService
-
-class NoShell extends Factory[Command] with SystemSettingsService {
- override def create(): Command = new Command() {
- private var in: InputStream = null
- private var out: OutputStream = null
- private var err: OutputStream = null
- private var callback: ExitCallback = null
-
- override def start(env: Environment): Unit = {
- val user = env.getEnv.get("USER")
- val port = loadSystemSettings().sshPort.getOrElse(SystemSettingsService.DefaultSshPort)
- val message =
- """
- | Welcome to
- | _____ _ _ ____ _ _
- | / ____| (_) | | | _ \ | | | |
- | | | __ _ | |_ | |_) | _ _ ___ | | __ ___ | |_
- | | | |_ | | | | __| | _ < | | | | / __| | |/ / / _ \ | __|
- | | |__| | | | | |_ | |_) | | |_| | | (__ | < | __/ | |_
- | \_____| |_| \__| |____/ \__,_| \___| |_|\_\ \___| \__|
- |
- | Successfully SSH Access.
- | But interactive shell is disabled.
- |
- | Please use:
- |
- | git clone ssh://%s@GITBUCKET_HOST:%d/OWNER/REPOSITORY_NAME.git
- """.stripMargin.format(user, port).replace("\n", "\r\n") + "\r\n"
- err.write(Constants.encode(message))
- err.flush()
- in.close()
- out.close()
- err.close()
- callback.onExit(127)
- }
-
- override def destroy(): Unit = {}
-
- override def setInputStream(in: InputStream): Unit = {
- this.in = in
- }
-
- override def setOutputStream(out: OutputStream): Unit = {
- this.out = out
- }
-
- override def setErrorStream(err: OutputStream): Unit = {
- this.err = err
- }
-
- override def setExitCallback(callback: ExitCallback): Unit = {
- this.callback = callback
- }
- }
-}
diff --git a/src/main/scala/ssh/PublicKeyAuthenticator.scala b/src/main/scala/ssh/PublicKeyAuthenticator.scala
deleted file mode 100644
index ddcc724..0000000
--- a/src/main/scala/ssh/PublicKeyAuthenticator.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package ssh
-
-import org.apache.sshd.server.PublickeyAuthenticator
-import org.apache.sshd.server.session.ServerSession
-import java.security.PublicKey
-import service.SshKeyService
-import servlet.Database
-
-class PublicKeyAuthenticator extends PublickeyAuthenticator with SshKeyService {
-
- override def authenticate(username: String, key: PublicKey, session: ServerSession): Boolean = {
- Database() withSession { implicit session =>
- getPublicKeys(username).exists { sshKey =>
- SshUtil.str2PublicKey(sshKey.publicKey) match {
- case Some(publicKey) => key.equals(publicKey)
- case _ => false
- }
- }
- }
- }
-
-}
diff --git a/src/main/scala/ssh/SshServerListener.scala b/src/main/scala/ssh/SshServerListener.scala
deleted file mode 100644
index b441cae..0000000
--- a/src/main/scala/ssh/SshServerListener.scala
+++ /dev/null
@@ -1,69 +0,0 @@
-package ssh
-
-import javax.servlet.{ServletContextEvent, ServletContextListener}
-import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider
-import org.slf4j.LoggerFactory
-import util.Directory
-import service.SystemSettingsService
-import java.util.concurrent.atomic.AtomicBoolean
-
-object SshServer {
- private val logger = LoggerFactory.getLogger(SshServer.getClass)
- private val server = org.apache.sshd.SshServer.setUpDefaultServer()
- private val active = new AtomicBoolean(false)
-
- private def configure(port: Int, baseUrl: String) = {
- server.setPort(port)
- server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(s"${Directory.GitBucketHome}/gitbucket.ser"))
- server.setPublickeyAuthenticator(new PublicKeyAuthenticator)
- server.setCommandFactory(new GitCommandFactory(baseUrl))
- server.setShellFactory(new NoShell)
- }
-
- def start(port: Int, baseUrl: String) = {
- if(active.compareAndSet(false, true)){
- configure(port, baseUrl)
- server.start()
- logger.info(s"Start SSH Server Listen on ${server.getPort}")
- }
- }
-
- def stop() = {
- if(active.compareAndSet(true, false)){
- server.stop(true)
- logger.info("SSH Server is stopped.")
- }
- }
-
- def isActive = active.get
-}
-
-/*
- * Start a SSH Server Daemon
- *
- * How to use:
- * git clone ssh://username@host_or_ip:29418/owner/repository_name.git
- */
-class SshServerListener extends ServletContextListener with SystemSettingsService {
-
- private val logger = LoggerFactory.getLogger(classOf[SshServerListener])
-
- override def contextInitialized(sce: ServletContextEvent): Unit = {
- val settings = loadSystemSettings()
- if(settings.ssh){
- settings.baseUrl match {
- case None =>
- logger.error("Could not start SshServer because the baseUrl is not configured.")
- case Some(baseUrl) =>
- SshServer.start(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), baseUrl)
- }
- }
- }
-
- override def contextDestroyed(sce: ServletContextEvent): Unit = {
- if(loadSystemSettings().ssh){
- SshServer.stop()
- }
- }
-
-}
diff --git a/src/main/scala/ssh/SshUtil.scala b/src/main/scala/ssh/SshUtil.scala
deleted file mode 100644
index 9d6484c..0000000
--- a/src/main/scala/ssh/SshUtil.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package ssh
-
-import java.security.PublicKey
-import org.slf4j.LoggerFactory
-import org.apache.commons.codec.binary.Base64
-import org.eclipse.jgit.lib.Constants
-import org.apache.sshd.common.util.{KeyUtils, Buffer}
-
-object SshUtil {
-
- private val logger = LoggerFactory.getLogger(SshUtil.getClass)
-
- def str2PublicKey(key: String): Option[PublicKey] = {
- // TODO RFC 4716 Public Key is not supported...
- val parts = key.split(" ")
- if (parts.size < 2) {
- logger.debug(s"Invalid PublicKey Format: ${key}")
- return None
- }
- try {
- val encodedKey = parts(1)
- val decode = Base64.decodeBase64(Constants.encodeASCII(encodedKey))
- Some(new Buffer(decode).getRawPublicKey)
- } catch {
- case e: Throwable =>
- logger.debug(e.getMessage, e)
- None
- }
- }
-
- def fingerPrint(key: String): Option[String] = str2PublicKey(key) match {
- case Some(publicKey) => Some(KeyUtils.getFingerPrint(publicKey))
- case None => None
- }
-
-}
diff --git a/src/main/scala/util/Authenticator.scala b/src/main/scala/util/Authenticator.scala
deleted file mode 100644
index f40af7b..0000000
--- a/src/main/scala/util/Authenticator.scala
+++ /dev/null
@@ -1,181 +0,0 @@
-package util
-
-import app.ControllerBase
-import service._
-import RepositoryService.RepositoryInfo
-import util.Implicits._
-import util.ControlUtil._
-
-/**
- * Allows only oneself and administrators.
- */
-trait OneselfAuthenticator { self: ControllerBase =>
- protected def oneselfOnly(action: => Any) = { authenticate(action) }
- protected def oneselfOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }
-
- private def authenticate(action: => Any) = {
- {
- defining(request.paths){ paths =>
- context.loginAccount match {
- case Some(x) if(x.isAdmin) => action
- case Some(x) if(paths(0) == x.userName) => action
- case _ => Unauthorized()
- }
- }
- }
- }
-}
-
-/**
- * Allows only the repository owner and administrators.
- */
-trait OwnerAuthenticator { self: ControllerBase with RepositoryService with AccountService =>
- protected def ownerOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
- protected def ownerOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
-
- private def authenticate(action: (RepositoryInfo) => Any) = {
- {
- defining(request.paths){ paths =>
- getRepository(paths(0), paths(1), baseUrl).map { repository =>
- context.loginAccount match {
- case Some(x) if(x.isAdmin) => action(repository)
- case Some(x) if(repository.owner == x.userName) => action(repository)
- case Some(x) if(getGroupMembers(repository.owner).exists { member =>
- member.userName == x.userName && member.isManager == true
- }) => action(repository)
- case _ => Unauthorized()
- }
- } getOrElse NotFound()
- }
- }
- }
-}
-
-/**
- * Allows only signed in users.
- */
-trait UsersAuthenticator { self: ControllerBase =>
- protected def usersOnly(action: => Any) = { authenticate(action) }
- protected def usersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }
-
- private def authenticate(action: => Any) = {
- {
- context.loginAccount match {
- case Some(x) => action
- case None => Unauthorized()
- }
- }
- }
-}
-
-/**
- * Allows only administrators.
- */
-trait AdminAuthenticator { self: ControllerBase =>
- protected def adminOnly(action: => Any) = { authenticate(action) }
- protected def adminOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }
-
- private def authenticate(action: => Any) = {
- {
- context.loginAccount match {
- case Some(x) if(x.isAdmin) => action
- case _ => Unauthorized()
- }
- }
- }
-}
-
-/**
- * Allows only collaborators and administrators.
- */
-trait CollaboratorsAuthenticator { self: ControllerBase with RepositoryService =>
- protected def collaboratorsOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
- protected def collaboratorsOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
-
- private def authenticate(action: (RepositoryInfo) => Any) = {
- {
- defining(request.paths){ paths =>
- getRepository(paths(0), paths(1), baseUrl).map { repository =>
- context.loginAccount match {
- case Some(x) if(x.isAdmin) => action(repository)
- case Some(x) if(paths(0) == x.userName) => action(repository)
- case Some(x) if(getCollaborators(paths(0), paths(1)).contains(x.userName)) => action(repository)
- case _ => Unauthorized()
- }
- } getOrElse NotFound()
- }
- }
- }
-}
-
-/**
- * Allows only the repository owner (or manager for group repository) and administrators.
- */
-trait ReferrerAuthenticator { self: ControllerBase with RepositoryService =>
- protected def referrersOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
- protected def referrersOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
-
- private def authenticate(action: (RepositoryInfo) => Any) = {
- {
- defining(request.paths){ paths =>
- getRepository(paths(0), paths(1), baseUrl).map { repository =>
- if(!repository.repository.isPrivate){
- action(repository)
- } else {
- context.loginAccount match {
- case Some(x) if(x.isAdmin) => action(repository)
- case Some(x) if(paths(0) == x.userName) => action(repository)
- case Some(x) if(getCollaborators(paths(0), paths(1)).contains(x.userName)) => action(repository)
- case _ => Unauthorized()
- }
- }
- } getOrElse NotFound()
- }
- }
- }
-}
-
-/**
- * Allows only signed in users which can access the repository.
- */
-trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService =>
- protected def readableUsersOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
- protected def readableUsersOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
-
- private def authenticate(action: (RepositoryInfo) => Any) = {
- {
- defining(request.paths){ paths =>
- getRepository(paths(0), paths(1), baseUrl).map { repository =>
- context.loginAccount match {
- case Some(x) if(x.isAdmin) => action(repository)
- case Some(x) if(!repository.repository.isPrivate) => action(repository)
- case Some(x) if(paths(0) == x.userName) => action(repository)
- case Some(x) if(getCollaborators(paths(0), paths(1)).contains(x.userName)) => action(repository)
- case _ => Unauthorized()
- }
- } getOrElse NotFound()
- }
- }
- }
-}
-
-/**
- * Allows only the group managers.
- */
-trait GroupManagerAuthenticator { self: ControllerBase with AccountService =>
- protected def managersOnly(action: => Any) = { authenticate(action) }
- protected def managersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }
-
- private def authenticate(action: => Any) = {
- {
- defining(request.paths){ paths =>
- context.loginAccount match {
- case Some(x) if(getGroupMembers(paths(0)).exists { member =>
- member.userName == x.userName && member.isManager
- }) => action
- case _ => Unauthorized()
- }
- }
- }
- }
-}
diff --git a/src/main/scala/util/ControlUtil.scala b/src/main/scala/util/ControlUtil.scala
deleted file mode 100644
index 7945f32..0000000
--- a/src/main/scala/util/ControlUtil.scala
+++ /dev/null
@@ -1,46 +0,0 @@
-package util
-
-import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.revwalk.RevWalk
-import org.eclipse.jgit.treewalk.TreeWalk
-import scala.util.control.Exception._
-import scala.language.reflectiveCalls
-
-/**
- * Provides control facilities.
- */
-object ControlUtil {
-
- def defining[A, B](value: A)(f: A => B): B = f(value)
-
- def using[A <% { def close(): Unit }, B](resource: A)(f: A => B): B =
- try f(resource) finally {
- if(resource != null){
- ignoring(classOf[Throwable]) {
- resource.close()
- }
- }
- }
-
- def using[T](git: Git)(f: Git => T): T =
- try f(git) finally git.getRepository.close()
-
- def using[T](git1: Git, git2: Git)(f: (Git, Git) => T): T =
- try f(git1, git2) finally {
- git1.getRepository.close()
- git2.getRepository.close()
- }
-
- def using[T](revWalk: RevWalk)(f: RevWalk => T): T =
- try f(revWalk) finally revWalk.release()
-
- def using[T](treeWalk: TreeWalk)(f: TreeWalk => T): T =
- try f(treeWalk) finally treeWalk.release()
-
- def ignore[T](f: => Unit): Unit = try {
- f
- } catch {
- case e: Exception => ()
- }
-
-}
diff --git a/src/main/scala/util/DatabaseConfig.scala b/src/main/scala/util/DatabaseConfig.scala
deleted file mode 100644
index 86453e3..0000000
--- a/src/main/scala/util/DatabaseConfig.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package util
-
-import com.typesafe.config.ConfigFactory
-import util.Directory.DatabaseHome
-
-object DatabaseConfig {
-
- private val config = ConfigFactory.load("database")
- private val dbUrl = config.getString("db.url")
-
- def url(directory: Option[String]): String =
- dbUrl.replace("${DatabaseHome}", directory.getOrElse(DatabaseHome))
-
- val url: String = url(None)
- val user: String = config.getString("db.user")
- val password: String = config.getString("db.password")
- val driver: String = config.getString("db.driver")
-
-}
diff --git a/src/main/scala/util/Directory.scala b/src/main/scala/util/Directory.scala
deleted file mode 100644
index 9008171..0000000
--- a/src/main/scala/util/Directory.scala
+++ /dev/null
@@ -1,87 +0,0 @@
-package util
-
-import java.io.File
-import util.ControlUtil._
-import org.apache.commons.io.FileUtils
-
-/**
- * Provides directories used by GitBucket.
- */
-object Directory {
-
- val GitBucketHome = (System.getProperty("gitbucket.home") match {
- // -Dgitbucket.home=- |--
- |View it on GitBucket - """.stripMargin - - def msgPullRequest(url: String) = (content: String) => s""" - |${content}
- |View, comment on, or merge it at:
- |${url} - """.stripMargin - - def msgComment(url: String) = (content: String) => s""" - |${content}
- |--
- |View it on GitBucket - """.stripMargin - - def msgStatus(url: String) = (content: String) => s""" - |${content} #${url split('/') last} - """.stripMargin -} - -class Mailer(private val smtp: Smtp) extends Notifier { - private val logger = LoggerFactory.getLogger(classOf[Mailer]) - - def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String) - (msg: String => String)(implicit context: Context) = { - val database = Database() - - val f = Future { - database withSession { implicit session => - getIssue(r.owner, r.name, issueId.toString) foreach { issue => - defining( - s"[${r.name}] ${issue.title} (#${issueId})" -> - msg(view.Markdown.toHtml(content, r, false, true))) { case (subject, msg) => - recipients(issue) { to => - val email = new HtmlEmail - email.setHostName(smtp.host) - email.setSmtpPort(smtp.port.get) - smtp.user.foreach { user => - email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse(""))) - } - smtp.ssl.foreach { ssl => - email.setSSLOnConnect(ssl) - } - smtp.fromAddress - .map (_ -> smtp.fromName.orNull) - .orElse (Some("notifications@gitbucket.com" -> context.loginAccount.get.userName)) - .foreach { case (address, name) => - email.setFrom(address, name) - } - email.setCharset("UTF-8") - email.setSubject(subject) - email.setHtmlMsg(msg) - - email.addTo(to).send - } - } - } - } - "Notifications Successful." - } - f onSuccess { - case s => logger.debug(s) - } - f onFailure { - case t => logger.error("Notifications Failed.", t) - } - } -} -class MockMailer extends Notifier { - def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String) - (msg: String => String)(implicit context: Context): Unit = {} -} diff --git a/src/main/scala/util/RepoitoryName.scala b/src/main/scala/util/RepoitoryName.scala deleted file mode 100644 index 0e6edbf..0000000 --- a/src/main/scala/util/RepoitoryName.scala +++ /dev/null @@ -1,18 +0,0 @@ -package util - -case class RepositoryName(owner:String, name:String){ - val fullName = s"${owner}/${name}" -} - -object RepositoryName{ - def apply(fullName: String): RepositoryName = { - fullName.split("/").toList match { - case owner :: name :: Nil => RepositoryName(owner, name) - case _ => throw new IllegalArgumentException(s"${fullName} is not repositoryName (only 'owner/name')") - } - } - def apply(repository: model.Repository): RepositoryName = RepositoryName(repository.userName, repository.repositoryName) - def apply(repository: util.JGitUtil.RepositoryInfo): RepositoryName = RepositoryName(repository.owner, repository.name) - def apply(repository: service.RepositoryService.RepositoryInfo): RepositoryName = RepositoryName(repository.owner, repository.name) - def apply(repository: model.CommitStatus): RepositoryName = RepositoryName(repository.userName, repository.repositoryName) -} diff --git a/src/main/scala/util/StringUtil.scala b/src/main/scala/util/StringUtil.scala deleted file mode 100644 index dac3de3..0000000 --- a/src/main/scala/util/StringUtil.scala +++ /dev/null @@ -1,83 +0,0 @@ -package util - -import java.net.{URLDecoder, URLEncoder} -import org.mozilla.universalchardet.UniversalDetector -import util.ControlUtil._ -import org.apache.commons.io.input.BOMInputStream -import org.apache.commons.io.IOUtils - -object StringUtil { - - def sha1(value: String): String = - defining(java.security.MessageDigest.getInstance("SHA-1")){ md => - md.update(value.getBytes) - md.digest.map(b => "%02x".format(b)).mkString - } - - def md5(value: String): String = { - val md = java.security.MessageDigest.getInstance("MD5") - md.update(value.getBytes) - md.digest.map(b => "%02x".format(b)).mkString - } - - def urlEncode(value: String): String = URLEncoder.encode(value, "UTF-8") - - def urlDecode(value: String): String = URLDecoder.decode(value, "UTF-8") - - def splitWords(value: String): Array[String] = value.split("[ \\t ]+") - - def escapeHtml(value: String): String = - value.replace("&", "&").replace("<", "<").replace(">", ">").replace("\"", """) - - /** - * Make string from byte array. Character encoding is detected automatically by [[util.StringUtil.detectEncoding]]. - * And if given bytes contains UTF-8 BOM, it's removed from returned string. - */ - def convertFromByteArray(content: Array[Byte]): String = - IOUtils.toString(new BOMInputStream(new java.io.ByteArrayInputStream(content)), detectEncoding(content)) - - def detectEncoding(content: Array[Byte]): String = - defining(new UniversalDetector(null)){ detector => - detector.handleData(content, 0, content.length) - detector.dataEnd() - detector.getDetectedCharset match { - case null => "UTF-8" - case e => e - } - } - - /** - * Converts line separator in the given content. - * - * @param content the content - * @param lineSeparator "LF" or "CRLF" - * @return the converted content - */ - def convertLineSeparator(content: String, lineSeparator: String): String = { - val lf = content.replace("\r\n", "\n").replace("\r", "\n") - if(lineSeparator == "CRLF"){ - lf.replace("\n", "\r\n") - } else { - lf - } - } - - /** - * Extract issue id like ```#issueId``` from the given message. - * - *@param message the message which may contains issue id - * @return the iterator of issue id - */ - def extractIssueId(message: String): Iterator[String] = - "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(message).matchData.map(_.group(2)) - - /** - * Extract close issue id like ```close #issueId ``` from the given message. - * - * @param message the message which may contains close command - * @return the iterator of issue id - */ - def extractCloseId(message: String): Iterator[String] = - "(?i)(? - if(in != null){ - val sql = IOUtils.toString(in, "UTF-8") - using(conn.createStatement()){ stmt => - logger.debug(sqlPath + "=" + sql) - stmt.executeUpdate(sql) - } - } - } - } - - - /** - * MAJOR.MINOR - */ - val versionString = s"${majorVersion}.${minorVersion}" - -} - -object Versions { - - private val logger = LoggerFactory.getLogger(Versions.getClass) - - def update(conn: Connection, headVersion: Version, currentVersion: Version, versions: Seq[Version], cl: ClassLoader) - (save: Connection => Unit): Unit = { - logger.debug("Start schema update") - try { - if(currentVersion == headVersion){ - logger.debug("No update") - } else if(currentVersion.versionString != "0.0" && !versions.contains(currentVersion)){ - logger.warn(s"Skip migration because ${currentVersion.versionString} is illegal version.") - } else { - versions.takeWhile(_ != currentVersion).reverse.foreach(_.update(conn, cl)) - save(conn) - logger.debug(s"Updated from ${currentVersion.versionString} to ${headVersion.versionString}") - } - } catch { - case ex: Throwable => { - logger.error("Failed to schema update", ex) - ex.printStackTrace() - conn.rollback() - } - } - logger.debug("End schema update") - } - -} - diff --git a/src/main/scala/view/AvatarImageProvider.scala b/src/main/scala/view/AvatarImageProvider.scala deleted file mode 100644 index 8e610af..0000000 --- a/src/main/scala/view/AvatarImageProvider.scala +++ /dev/null @@ -1,51 +0,0 @@ -package view - -import service.RequestCache -import play.twirl.api.Html -import util.StringUtil - -trait AvatarImageProvider { self: RequestCache => - - /** - * Returns <img> which displays the avatar icon. - * Looks up Gravatar if avatar icon has not been configured in user settings. - */ - protected def getAvatarImageHtml(userName: String, size: Int, - mailAddress: String = "", tooltip: Boolean = false)(implicit context: app.Context): Html = { - - val src = if(mailAddress.isEmpty){ - // by user name - getAccountByUserName(userName).map { account => - if(account.image.isEmpty && context.settings.gravatar){ - s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}&d=retro&r=g""" - } else { - s"""${context.path}/${account.userName}/_avatar""" - } - } getOrElse { - s"""${context.path}/_unknown/_avatar""" - } - } else { - // by mail address - getAccountByMailAddress(mailAddress).map { account => - if(account.image.isEmpty && context.settings.gravatar){ - s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}&d=retro&r=g""" - } else { - s"""${context.path}/${account.userName}/_avatar""" - } - } getOrElse { - if(context.settings.gravatar){ - s"""https://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}&d=retro&r=g""" - } else { - s"""${context.path}/_unknown/_avatar""" - } - } - } - - if(tooltip){ - Html(s"""
") - text = text.substring(1) - } - printer.printEncoded(text) - printer.print("") - } -} - -class GitBucketHtmlSerializer( - markdown: String, - repository: service.RepositoryService.RepositoryInfo, - enableWikiLink: Boolean, - enableRefsLink: Boolean, - enableTaskList: Boolean, - hasWritePermission: Boolean, - pages: List[String] - )(implicit val context: app.Context) extends ToHtmlSerializer( - new GitBucketLinkRender(context, repository, enableWikiLink, pages), - Map[String, VerbatimSerializer](VerbatimSerializer.DEFAULT -> new GitBucketVerbatimSerializer).asJava - ) with LinkConverter with RequestCache { - - override protected def printImageTag(imageNode: SuperNode, url: String): Unit = { - printer.print("") - .print("
- """).indent(+2)
- visitChildren(node)
- printer.indent(-2).println().print("
") - }" - ) - } - } - - /** - * Returns <img> which displays the avatar icon for the given user name. - * This method looks up Gravatar if avatar icon has not been configured in user settings. - */ - def avatar(userName: String, size: Int, tooltip: Boolean = false)(implicit context: app.Context): Html = - getAvatarImageHtml(userName, size, "", tooltip) - - /** - * Returns <img> which displays the avatar icon for the given mail address. - * This method looks up Gravatar if avatar icon has not been configured in user settings. - */ - def avatar(commit: util.JGitUtil.CommitInfo, size: Int)(implicit context: app.Context): Html = - getAvatarImageHtml(commit.authorName, size, commit.authorEmailAddress) - - /** - * Converts commit id, issue id and username to the link. - */ - def link(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): Html = - Html(convertRefsLinks(value, repository)) - - def cut(value: String, length: Int): String = - if(value.length > length){ - value.substring(0, length) + "..." - } else { - value - } - - import scala.util.matching.Regex._ - implicit class RegexReplaceString(s: String) { - def replaceAll(pattern: String, replacer: (Match) => String): String = { - pattern.r.replaceAllIn(s, replacer) - } - } - - /** - * Convert link notations in the activity message. - */ - def activityMessage(message: String)(implicit context: app.Context): Html = - Html(message - .replaceAll("\\[issue:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]" , s"""$$1/$$2#$$3""") - .replaceAll("\\[pullreq:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]" , s"""$$1/$$2#$$3""") - .replaceAll("\\[repo:([^\\s]+?)/([^\\s]+?)\\]" , s"""$$1/$$2""") - .replaceAll("\\[branch:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]" , (m: Match) => s"""${m.group(3)}""") - .replaceAll("\\[tag:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]" , (m: Match) => s"""${m.group(3)}""") - .replaceAll("\\[user:([^\\s]+?)\\]" , (m: Match) => user(m.group(1)).body) - .replaceAll("\\[commit:([^\\s]+?)/([^\\s]+?)\\@([^\\s]+?)\\]", (m: Match) => s"""${m.group(1)}/${m.group(2)}@${m.group(3).substring(0, 7)}""") - ) - - /** - * URL encode except '/'. - */ - def encodeRefName(value: String): String = StringUtil.urlEncode(value).replace("%2F", "/") - - def urlEncode(value: String): String = StringUtil.urlEncode(value) - - def urlEncode(value: Option[String]): String = value.map(urlEncode).getOrElse("") - - /** - * Generates the url to the repository. - */ - def url(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): String = - s"${context.path}/${repository.owner}/${repository.name}" - - /** - * Generates the url to the account page. - */ - def url(userName: String)(implicit context: app.Context): String = s"${context.path}/${userName}" - - /** - * Returns the url to the root of assets. - */ - def assets(implicit context: app.Context): String = s"${context.path}/assets" - - /** - * Generates the text link to the account page. - * If user does not exist or disabled, this method returns user name as text without link. - */ - def user(userName: String, mailAddress: String = "", styleClass: String = "")(implicit context: app.Context): Html = - userWithContent(userName, mailAddress, styleClass)(Html(userName)) - - /** - * Generates the avatar link to the account page. - * If user does not exist or disabled, this method returns avatar image without link. - */ - def avatarLink(userName: String, size: Int, mailAddress: String = "", tooltip: Boolean = false)(implicit context: app.Context): Html = - userWithContent(userName, mailAddress)(avatar(userName, size, tooltip)) - - private def userWithContent(userName: String, mailAddress: String = "", styleClass: String = "")(content: Html)(implicit context: app.Context): Html = - (if(mailAddress.isEmpty){ - getAccountByUserName(userName) - } else { - getAccountByMailAddress(mailAddress) - }).map { account => - Html(s"""${content}""") - } getOrElse content - - - /** - * Test whether the given Date is past date. - */ - def isPast(date: Date): Boolean = System.currentTimeMillis > date.getTime - - /** - * Returns file type for AceEditor. - */ - def editorType(fileName: String): String = { - fileName.toLowerCase match { - case x if(x.endsWith(".bat")) => "batchfile" - case x if(x.endsWith(".java")) => "java" - case x if(x.endsWith(".scala")) => "scala" - case x if(x.endsWith(".js")) => "javascript" - case x if(x.endsWith(".css")) => "css" - case x if(x.endsWith(".md")) => "markdown" - case x if(x.endsWith(".html")) => "html" - case x if(x.endsWith(".xml")) => "xml" - case x if(x.endsWith(".c")) => "c_cpp" - case x if(x.endsWith(".cpp")) => "c_cpp" - case x if(x.endsWith(".coffee")) => "coffee" - case x if(x.endsWith(".ejs")) => "ejs" - case x if(x.endsWith(".hs")) => "haskell" - case x if(x.endsWith(".json")) => "json" - case x if(x.endsWith(".jsp")) => "jsp" - case x if(x.endsWith(".jsx")) => "jsx" - case x if(x.endsWith(".cl")) => "lisp" - case x if(x.endsWith(".clojure")) => "lisp" - case x if(x.endsWith(".lua")) => "lua" - case x if(x.endsWith(".php")) => "php" - case x if(x.endsWith(".py")) => "python" - case x if(x.endsWith(".rdoc")) => "rdoc" - case x if(x.endsWith(".rhtml")) => "rhtml" - case x if(x.endsWith(".ruby")) => "ruby" - case x if(x.endsWith(".sh")) => "sh" - case x if(x.endsWith(".sql")) => "sql" - case x if(x.endsWith(".tcl")) => "tcl" - case x if(x.endsWith(".vbs")) => "vbscript" - case x if(x.endsWith(".yml")) => "yaml" - case _ => "plain_text" - } - } - - def pre(value: Html): Html = Html(s"
${value.body.trim.split("\n").map(_.trim).mkString("\n")}")
-
- /**
- * Implicit conversion to add mkHtml() to Seq[Html].
- */
- implicit class RichHtmlSeq(seq: Seq[Html]) {
- def mkHtml(separator: String) = Html(seq.mkString(separator))
- def mkHtml(separator: scala.xml.Elem) = Html(seq.mkString(separator.toString))
- }
-
- def commitStateIcon(state: CommitState) = Html(state match {
- case CommitState.PENDING => "●"
- case CommitState.SUCCESS => "✔"
- case CommitState.ERROR => "×"
- case CommitState.FAILURE => "×"
- })
-
- def commitStateText(state: CommitState, commitId:String) = state match {
- case CommitState.PENDING => "Waiting to hear about "+commitId.substring(0,8)
- case CommitState.SUCCESS => "All is well"
- case CommitState.ERROR => "Failed"
- case CommitState.FAILURE => "Failed"
- }
-}
diff --git a/src/main/twirl/account/activity.scala.html b/src/main/twirl/account/activity.scala.html
deleted file mode 100644
index ca4c3c7..0000000
--- a/src/main/twirl/account/activity.scala.html
+++ /dev/null
@@ -1,9 +0,0 @@
-@(account: model.Account, groupNames: List[String], activities: List[model.Activity])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@main(account, groupNames, "activity"){
-
- 
-
- @helper.html.activities(activities)
-}
diff --git a/src/main/twirl/account/application.scala.html b/src/main/twirl/account/application.scala.html
deleted file mode 100644
index e6a5d06..0000000
--- a/src/main/twirl/account/application.scala.html
+++ /dev/null
@@ -1,55 +0,0 @@
-@(account: model.Account, personalTokens: List[model.AccessToken], gneratedToken:Option[(model.AccessToken, String)])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Applications"){
-
-
-
-}
diff --git a/src/main/twirl/account/edit.scala.html b/src/main/twirl/account/edit.scala.html
deleted file mode 100644
index 32055ab..0000000
--- a/src/main/twirl/account/edit.scala.html
+++ /dev/null
@@ -1,71 +0,0 @@
-@(account: model.Account, info: Option[Any])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@import util.LDAPUtil
-@html.main("Edit your profile"){
-
-
-
- @menu("application", settings.ssh)
-
-
-
-
-
-
- Personal access tokens
-
- @if(personalTokens.isEmpty && gneratedToken.isEmpty){
- No tokens.
- }else{
- Tokens you have generated that can be used to access the GitBucket API.
- } - @gneratedToken.map{ case (token, tokenString) => -
- } - @personalTokens.zipWithIndex.map { case (token, i) => - @if(i != 0){ -
- } - @token.note - Delete - } -
- - } - @gneratedToken.map{ case (token, tokenString) => -
- Make sure to copy your new personal access token now. You won't be able to see it again!
-
- @helper.html.copy("generated-token-copy", tokenString){
-
- }
- Delete
- - } - @personalTokens.zipWithIndex.map { case (token, i) => - @if(i != 0){ -
- } - @token.note - Delete - } -
-
- @users.map { account =>
-
- }
-}
-
\ No newline at end of file
diff --git a/src/main/twirl/admin/users/user.scala.html b/src/main/twirl/admin/users/user.scala.html
deleted file mode 100644
index 1f25857..0000000
--- a/src/main/twirl/admin/users/user.scala.html
+++ /dev/null
@@ -1,83 +0,0 @@
-@(account: Option[model.Account])(implicit context: app.Context)
-@import context._
-@html.main(if(account.isEmpty) "New User" else "Update User"){
- @admin.html.menu("users"){
-
- }
-}
diff --git a/src/main/twirl/dashboard/header.scala.html b/src/main/twirl/dashboard/header.scala.html
deleted file mode 100644
index 01c5bfc..0000000
--- a/src/main/twirl/dashboard/header.scala.html
+++ /dev/null
@@ -1,74 +0,0 @@
-@(openCount: Int,
- closedCount: Int,
- condition: service.IssuesService.IssueSearchCondition,
- groups: List[String])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
-
- 
- @openCount Open
-
-
- 
- @closedCount Closed
-
-
-
-
-
-
-}
-
diff --git a/src/main/twirl/account/group.scala.html b/src/main/twirl/account/group.scala.html
deleted file mode 100644
index d6d7cf6..0000000
--- a/src/main/twirl/account/group.scala.html
+++ /dev/null
@@ -1,140 +0,0 @@
-@(account: Option[model.Account], members: List[model.GroupMember])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(if(account.isEmpty) "Create group" else "Edit group"){
-
- @menu("profile", settings.ssh)
-
-
- @helper.html.information(info)
- @if(LDAPUtil.isDummyMailAddress(account)){
-Please register your mail address.
}
-
-
-
-
-}
-
\ No newline at end of file
diff --git a/src/main/twirl/account/main.scala.html b/src/main/twirl/account/main.scala.html
deleted file mode 100644
index 2e148fe..0000000
--- a/src/main/twirl/account/main.scala.html
+++ /dev/null
@@ -1,59 +0,0 @@
-@(account: model.Account, groupNames: List[String], active: String,
- isGroupManager: Boolean = false)(body: Html)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(account.userName){
-
-
-}
diff --git a/src/main/twirl/account/members.scala.html b/src/main/twirl/account/members.scala.html
deleted file mode 100644
index 0e21d01..0000000
--- a/src/main/twirl/account/members.scala.html
+++ /dev/null
@@ -1,16 +0,0 @@
-@(account: model.Account, members: List[String], isGroupManager: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@main(account, Nil, "members", isGroupManager){
- @if(members.isEmpty){
- No members
- } else {
- @members.map { userName =>
-
-
-
-
-
-
-
-
- @avatar(account.userName, 270)
- @account.fullName
- @account.userName
-
- @if(account.url.isDefined){
-
- }
-
- @if(groupNames.nonEmpty){
- Joined on @date(account.registeredDate)
-
-
- }
-
- Groups
- @groupNames.map { groupName =>
- @avatar(groupName, 36, tooltip = true)
- }
-
-
- @body
-
-
-
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/twirl/account/menu.scala.html b/src/main/twirl/account/menu.scala.html
deleted file mode 100644
index 914a92b..0000000
--- a/src/main/twirl/account/menu.scala.html
+++ /dev/null
@@ -1,17 +0,0 @@
-@(active: String, ssh: Boolean)(implicit context: app.Context)
-@import context._
-
- @avatar(userName, 20) @userName
-
-
-
-
diff --git a/src/main/twirl/account/newrepo.scala.html b/src/main/twirl/account/newrepo.scala.html
deleted file mode 100644
index da9b068..0000000
--- a/src/main/twirl/account/newrepo.scala.html
+++ /dev/null
@@ -1,74 +0,0 @@
-@(groupNames: List[String],
-isCreateRepoOptionPublic: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Create a New Repository"){
-
-
-
-}
-
diff --git a/src/main/twirl/account/register.scala.html b/src/main/twirl/account/register.scala.html
deleted file mode 100644
index 3883f50..0000000
--- a/src/main/twirl/account/register.scala.html
+++ /dev/null
@@ -1,50 +0,0 @@
-@()(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Create your account"){
-
-
-}
diff --git a/src/main/twirl/account/repositories.scala.html b/src/main/twirl/account/repositories.scala.html
deleted file mode 100644
index 8a3706b..0000000
--- a/src/main/twirl/account/repositories.scala.html
+++ /dev/null
@@ -1,33 +0,0 @@
-@(account: model.Account, groupNames: List[String],
- repositories: List[service.RepositoryService.RepositoryInfo],
- isGroupManager: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@main(account, groupNames, "repositories", isGroupManager){
- @if(repositories.isEmpty){
- No repositories
- } else {
- @repositories.map { repository =>
- Create your account
- -
-
-
- }
- }
-}
diff --git a/src/main/twirl/account/ssh.scala.html b/src/main/twirl/account/ssh.scala.html
deleted file mode 100644
index 100044e..0000000
--- a/src/main/twirl/account/ssh.scala.html
+++ /dev/null
@@ -1,47 +0,0 @@
-@(account: model.Account, sshKeys: List[model.SshKey])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("SSH Keys"){
-
-
-
- @repository.name
- @if(repository.repository.isPrivate){
-
- }
-
- @if(repository.repository.originUserName.isDefined){
-
- }
- @if(repository.repository.description.isDefined){
- @repository.repository.description
- }
- Updated @helper.html.datetimeago(repository.repository.lastActivityDate)
-
-
-}
diff --git a/src/main/twirl/admin/menu.scala.html b/src/main/twirl/admin/menu.scala.html
deleted file mode 100644
index 09bc2de..0000000
--- a/src/main/twirl/admin/menu.scala.html
+++ /dev/null
@@ -1,24 +0,0 @@
-@(active: String)(body: Html)(implicit context: app.Context)
-@import context._
-
-
-
- @menu("ssh", settings.ssh)
-
-
-
-
-
-
- SSH Keys
-
- @if(sshKeys.isEmpty){
- No keys
- }
- @sshKeys.zipWithIndex.map { case (key, i) =>
- @if(i != 0){
-
- } - @key.title (@_root_.ssh.SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid.")) - Delete - } -
- - } - @key.title (@_root_.ssh.SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid.")) - Delete - } -
-
\ No newline at end of file
diff --git a/src/main/twirl/admin/system.scala.html b/src/main/twirl/admin/system.scala.html
deleted file mode 100644
index 194a164..0000000
--- a/src/main/twirl/admin/system.scala.html
+++ /dev/null
@@ -1,294 +0,0 @@
-@(info: Option[Any])(implicit context: app.Context)
-@import context._
-@import util.Directory._
-@import view.helpers._
-@html.main("System Settings"){
- @menu("system"){
- @helper.html.information(info)
-
- }
-}
-
\ No newline at end of file
diff --git a/src/main/twirl/admin/users/group.scala.html b/src/main/twirl/admin/users/group.scala.html
deleted file mode 100644
index 8b7672d..0000000
--- a/src/main/twirl/admin/users/group.scala.html
+++ /dev/null
@@ -1,135 +0,0 @@
-@(account: Option[model.Account], members: List[model.GroupMember])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(if(account.isEmpty) "New Group" else "Update Group"){
- @admin.html.menu("users"){
-
- }
-}
-
\ No newline at end of file
diff --git a/src/main/twirl/admin/users/list.scala.html b/src/main/twirl/admin/users/list.scala.html
deleted file mode 100644
index 3b2029c..0000000
--- a/src/main/twirl/admin/users/list.scala.html
+++ /dev/null
@@ -1,71 +0,0 @@
-@(users: List[model.Account], members: Map[String, List[String]], includeRemoved: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Manage Users"){
- @admin.html.menu("users"){
-
-
-
-
-
-
-
-
-
-
- @body
-
- |
-
-
- @avatar(account.userName, 20)
- @account.userName
- @if(account.isGroupAccount){
- (Group)
- } else {
- @if(account.isAdmin){
- (Administrator)
- } else {
- (Normal)
- }
- }
- @if(account.isGroupAccount){
- @members(account.userName).map { userName =>
- @avatar(userName, 20, tooltip = true)
- }
- }
-
-
-
- - @if(!account.isGroupAccount){ - @account.mailAddress - } - @account.url.map { url => - @url - } -
- Registered: @datetime(account.registeredDate)
- Updated: @datetime(account.updatedDate)
- @if(!account.isGroupAccount){
- Last Login: @account.lastLoginDate.map(datetime)
- }
-
- |
-
- @openCount Open
-
-
-
- @closedCount Closed
-
-
-
- @helper.html.dropdown("Visibility", flat = true){
-
-
- @helper.html.checkicon(condition.visibility == Some("private"))
- Private repository only
-
-
-
-
- @helper.html.checkicon(condition.visibility == Some("public"))
- Public repository only
-
-
- }
- @helper.html.dropdown("Organization", flat = true){
- @groups.map { group =>
-
-
- @helper.html.checkicon(condition.groups.contains(group))
- @avatar(group, 20) @group
-
-
- }
- }
- @helper.html.dropdown("Sort", flat = true){
-
-
- @helper.html.checkicon(condition.sort == "created" && condition.direction == "desc") Newest
-
-
-
-
- @helper.html.checkicon(condition.sort == "created" && condition.direction == "asc") Oldest
-
-
-
-
- @helper.html.checkicon(condition.sort == "comments" && condition.direction == "desc") Most commented
-
-
-
-
- @helper.html.checkicon(condition.sort == "comments" && condition.direction == "asc") Least commented
-
-
-
-
- @helper.html.checkicon(condition.sort == "updated" && condition.direction == "desc") Recently updated
-
-
-
-
- @helper.html.checkicon(condition.sort == "updated" && condition.direction == "asc") Least recently updated
-
-
- }
-
\ No newline at end of file
diff --git a/src/main/twirl/dashboard/issues.scala.html b/src/main/twirl/dashboard/issues.scala.html
deleted file mode 100644
index 898ac6b..0000000
--- a/src/main/twirl/dashboard/issues.scala.html
+++ /dev/null
@@ -1,16 +0,0 @@
-@(issues: List[service.IssuesService.IssueInfo],
- page: Int,
- openCount: Int,
- closedCount: Int,
- condition: service.IssuesService.IssueSearchCondition,
- filter: String,
- groups: List[String])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Issues"){
- @dashboard.html.tab("issues")
-
- @issuesnavi(filter, "issues", condition)
- @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
-
-}
diff --git a/src/main/twirl/dashboard/issueslist.scala.html b/src/main/twirl/dashboard/issueslist.scala.html
deleted file mode 100644
index 4bf230b..0000000
--- a/src/main/twirl/dashboard/issueslist.scala.html
+++ /dev/null
@@ -1,61 +0,0 @@
-@(issues: List[service.IssuesService.IssueInfo],
- page: Int,
- openCount: Int,
- closedCount: Int,
- condition: service.IssuesService.IssueSearchCondition,
- filter: String,
- groups: List[String])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@import service.IssuesService.IssueInfo
-| - @dashboard.html.header(openCount, closedCount, condition, groups) - | -
|---|
- @if(issue.isPullRequest){
-  )
- } else {
-  )
- }
- @issue.userName/@issue.repositoryName ･
- @if(issue.isPullRequest){
- @issue.title
- } else {
- @issue.title
- }
- @_root_.issues.html.commitstatus(issue, commitStatus)
- @labels.map { label =>
- @label.labelName
- }
-
- @issue.assignedUserName.map { userName =>
- @avatar(userName, 20, tooltip = true)
- }
- @if(commentCount > 0){
-
-  @commentCount
-
- } else {
-
-  @commentCount
-
- }
-
-
- #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)
- @milestone.map { milestone =>
-
-  @milestone
- }
- |
-
- @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 10, condition.toURL)
-
diff --git a/src/main/twirl/dashboard/issuesnavi.scala.html b/src/main/twirl/dashboard/issuesnavi.scala.html
deleted file mode 100644
index ec15e74..0000000
--- a/src/main/twirl/dashboard/issuesnavi.scala.html
+++ /dev/null
@@ -1,22 +0,0 @@
-@(filter: String,
- active: String,
- condition: service.IssuesService.IssueSearchCondition)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
diff --git a/src/main/twirl/dashboard/pulls.scala.html b/src/main/twirl/dashboard/pulls.scala.html
deleted file mode 100644
index d908e94..0000000
--- a/src/main/twirl/dashboard/pulls.scala.html
+++ /dev/null
@@ -1,16 +0,0 @@
-@(issues: List[service.IssuesService.IssueInfo],
- page: Int,
- openCount: Int,
- closedCount: Int,
- condition: service.IssuesService.IssueSearchCondition,
- filter: String,
- groups: List[String])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Pull Requests"){
- @dashboard.html.tab("pulls")
-
- @issuesnavi(filter, "pulls", condition)
- @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
-
-}
diff --git a/src/main/twirl/dashboard/tab.scala.html b/src/main/twirl/dashboard/tab.scala.html
deleted file mode 100644
index 3cb3bf0..0000000
--- a/src/main/twirl/dashboard/tab.scala.html
+++ /dev/null
@@ -1,47 +0,0 @@
-@(active: String = "")(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
-
-
-
\ No newline at end of file
diff --git a/src/main/twirl/error.scala.html b/src/main/twirl/error.scala.html
deleted file mode 100644
index fc4a011..0000000
--- a/src/main/twirl/error.scala.html
+++ /dev/null
@@ -1,4 +0,0 @@
-@(title: String)(implicit context: app.Context)
-@main("Error"){
- 
- News Feed
- 
- Pull Requests
- 
- Issues
- @title
-} \ No newline at end of file diff --git a/src/main/twirl/gitbucket/core/account/activity.scala.html b/src/main/twirl/gitbucket/core/account/activity.scala.html new file mode 100644 index 0000000..24d2c28 --- /dev/null +++ b/src/main/twirl/gitbucket/core/account/activity.scala.html @@ -0,0 +1,11 @@ +@(account: gitbucket.core.model.Account, + groupNames: List[String], + activities: List[gitbucket.core.model.Activity])(implicit context: gitbucket.core.controller.Context) +@import context._ +@import gitbucket.core.view.helpers._ +@main(account, groupNames, "activity"){ +
+
+
+ @helper.html.activities(activities)
+}
diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html
new file mode 100644
index 0000000..ba8915e
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/application.scala.html
@@ -0,0 +1,57 @@
+@(account: gitbucket.core.model.Account,
+ personalTokens: List[gitbucket.core.model.AccessToken],
+ gneratedToken: Option[(gitbucket.core.model.AccessToken, String)])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main("Applications"){
+
+
+
+}
diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html
new file mode 100644
index 0000000..c49d482
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/edit.scala.html
@@ -0,0 +1,71 @@
+@(account: gitbucket.core.model.Account, info: Option[Any])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.util.LDAPUtil
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main("Edit your profile"){
+
+
+
+ @menu("application", settings.ssh)
+
+
+
+
+
+
+ Personal access tokens
+
+ @if(personalTokens.isEmpty && gneratedToken.isEmpty){
+ No tokens.
+ }else{
+ Tokens you have generated that can be used to access the GitBucket API.
+ } + @gneratedToken.map{ case (token, tokenString) => +
+ } + @personalTokens.zipWithIndex.map { case (token, i) => + @if(i != 0){ +
+ } + @token.note + Delete + } +
+ + } + @gneratedToken.map{ case (token, tokenString) => +
+ Make sure to copy your new personal access token now. You won't be able to see it again!
+
+ @helper.html.copy("generated-token-copy", tokenString){
+
+ }
+ Delete
+ + } + @personalTokens.zipWithIndex.map { case (token, i) => + @if(i != 0){ +
+ } + @token.note + Delete + } +
+
+ @users.map { account =>
+
+ }
+}
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/admin/users/user.scala.html b/src/main/twirl/gitbucket/core/admin/users/user.scala.html
new file mode 100644
index 0000000..fb54eb5
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/admin/users/user.scala.html
@@ -0,0 +1,83 @@
+@(account: Option[gitbucket.core.model.Account])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@html.main(if(account.isEmpty) "New User" else "Update User"){
+ @admin.html.menu("users"){
+
+ }
+}
diff --git a/src/main/twirl/gitbucket/core/dashboard/header.scala.html b/src/main/twirl/gitbucket/core/dashboard/header.scala.html
new file mode 100644
index 0000000..ea14458
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/dashboard/header.scala.html
@@ -0,0 +1,74 @@
+@(openCount: Int,
+ closedCount: Int,
+ condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
+ groups: List[String])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+
+
+
+ @openCount Open
+
+
+
+ @closedCount Closed
+
+
+
+
+
+
+
+
+
+}
+
+
+
+
diff --git a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html
new file mode 100644
index 0000000..20e2f4a
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html
@@ -0,0 +1,24 @@
+@(value : String = "",
+ prefix: String = "",
+ mini : Boolean = true,
+ style : String = "",
+ right : Boolean = false,
+ flat : Boolean = false)(body: Html)
+
+ tag:@context.host,2013:gitbucket
+ Gitbucket's activities
+
+
+ Gitbucket
+ @context.baseUrl
+
+ @datetimeRFC3339(if(activities.isEmpty) new java.util.Date else activities.map(_.activityDate).max)
+ @activities.map { activity =>
+
+ tag:@context.host,@date(activity.activityDate):activity:@activity.activityId
+ @datetimeRFC3339(activity.activityDate)
+ @datetimeRFC3339(activity.activityDate)
+
+ @activity.activityType
+
+ @activity.activityUserName
+ @url(activity.activityUserName)
+
+ @activityMessage(activity.message)
+
+ }
+
diff --git a/src/main/twirl/gitbucket/core/helper/forkrepository.scala.html b/src/main/twirl/gitbucket/core/helper/forkrepository.scala.html
new file mode 100644
index 0000000..bd72554
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/forkrepository.scala.html
@@ -0,0 +1,18 @@
+@(repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ groupAndPerm: Map[String, Boolean])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+ {)
+} else {
+ @if(repository.repository.originUserName.isDefined){
+ {)
+ } else {
+ {)
+ }
+}
diff --git a/src/main/twirl/gitbucket/core/helper/uploadavatar.scala.html b/src/main/twirl/gitbucket/core/helper/uploadavatar.scala.html
new file mode 100644
index 0000000..6cf76e0
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/uploadavatar.scala.html
@@ -0,0 +1,51 @@
+@(account: Option[gitbucket.core.model.Account])(implicit context: gitbucket.core.controller.Context)
+@import context._
+
+ +} + diff --git a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html new file mode 100644 index 0000000..6658819 --- /dev/null +++ b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html @@ -0,0 +1,264 @@ +@(issue: Option[gitbucket.core.model.Issue], + comments: List[gitbucket.core.model.Comment], + hasWritePermission: Boolean, + repository: gitbucket.core.service.RepositoryService.RepositoryInfo, + pullreq: Option[gitbucket.core.model.PullRequest] = None)(implicit context: gitbucket.core.controller.Context) +@import context._ +@import gitbucket.core.view.helpers._ +@import gitbucket.core.model.CommitComment +@if(issue.isDefined){ +
+ + } +} + diff --git a/src/main/twirl/gitbucket/core/issues/editcomment.scala.html b/src/main/twirl/gitbucket/core/issues/editcomment.scala.html new file mode 100644 index 0000000..07a815d --- /dev/null +++ b/src/main/twirl/gitbucket/core/issues/editcomment.scala.html @@ -0,0 +1,42 @@ +@(content: String, commentId: Int, owner: String, repository: String)(implicit context: gitbucket.core.controller.Context) +@import context._ + +@helper.html.attached(owner, repository){ + +} +
+
+
+
+
+None yet
+}
+@issueLabels.map { label =>
+ @label.labelName
+}
diff --git a/src/main/twirl/gitbucket/core/issues/labels/edit.scala.html b/src/main/twirl/gitbucket/core/issues/labels/edit.scala.html
new file mode 100644
index 0000000..f590d94
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/labels/edit.scala.html
@@ -0,0 +1,62 @@
+@(label: Option[gitbucket.core.model.Label],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@defining(label.map(_.labelId).getOrElse("new")){ labelId =>
+
+
+
+
diff --git a/src/main/twirl/gitbucket/core/issues/labels/list.scala.html b/src/main/twirl/gitbucket/core/issues/labels/list.scala.html
new file mode 100644
index 0000000..d82a00d
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/labels/list.scala.html
@@ -0,0 +1,67 @@
+@(labels: List[gitbucket.core.model.Label],
+ counts: Map[String, Int],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"Labels - ${repository.owner}/${repository.name}"){
+ @html.menu("issues", repository){
+ @issues.html.navigation("labels", hasWritePermission, repository)
+
+ +
+
+ }
+}
+
diff --git a/src/main/twirl/gitbucket/core/issues/list.scala.html b/src/main/twirl/gitbucket/core/issues/list.scala.html
new file mode 100644
index 0000000..81ae631
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/list.scala.html
@@ -0,0 +1,98 @@
+@(target: String,
+ issues: List[gitbucket.core.service.IssuesService.IssueInfo],
+ page: Int,
+ collaborators: List[String],
+ milestones: List[gitbucket.core.model.Milestone],
+ labels: List[gitbucket.core.model.Label],
+ openCount: Int,
+ closedCount: Int,
+ condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main((if(target == "issues") "Issues" else "Pull requests") + s" - ${repository.owner}/${repository.name}", Some(repository)){
+ @html.menu(target, repository){
+ @navigation(target, true, repository, Some(condition))
+ @listparts(target, issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
+ @if(hasWritePermission){
+
+ }
+ }
+}
+@if(hasWritePermission){
+
+}
diff --git a/src/main/twirl/gitbucket/core/issues/listparts.scala.html b/src/main/twirl/gitbucket/core/issues/listparts.scala.html
new file mode 100644
index 0000000..5cf3fc7
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html
@@ -0,0 +1,219 @@
+@(target: String,
+ issues: List[gitbucket.core.service.IssuesService.IssueInfo],
+ page: Int,
+ openCount: Int,
+ closedCount: Int,
+ condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
+ collaborators: List[String] = Nil,
+ milestones: List[gitbucket.core.model.Milestone] = Nil,
+ labels: List[gitbucket.core.model.Label] = Nil,
+ repository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo] = None,
+ hasWritePermission: Boolean = false)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@import gitbucket.core.service.IssuesService.IssueInfo
+
+@if(condition.nonEmpty){ + +} +
+
+
+ } +
+ + } +} diff --git a/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html new file mode 100644 index 0000000..98e29e4 --- /dev/null +++ b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html @@ -0,0 +1,105 @@ +@(state: String, + milestones: List[(gitbucket.core.model.Milestone, Int, Int)], + repository: gitbucket.core.service.RepositoryService.RepositoryInfo, + hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context) +@import context._ +@import gitbucket.core.view.helpers._ +@html.main(s"Milestones - ${repository.owner}/${repository.name}"){ + @html.menu("issues", repository){ + @issues.html.navigation("milestones", hasWritePermission, repository) +
+
+
+ }
+}
+
diff --git a/src/main/twirl/gitbucket/core/issues/milestones/progress.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/progress.scala.html
new file mode 100644
index 0000000..d099190
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/milestones/progress.scala.html
@@ -0,0 +1,6 @@
+@(total: Int, progress: Int)
+@title
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @body
+
+ @PluginRegistry().getJavaScript(request.getRequestURI).map { script =>
+
+ }
+
+
diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
new file mode 100644
index 0000000..2c5f008
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -0,0 +1,227 @@
+@(active: String,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ id: Option[String] = None,
+ expand: Boolean = false,
+ 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._
+
+@sidemenu(path: String, name: String, label: String, count: Int = 0) = {
+
+
+
+ @if(active == name){
+ 
+ } else {
+
+ 
+ }
+ @if(expand){ @label}
+ @if(expand && count > 0){
+
+}
+
+@sidemenuPlugin(path: String, name: String, label: String, icon: String) = {
+
+
+ 
@if(expand){ @label}
+
+}
+
+
+
+
+ } else {
+ @pulls.html.commits(commits, Some(comments), repository)
+ @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId), true, None, hasWritePermission, false)
+
+ +
+
+ }
+}
+
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html
new file mode 100644
index 0000000..1352fe8
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html
@@ -0,0 +1,83 @@
+@(branchInfo: Seq[(gitbucket.core.util.JGitUtil.BranchInfo, Option[(gitbucket.core.model.PullRequest, gitbucket.core.model.Issue)])],
+ hasWritePermission: Boolean,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+ @html.menu("code", repository){
+
+
+
+ }
+}
+
diff --git a/src/main/twirl/gitbucket/core/repo/commentform.scala.html b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
new file mode 100644
index 0000000..824f32f
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
@@ -0,0 +1,71 @@
+@(commitId: String,
+ fileName: Option[String] = None,
+ oldLineNumber: Option[Int] = None,
+ newLineNumber: Option[Int] = None,
+ issueId: Option[Int] = None,
+ hasWritePermission: Boolean,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@if(loginAccount.isDefined){
+ @if(!fileName.isDefined){
} + + +} diff --git a/src/main/twirl/gitbucket/core/repo/commit.scala.html b/src/main/twirl/gitbucket/core/repo/commit.scala.html new file mode 100644 index 0000000..4588ff7 --- /dev/null +++ b/src/main/twirl/gitbucket/core/repo/commit.scala.html @@ -0,0 +1,154 @@ +@(commitId: String, + commit: gitbucket.core.util.JGitUtil.CommitInfo, + branches: List[String], + tags: List[String], + comments: List[gitbucket.core.model.Comment], + repository: gitbucket.core.service.RepositoryService.RepositoryInfo, + diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo], + oldCommitId: Option[String], + hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context) +@import gitbucket.core.util.Implicits._ +@import context._ +@import gitbucket.core.view.helpers._ +@html.main(commit.shortMessage, Some(repository)){ + @html.menu("code", repository){ +
+
+ @helper.html.diff(diffs, repository, Some(commit.id), oldCommitId, true, None, hasWritePermission, true)
+
+
+
+ }
+
+
+ @readme.map { case(filePath, content) =>
+
+
+ }
+}
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/search/code.scala.html b/src/main/twirl/gitbucket/core/search/code.scala.html
new file mode 100644
index 0000000..4ce3450
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/search/code.scala.html
@@ -0,0 +1,26 @@
+@(files: List[gitbucket.core.service.RepositorySearchService.FileSearchResult],
+ issueCount: Int,
+ query: String,
+ page: Int,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@import gitbucket.core.service.RepositorySearchService._
+@html.main("Search Results", Some(repository)){
+ @menu("code", files.size, issueCount, query, repository){
+ @if(files.isEmpty){
+
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/wiki/compare.scala.html b/src/main/twirl/gitbucket/core/wiki/compare.scala.html
new file mode 100644
index 0000000..d793178
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/wiki/compare.scala.html
@@ -0,0 +1,41 @@
+@(pageName: Option[String],
+ from: String,
+ to: String,
+ diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ hasWritePermission: Boolean,
+ info: Option[Any])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){
+ @helper.html.information(info)
+ @html.menu("wiki", repository){
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/wiki/page.scala.html b/src/main/twirl/gitbucket/core/wiki/page.scala.html
new file mode 100644
index 0000000..02e5120
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/wiki/page.scala.html
@@ -0,0 +1,74 @@
+@(pageName: String,
+ page: gitbucket.core.service.WikiService.WikiPageInfo,
+ pages: List[String],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@import gitbucket.core.service.WikiService._
+@html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
+ @html.menu("wiki", repository){
+
+
-
-
-
-
-}
-
-
-
-
diff --git a/src/main/twirl/helper/dropdown.scala.html b/src/main/twirl/helper/dropdown.scala.html
deleted file mode 100644
index 20e2f4a..0000000
--- a/src/main/twirl/helper/dropdown.scala.html
+++ /dev/null
@@ -1,24 +0,0 @@
-@(value : String = "",
- prefix: String = "",
- mini : Boolean = true,
- style : String = "",
- right : Boolean = false,
- flat : Boolean = false)(body: Html)
-
- tag:@context.host,2013:gitbucket
- Gitbucket's activities
-
-
- Gitbucket
- @context.baseUrl
-
- @datetimeRFC3339(if(activities.isEmpty) new java.util.Date else activities.map(_.activityDate).max)
- @activities.map { activity =>
-
- tag:@context.host,@date(activity.activityDate):activity:@activity.activityId
- @datetimeRFC3339(activity.activityDate)
- @datetimeRFC3339(activity.activityDate)
-
- @activity.activityType
-
- @activity.activityUserName
- @url(activity.activityUserName)
-
- @activityMessage(activity.message)
-
- }
-
diff --git a/src/main/twirl/helper/forkrepository.scala.html b/src/main/twirl/helper/forkrepository.scala.html
deleted file mode 100644
index e73ce34..0000000
--- a/src/main/twirl/helper/forkrepository.scala.html
+++ /dev/null
@@ -1,18 +0,0 @@
-@(repository: service.RepositoryService.RepositoryInfo,
- groupAndPerm: Map[String, Boolean])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
-} else {
- @if(repository.repository.originUserName.isDefined){
-
- } else {
-
- }
-}
diff --git a/src/main/twirl/helper/uploadavatar.scala.html b/src/main/twirl/helper/uploadavatar.scala.html
deleted file mode 100644
index 06bc06e..0000000
--- a/src/main/twirl/helper/uploadavatar.scala.html
+++ /dev/null
@@ -1,51 +0,0 @@
-@(account: Option[model.Account])(implicit context: app.Context)
-@import context._
-
- -} - diff --git a/src/main/twirl/issues/commentlist.scala.html b/src/main/twirl/issues/commentlist.scala.html deleted file mode 100644 index d28c17c..0000000 --- a/src/main/twirl/issues/commentlist.scala.html +++ /dev/null @@ -1,263 +0,0 @@ -@(issue: Option[model.Issue], - comments: List[model.Comment], - hasWritePermission: Boolean, - repository: service.RepositoryService.RepositoryInfo, - pullreq: Option[model.PullRequest] = None)(implicit context: app.Context) -@import context._ -@import view.helpers._ -@if(issue.isDefined){ -
- - } -} - diff --git a/src/main/twirl/issues/editcomment.scala.html b/src/main/twirl/issues/editcomment.scala.html deleted file mode 100644 index 2353de4..0000000 --- a/src/main/twirl/issues/editcomment.scala.html +++ /dev/null @@ -1,42 +0,0 @@ -@(content: String, commentId: Int, owner: String, repository: String)(implicit context: app.Context) -@import context._ - -@helper.html.attached(owner, repository){ - -} -
-
-
-
-
-None yet
-}
-@issueLabels.map { label =>
- @label.labelName
-}
diff --git a/src/main/twirl/issues/labels/edit.scala.html b/src/main/twirl/issues/labels/edit.scala.html
deleted file mode 100644
index dd558d2..0000000
--- a/src/main/twirl/issues/labels/edit.scala.html
+++ /dev/null
@@ -1,61 +0,0 @@
-@(label: Option[model.Label], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@defining(label.map(_.labelId).getOrElse("new")){ labelId =>
-
-
-
-
diff --git a/src/main/twirl/issues/labels/list.scala.html b/src/main/twirl/issues/labels/list.scala.html
deleted file mode 100644
index 471dcf5..0000000
--- a/src/main/twirl/issues/labels/list.scala.html
+++ /dev/null
@@ -1,67 +0,0 @@
-@(labels: List[model.Label],
- counts: Map[String, Int],
- repository: service.RepositoryService.RepositoryInfo,
- hasWritePermission: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"Labels - ${repository.owner}/${repository.name}"){
- @html.menu("issues", repository){
- @issues.html.navigation("labels", hasWritePermission, repository)
-
- -
-
- }
-}
-
diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html
deleted file mode 100644
index b1e36b3..0000000
--- a/src/main/twirl/issues/list.scala.html
+++ /dev/null
@@ -1,83 +0,0 @@
-@(target: String,
- issues: List[service.IssuesService.IssueInfo],
- page: Int,
- collaborators: List[String],
- milestones: List[model.Milestone],
- labels: List[model.Label],
- openCount: Int,
- closedCount: Int,
- condition: service.IssuesService.IssueSearchCondition,
- repository: service.RepositoryService.RepositoryInfo,
- hasWritePermission: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main((if(target == "issues") "Issues" else "Pull requests") + s" - ${repository.owner}/${repository.name}", Some(repository)){
- @html.menu(target, repository){
- @navigation(target, true, repository, Some(condition))
- @listparts(target, issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
- @if(hasWritePermission){
-
- }
- }
-}
-@if(hasWritePermission){
-
-}
diff --git a/src/main/twirl/issues/listparts.scala.html b/src/main/twirl/issues/listparts.scala.html
deleted file mode 100644
index 5c8f2fe..0000000
--- a/src/main/twirl/issues/listparts.scala.html
+++ /dev/null
@@ -1,219 +0,0 @@
-@(target: String,
- issues: List[service.IssuesService.IssueInfo],
- page: Int,
- openCount: Int,
- closedCount: Int,
- condition: service.IssuesService.IssueSearchCondition,
- collaborators: List[String] = Nil,
- milestones: List[model.Milestone] = Nil,
- labels: List[model.Label] = Nil,
- repository: Option[service.RepositoryService.RepositoryInfo] = None,
- hasWritePermission: Boolean = false)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@import service.IssuesService.IssueInfo
-
-@if(condition.nonEmpty){ - -} -
-
-
- } -
- - } -} diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html deleted file mode 100644 index 17476d1..0000000 --- a/src/main/twirl/issues/milestones/list.scala.html +++ /dev/null @@ -1,105 +0,0 @@ -@(state: String, - milestones: List[(model.Milestone, Int, Int)], - repository: service.RepositoryService.RepositoryInfo, - hasWritePermission: Boolean)(implicit context: app.Context) -@import context._ -@import view.helpers._ -@html.main(s"Milestones - ${repository.owner}/${repository.name}"){ - @html.menu("issues", repository){ - @issues.html.navigation("milestones", hasWritePermission, repository) -
-
-
- }
-}
-
diff --git a/src/main/twirl/issues/milestones/progress.scala.html b/src/main/twirl/issues/milestones/progress.scala.html
deleted file mode 100644
index d099190..0000000
--- a/src/main/twirl/issues/milestones/progress.scala.html
+++ /dev/null
@@ -1,6 +0,0 @@
-@(total: Int, progress: Int)
-@title
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @body
-
- @plugin.PluginRegistry().getJavaScript(request.getRequestURI).map { script =>
-
- }
-
-
diff --git a/src/main/twirl/menu.scala.html b/src/main/twirl/menu.scala.html
deleted file mode 100644
index 8eb8800..0000000
--- a/src/main/twirl/menu.scala.html
+++ /dev/null
@@ -1,226 +0,0 @@
-@(active: String,
- repository: service.RepositoryService.RepositoryInfo,
- id: Option[String] = None,
- expand: Boolean = false,
- isNoGroup: Boolean = true,
- info: Option[Any] = None,
- error: Option[Any] = None)(body: Html)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
-@sidemenu(path: String, name: String, label: String, count: Int = 0) = {
-
-
-
- @if(active == name){
-
- } else {
-
-
- }
- @if(expand){ @label}
- @if(expand && count > 0){
-
-}
-
-@sidemenuPlugin(path: String, name: String, label: String, icon: String) = {
-
-
- @if(expand){ @label}
-
-}
-
-
-
-
- } else {
- @pulls.html.commits(commits, Some(comments), repository)
- @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId), true, None, hasWritePermission, false)
-
- -
-
- }
-}
-
-
\ No newline at end of file
diff --git a/src/main/twirl/repo/branches.scala.html b/src/main/twirl/repo/branches.scala.html
deleted file mode 100644
index 7f152f4..0000000
--- a/src/main/twirl/repo/branches.scala.html
+++ /dev/null
@@ -1,83 +0,0 @@
-@(branchInfo: Seq[(util.JGitUtil.BranchInfo, Option[(model.PullRequest, model.Issue)])],
- hasWritePermission: Boolean,
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
- @html.menu("code", repository){
-
-
-
- }
-}
-
diff --git a/src/main/twirl/repo/commentform.scala.html b/src/main/twirl/repo/commentform.scala.html
deleted file mode 100644
index 36ad52c..0000000
--- a/src/main/twirl/repo/commentform.scala.html
+++ /dev/null
@@ -1,71 +0,0 @@
-@(commitId: String,
- fileName: Option[String] = None,
- oldLineNumber: Option[Int] = None,
- newLineNumber: Option[Int] = None,
- issueId: Option[Int] = None,
- hasWritePermission: Boolean,
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@if(loginAccount.isDefined){
- @if(!fileName.isDefined){
} - - -} diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html deleted file mode 100644 index 49338c1..0000000 --- a/src/main/twirl/repo/commit.scala.html +++ /dev/null @@ -1,154 +0,0 @@ -@(commitId: String, - commit: util.JGitUtil.CommitInfo, - branches: List[String], - tags: List[String], - comments: List[model.Comment], - repository: service.RepositoryService.RepositoryInfo, - diffs: Seq[util.JGitUtil.DiffInfo], - oldCommitId: Option[String], - hasWritePermission: Boolean)(implicit context: app.Context) -@import context._ -@import view.helpers._ -@import util.Implicits._ -@html.main(commit.shortMessage, Some(repository)){ - @html.menu("code", repository){ -
-
- @helper.html.diff(diffs, repository, Some(commit.id), oldCommitId, true, None, hasWritePermission, true)
-
-
-
- }
-
-
- @readme.map { case(filePath, content) =>
-
-
- }
-}
\ No newline at end of file
diff --git a/src/main/twirl/search/code.scala.html b/src/main/twirl/search/code.scala.html
deleted file mode 100644
index cc45665..0000000
--- a/src/main/twirl/search/code.scala.html
+++ /dev/null
@@ -1,26 +0,0 @@
-@(files: List[service.RepositorySearchService.FileSearchResult],
- issueCount: Int,
- query: String,
- page: Int,
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@import service.RepositorySearchService._
-@html.main("Search Results", Some(repository)){
- @menu("code", files.size, issueCount, query, repository){
- @if(files.isEmpty){
-
-
\ No newline at end of file
diff --git a/src/main/twirl/wiki/compare.scala.html b/src/main/twirl/wiki/compare.scala.html
deleted file mode 100644
index 50dd99e..0000000
--- a/src/main/twirl/wiki/compare.scala.html
+++ /dev/null
@@ -1,42 +0,0 @@
-@(pageName: Option[String],
- from: String,
- to: String,
- diffs: Seq[util.JGitUtil.DiffInfo],
- repository: service.RepositoryService.RepositoryInfo,
- hasWritePermission: Boolean,
- info: Option[Any])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@import org.eclipse.jgit.diff.DiffEntry.ChangeType
-@html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){
- @helper.html.information(info)
- @html.menu("wiki", repository){
-
-
-
-
- }
-}
\ No newline at end of file
diff --git a/src/main/twirl/wiki/page.scala.html b/src/main/twirl/wiki/page.scala.html
deleted file mode 100644
index bc4880a..0000000
--- a/src/main/twirl/wiki/page.scala.html
+++ /dev/null
@@ -1,74 +0,0 @@
-@(pageName: String,
- page: service.WikiService.WikiPageInfo,
- pages: List[String],
- repository: service.RepositoryService.RepositoryInfo,
- hasWritePermission: Boolean)(implicit context: app.Context)
-@import context._
-@import service.WikiService._
-@import view.helpers._
-@html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
- @html.menu("wiki", repository){
-
-
- servlet.SessionCleanupListener
+ gitbucket.core.servlet.SessionCleanupListener
- servlet.InitializeListener
+ gitbucket.core.servlet.InitializeListener
@@ -30,7 +30,7 @@
- ssh.SshServerListener
+ gitbucket.core.ssh.SshServerListener
@@ -38,7 +38,7 @@
GitRepositoryServlet
- servlet.GitRepositoryServlet
+ gitbucket.core.servlet.GitRepositoryServlet
diff --git a/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala b/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala
new file mode 100644
index 0000000..2e83d41
--- /dev/null
+++ b/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala
@@ -0,0 +1,79 @@
+package gitbucket.core.service
+
+import gitbucket.core.model.{Account, GroupMember}
+import org.specs2.mutable.Specification
+import java.util.Date
+
+class AccountServiceSpec extends Specification with ServiceSpecBase {
+
+ "AccountService" should {
+ val RootMailAddress = "root@localhost"
+
+ "getAllUsers" in { withTestDB { implicit session =>
+ AccountService.getAllUsers() must be like{
+ case List(Account("root", "root", RootMailAddress, _, true, _, _, _, None, None, false, false)) => ok
+ }
+ }}
+
+ "getAccountByUserName" in { withTestDB { implicit session =>
+ AccountService.getAccountByUserName("root") must beSome.like {
+ case user => user.userName must_== "root"
+ }
+
+ AccountService.getAccountByUserName("invalid user name") must beNone
+ }}
+
+ "getAccountByMailAddress" in { withTestDB { implicit session =>
+ AccountService.getAccountByMailAddress(RootMailAddress) must beSome
+ }}
+
+ "updateLastLoginDate" in { withTestDB { implicit session =>
+ val root = "root"
+ def user() =
+ AccountService.getAccountByUserName(root).getOrElse(sys.error(s"user $root does not exists"))
+
+ user().lastLoginDate must beNone
+ val date1 = new Date
+ AccountService.updateLastLoginDate(root)
+ user().lastLoginDate must beSome.like{ case date =>
+ date must be_>(date1)
+ }
+ val date2 = new Date
+ Thread.sleep(1000)
+ AccountService.updateLastLoginDate(root)
+ user().lastLoginDate must beSome.like{ case date =>
+ date must be_>(date2)
+ }
+ }}
+
+ "updateAccount" in { withTestDB { implicit session =>
+ val root = "root"
+ def user() =
+ AccountService.getAccountByUserName(root).getOrElse(sys.error(s"user $root does not exists"))
+
+ val newAddress = "new mail address"
+ AccountService.updateAccount(user().copy(mailAddress = newAddress))
+ user().mailAddress must_== newAddress
+ }}
+
+ "group" in { withTestDB { implicit session =>
+ val group1 = "group1"
+ val user1 = "root"
+ AccountService.createGroup(group1, None)
+
+ AccountService.getGroupMembers(group1) must_== Nil
+ AccountService.getGroupsByUserName(user1) must_== Nil
+
+ AccountService.updateGroupMembers(group1, List((user1, true)))
+
+ AccountService.getGroupMembers(group1) must_== List(GroupMember(group1, user1, true))
+ AccountService.getGroupsByUserName(user1) must_== List(group1)
+
+ AccountService.updateGroupMembers(group1, Nil)
+
+ AccountService.getGroupMembers(group1) must_== Nil
+ AccountService.getGroupsByUserName(user1) must_== Nil
+ }}
+ }
+}
+
diff --git a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
new file mode 100644
index 0000000..d2fb7c4
--- /dev/null
+++ b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
@@ -0,0 +1,71 @@
+package gitbucket.core.service
+
+import gitbucket.core.servlet.AutoUpdate
+import gitbucket.core.util.{ControlUtil, DatabaseConfig, FileUtil}
+import gitbucket.core.model.Profile._
+import profile.simple._
+import ControlUtil._
+import java.sql.DriverManager
+import org.apache.commons.io.FileUtils
+import scala.util.Random
+import java.io.File
+import model._
+
+trait ServiceSpecBase {
+
+ def withTestDB[A](action: (Session) => A): A = {
+ FileUtil.withTmpDir(new File(FileUtils.getTempDirectory(), Random.alphanumeric.take(10).mkString)){ dir =>
+ val (url, user, pass) = (DatabaseConfig.url(Some(dir.toString)), DatabaseConfig.user, DatabaseConfig.password)
+ org.h2.Driver.load()
+ using(DriverManager.getConnection(url, user, pass)){ conn =>
+ AutoUpdate.versions.reverse.foreach(_.update(conn, Thread.currentThread.getContextClassLoader))
+ }
+ Database.forURL(url, user, pass).withSession { session =>
+ action(session)
+ }
+ }
+ }
+
+ def generateNewAccount(name:String)(implicit s:Session):Account = {
+ AccountService.createAccount(name, name, name, s"${name}@example.com", false, None)
+ AccountService.getAccountByUserName(name).get
+ }
+
+ lazy val dummyService = new RepositoryService with AccountService with IssuesService with PullRequestService
+ with CommitStatusService (){}
+
+ def generateNewUserWithDBRepository(userName:String, repositoryName:String)(implicit s:Session):Account = {
+ val ac = generateNewAccount(userName)
+ dummyService.createRepository(repositoryName, userName, None, false)
+ ac
+ }
+
+ def generateNewIssue(userName:String, repositoryName:String, requestUserName:String="root")(implicit s:Session): Int = {
+ dummyService.createIssue(
+ owner = userName,
+ repository = repositoryName,
+ loginUser = requestUserName,
+ title = "issue title",
+ content = None,
+ assignedUserName = None,
+ milestoneId = None,
+ isPullRequest = true)
+ }
+
+ def generateNewPullRequest(base:String, request:String)(implicit s:Session):(Issue, PullRequest) = {
+ val Array(baseUserName, baseRepositoryName, baesBranch)=base.split("/")
+ val Array(requestUserName, requestRepositoryName, requestBranch)=request.split("/")
+ val issueId = generateNewIssue(baseUserName, baseRepositoryName, requestUserName)
+ dummyService.createPullRequest(
+ originUserName = baseUserName,
+ originRepositoryName = baseRepositoryName,
+ issueId = issueId,
+ originBranch = baesBranch,
+ requestUserName = requestUserName,
+ requestRepositoryName = requestRepositoryName,
+ requestBranch = requestBranch,
+ commitIdFrom = baesBranch,
+ commitIdTo = requestBranch)
+ dummyService.getPullRequest(baseUserName, baseRepositoryName, issueId).get
+ }
+}
diff --git a/src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala b/src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala
new file mode 100644
index 0000000..d3eb8a7
--- /dev/null
+++ b/src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala
@@ -0,0 +1,40 @@
+package gitbucket.core.ssh
+
+import org.specs2.mutable._
+import org.specs2.mock.Mockito
+import org.apache.sshd.server.command.UnknownCommand
+import javax.servlet.ServletContext
+
+class GitCommandFactorySpec extends Specification with Mockito {
+
+ val factory = new GitCommandFactory("http://localhost:8080")
+
+ "createCommand" should {
+ "returns GitReceivePack when command is git-receive-pack" in {
+ factory.createCommand("git-receive-pack '/owner/repo.git'").isInstanceOf[GitReceivePack] must beTrue
+ factory.createCommand("git-receive-pack '/owner/repo.wiki.git'").isInstanceOf[GitReceivePack] must beTrue
+
+ }
+ "returns GitUploadPack when command is git-upload-pack" in {
+ factory.createCommand("git-upload-pack '/owner/repo.git'").isInstanceOf[GitUploadPack] must beTrue
+ factory.createCommand("git-upload-pack '/owner/repo.wiki.git'").isInstanceOf[GitUploadPack] must beTrue
+
+ }
+ "returns UnknownCommand when command is not git-(upload|receive)-pack" in {
+ factory.createCommand("git- '/owner/repo.git'").isInstanceOf[UnknownCommand] must beTrue
+ factory.createCommand("git-pack '/owner/repo.git'").isInstanceOf[UnknownCommand] must beTrue
+ factory.createCommand("git-a-pack '/owner/repo.git'").isInstanceOf[UnknownCommand] must beTrue
+ factory.createCommand("git-up-pack '/owner/repo.git'").isInstanceOf[UnknownCommand] must beTrue
+ factory.createCommand("\ngit-upload-pack '/owner/repo.git'").isInstanceOf[UnknownCommand] must beTrue
+ }
+ "returns UnknownCommand when git command has no valid arguments" in {
+ // must be: git-upload-pack '/owner/repository_name.git'
+ factory.createCommand("git-upload-pack").isInstanceOf[UnknownCommand] must beTrue
+ factory.createCommand("git-upload-pack /owner/repo.git").isInstanceOf[UnknownCommand] must beTrue
+ factory.createCommand("git-upload-pack 'owner/repo.git'").isInstanceOf[UnknownCommand] must beTrue
+ factory.createCommand("git-upload-pack '/ownerrepo.git'").isInstanceOf[UnknownCommand] must beTrue
+ factory.createCommand("git-upload-pack '/owner/repo.wiki'").isInstanceOf[UnknownCommand] must beTrue
+ }
+ }
+
+}
diff --git a/src/test/scala/gitbucket/core/util/StringUtilSpec.scala b/src/test/scala/gitbucket/core/util/StringUtilSpec.scala
new file mode 100644
index 0000000..a0632eb
--- /dev/null
+++ b/src/test/scala/gitbucket/core/util/StringUtilSpec.scala
@@ -0,0 +1,56 @@
+package gitbucket.core.util
+
+import org.specs2.mutable._
+
+class StringUtilSpec extends Specification {
+
+ "urlDecode" should {
+ "decode encoded string to original string" in {
+ val encoded = StringUtil.urlEncode("あいうえお")
+ StringUtil.urlDecode(encoded) mustEqual "あいうえお"
+ }
+ }
+
+ "splitWords" should {
+ "split string by whitespaces" in {
+ val split = StringUtil.splitWords("aa bb\tcc dd \t ee")
+ split mustEqual Array("aa", "bb", "cc", "dd", "ee")
+ }
+ }
+
+ "escapeHtml" should {
+ "escape &, <, > and \"" in {
+ StringUtil.escapeHtml("a & b") mustEqual "<a href="/test">a & b</a>"
+ }
+ }
+
+ "md5" should {
+ "generate MD5 hash" in {
+ StringUtil.md5("abc") mustEqual "900150983cd24fb0d6963f7d28e17f72"
+ }
+ }
+
+ "sha1" should {
+ "generate SHA1 hash" in {
+ StringUtil.sha1("abc") mustEqual "a9993e364706816aba3e25717850c26c9cd0d89d"
+ }
+ }
+
+ "extractIssueId" should {
+ "extract '#xxx' and return extracted id" in {
+ StringUtil.extractIssueId("(refs #123)").toSeq mustEqual Seq("123")
+ }
+ "returns Nil from message which does not contain #xxx" in {
+ StringUtil.extractIssueId("this is test!").toSeq mustEqual Nil
+ }
+ }
+
+ "extractCloseId" should {
+ "extract 'close #xxx' and return extracted id" in {
+ StringUtil.extractCloseId("(close #123)").toSeq mustEqual Seq("123")
+ }
+ "returns Nil from message which does not contain close command" in {
+ StringUtil.extractCloseId("(refs #123)").toSeq mustEqual Nil
+ }
+ }
+}
diff --git a/src/test/scala/gitbucket/core/util/ValidationsSpec.scala b/src/test/scala/gitbucket/core/util/ValidationsSpec.scala
new file mode 100644
index 0000000..65106b8
--- /dev/null
+++ b/src/test/scala/gitbucket/core/util/ValidationsSpec.scala
@@ -0,0 +1,36 @@
+package gitbucket.core.util
+
+import org.specs2.mutable._
+import org.scalatra.i18n.Messages
+
+class ValidationsSpec extends Specification with Validations {
+
+ "identifier" should {
+ "validate id string " in {
+ identifier.validate("id", "aa_ZZ-00.01", null) mustEqual None
+ identifier.validate("id", "_aaaa", null) mustEqual Some("id starts with invalid character.")
+ identifier.validate("id", "-aaaa", null) mustEqual Some("id starts with invalid character.")
+ identifier.validate("id", "aa_ZZ#01", null) mustEqual Some("id contains invalid character.")
+ }
+ }
+
+ "color" should {
+ "validate color string " in {
+ val messages = Messages()
+ color.validate("color", "#88aaff", messages) mustEqual None
+ color.validate("color", "#gghhii", messages) mustEqual Some("color must be '#[0-9a-fA-F]{6}'.")
+ }
+ }
+
+ "date" should {
+// "validate date string " in {
+// date().validate("date", "2013-10-05", Map[String, String]()) mustEqual Nil
+// date().validate("date", "2013-10-5" , Map[String, String]()) mustEqual List(("date", "date must be '\\d{4}-\\d{2}-\\d{2}'."))
+// }
+ "convert date string " in {
+ val result = date().convert("2013-10-05", null)
+ new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(result) mustEqual "2013-10-05 00:00:00"
+ }
+ }
+
+}
diff --git a/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala b/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
new file mode 100644
index 0000000..10c9cf9
--- /dev/null
+++ b/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
@@ -0,0 +1,121 @@
+package gitbucket.core.view
+
+import java.util.Date
+
+import gitbucket.core.model.Account
+import gitbucket.core.service.{SystemSettingsService, RequestCache}
+import gitbucket.core.controller.Context
+import org.specs2.mutable._
+import org.specs2.mock.Mockito
+import SystemSettingsService.SystemSettings
+import javax.servlet.http.HttpServletRequest
+import play.twirl.api.Html
+
+class AvatarImageProviderSpec extends Specification with Mockito {
+
+ val request = mock[HttpServletRequest]
+ request.getRequestURL returns new StringBuffer("http://localhost:8080/path.html")
+ request.getRequestURI returns "/path.html"
+ request.getContextPath returns ""
+
+ "getAvatarImageHtml" should {
+ "show Gravatar image for no image account if gravatar integration is enabled" in {
+ implicit val context = Context(createSystemSettings(true), None, request)
+ val provider = new AvatarImageProviderImpl(Some(createAccount(None)))
+
+ provider.toHtml("user", 32).toString mustEqual
+ "![](\"https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e?s=32&d=retro&r=g\")
"
+ }
+
+ "show uploaded image even if gravatar integration is enabled" in {
+ implicit val context = Context(createSystemSettings(true), None, request)
+ val provider = new AvatarImageProviderImpl(Some(createAccount(Some("icon.png"))))
+
+ provider.toHtml("user", 32).toString mustEqual
+ "![](\"/user/_avatar\")
"
+ }
+
+ "show local image for no image account if gravatar integration is disabled" in {
+ implicit val context = Context(createSystemSettings(false), None, request)
+ val provider = new AvatarImageProviderImpl(Some(createAccount(None)))
+
+ provider.toHtml("user", 32).toString mustEqual
+ ""
+ }
+
+ "show Gravatar image for specified mail address if gravatar integration is enabled" in {
+ implicit val context = Context(createSystemSettings(true), None, request)
+ val provider = new AvatarImageProviderImpl(None)
+
+ provider.toHtml("user", 20, "hoge@hoge.com").toString mustEqual
+ "![](\"https://www.gravatar.com/avatar/4712f9b0e63f56ad952ad387eaa23b9c?s=20&d=retro&r=g\")
"
+ }
+
+ "show unknown image for unknown user if gravatar integration is enabled" in {
+ implicit val context = Context(createSystemSettings(true), None, request)
+ val provider = new AvatarImageProviderImpl(None)
+
+ provider.toHtml("user", 20).toString mustEqual
+ "![](\"/_unknown/_avatar\")
"
+ }
+
+ "show unknown image for specified mail address if gravatar integration is disabled" in {
+ implicit val context = Context(createSystemSettings(false), None, request)
+ val provider = new AvatarImageProviderImpl(None)
+
+ provider.toHtml("user", 20, "hoge@hoge.com").toString mustEqual
+ ""
+ }
+
+ "add tooltip if it's enabled" in {
+ implicit val context = Context(createSystemSettings(false), None, request)
+ val provider = new AvatarImageProviderImpl(None)
+
+ provider.toHtml("user", 20, "hoge@hoge.com", true).toString mustEqual
+ ""
+ }
+ }
+
+ private def createAccount(image: Option[String]) =
+ Account(
+ userName = "user",
+ fullName = "user@localhost",
+ mailAddress = "",
+ password = "",
+ isAdmin = false,
+ url = None,
+ registeredDate = new Date(),
+ updatedDate = new Date(),
+ lastLoginDate = None,
+ image = image,
+ isGroupAccount = false,
+ isRemoved = false)
+
+ private def createSystemSettings(useGravatar: Boolean) =
+ SystemSettings(
+ baseUrl = None,
+ information = None,
+ allowAccountRegistration = false,
+ allowAnonymousAccess = true,
+ isCreateRepoOptionPublic = true,
+ gravatar = useGravatar,
+ notification = false,
+ ssh = false,
+ sshPort = None,
+ smtp = None,
+ ldapAuthentication = false,
+ ldap = None)
+
+ /**
+ * Adapter to test AvatarImageProviderImpl.
+ */
+ class AvatarImageProviderImpl(account: Option[Account]) extends AvatarImageProvider with RequestCache {
+
+ def toHtml(userName: String, size: Int, mailAddress: String = "", tooltip: Boolean = false)
+ (implicit context: Context): Html = getAvatarImageHtml(userName, size, mailAddress, tooltip)
+
+ override def getAccountByMailAddress(mailAddress: String)(implicit context: Context): Option[Account] = account
+ override def getAccountByUserName(userName: String)(implicit context: Context): Option[Account] = account
+ }
+
+}
diff --git a/src/test/scala/gitbucket/core/view/GitBucketHtmlSerializerSpec.scala b/src/test/scala/gitbucket/core/view/GitBucketHtmlSerializerSpec.scala
new file mode 100644
index 0000000..82fb3d9
--- /dev/null
+++ b/src/test/scala/gitbucket/core/view/GitBucketHtmlSerializerSpec.scala
@@ -0,0 +1,93 @@
+package gitbucket.core.view
+
+import org.specs2.mutable._
+
+class GitBucketHtmlSerializerSpec extends Specification {
+
+ import GitBucketHtmlSerializer._
+
+ "generateAnchorName" should {
+ "convert whitespace characters to hyphens" in {
+ val before = "foo bar baz"
+ val after = generateAnchorName(before)
+ after mustEqual "foo-bar-baz"
+ }
+
+ "normalize characters with diacritics" in {
+ val before = "Dónde estará mi vida"
+ val after = generateAnchorName(before)
+ after mustEqual "do%cc%81nde-estara%cc%81-mi-vida"
+ }
+
+ "omit special characters" in {
+ val before = "foo!bar@baz>9000"
+ val after = generateAnchorName(before)
+ after mustEqual "foo%21bar%40baz%3e9000"
+ }
+ }
+
+ "escapeTaskList" should {
+ "convert '- [ ] ' to '* task: :'" in {
+ val before = "- [ ] aaaa"
+ val after = escapeTaskList(before)
+ after mustEqual "* task: : aaaa"
+ }
+
+ "convert ' - [ ] ' to ' * task: :'" in {
+ val before = " - [ ] aaaa"
+ val after = escapeTaskList(before)
+ after mustEqual " * task: : aaaa"
+ }
+
+ "convert only first '- [ ] '" in {
+ val before = " - [ ] aaaa - [ ] bbb"
+ val after = escapeTaskList(before)
+ after mustEqual " * task: : aaaa - [ ] bbb"
+ }
+
+ "convert '- [x] ' to '* task:x:'" in {
+ val before = " - [x] aaaa"
+ val after = escapeTaskList(before)
+ after mustEqual " * task:x: aaaa"
+ }
+
+ "convert multi lines" in {
+ val before = """
+tasks
+- [x] aaaa
+- [ ] bbb
+"""
+ val after = escapeTaskList(before)
+ after mustEqual """
+tasks
+* task:x: aaaa
+* task: : bbb
+"""
+ }
+
+ "no convert if inserted before '- [ ] '" in {
+ val before = " a - [ ] aaaa"
+ val after = escapeTaskList(before)
+ after mustEqual " a - [ ] aaaa"
+ }
+
+ "no convert '- [] '" in {
+ val before = " - [] aaaa"
+ val after = escapeTaskList(before)
+ after mustEqual " - [] aaaa"
+ }
+
+ "no convert '- [ ]a'" in {
+ val before = " - [ ]a aaaa"
+ val after = escapeTaskList(before)
+ after mustEqual " - [ ]a aaaa"
+ }
+
+ "no convert '-[ ] '" in {
+ val before = " -[ ] aaaa"
+ val after = escapeTaskList(before)
+ after mustEqual " -[ ] aaaa"
+ }
+ }
+}
+
diff --git a/src/test/scala/gitbucket/core/view/PaginationSpec.scala b/src/test/scala/gitbucket/core/view/PaginationSpec.scala
new file mode 100644
index 0000000..785c761
--- /dev/null
+++ b/src/test/scala/gitbucket/core/view/PaginationSpec.scala
@@ -0,0 +1,70 @@
+package gitbucket.core.view
+
+import gitbucket.core.util.ControlUtil
+import org.specs2.mutable._
+import ControlUtil._
+
+class PaginationSpec extends Specification {
+
+ "max" should {
+ "return max page number" in {
+ val pagination = Pagination(1, 100, 10, 6)
+ pagination.max mustEqual 10
+ }
+ }
+
+ "omitLeft and omitRight" should {
+ "return true if pagination links at their side will be omitted" in {
+ defining(Pagination(1, 100, 10, 6)){ pagination =>
+ pagination.omitLeft mustEqual false
+ pagination.omitRight mustEqual true
+ }
+ defining(Pagination(9, 100, 10, 6)){ pagination =>
+ pagination.omitLeft mustEqual true
+ pagination.omitRight mustEqual false
+ }
+ }
+ }
+
+ "visibleFor" should {
+ "return true for visible pagination links" in {
+ defining(Pagination(1, 100, 10, 6)){ pagination =>
+ pagination.visibleFor(1) mustEqual true
+ pagination.visibleFor(2) mustEqual true
+ pagination.visibleFor(3) mustEqual true
+ pagination.visibleFor(4) mustEqual true
+ pagination.visibleFor(5) mustEqual true
+ pagination.visibleFor(6) mustEqual false
+ pagination.visibleFor(7) mustEqual false
+ pagination.visibleFor(8) mustEqual false
+ pagination.visibleFor(9) mustEqual false
+ pagination.visibleFor(10) mustEqual true
+ }
+ defining(Pagination(5, 100, 10, 6)){ pagination =>
+ pagination.visibleFor(1) mustEqual true
+ pagination.visibleFor(2) mustEqual false
+ pagination.visibleFor(3) mustEqual false
+ pagination.visibleFor(4) mustEqual true
+ pagination.visibleFor(5) mustEqual true
+ pagination.visibleFor(6) mustEqual true
+ pagination.visibleFor(7) mustEqual false
+ pagination.visibleFor(8) mustEqual false
+ pagination.visibleFor(9) mustEqual false
+ pagination.visibleFor(10) mustEqual true
+ }
+ defining(Pagination(8, 100, 10, 6)){ pagination =>
+ pagination.visibleFor(1) mustEqual true
+ pagination.visibleFor(2) mustEqual false
+ pagination.visibleFor(3) mustEqual false
+ pagination.visibleFor(4) mustEqual false
+ pagination.visibleFor(5) mustEqual false
+ pagination.visibleFor(6) mustEqual true
+ pagination.visibleFor(7) mustEqual true
+ pagination.visibleFor(8) mustEqual true
+ pagination.visibleFor(9) mustEqual true
+ pagination.visibleFor(10) mustEqual true
+ }
+ }
+ }
+
+}
diff --git a/src/test/scala/service/AccountServiceSpec.scala b/src/test/scala/service/AccountServiceSpec.scala
deleted file mode 100644
index a9fa493..0000000
--- a/src/test/scala/service/AccountServiceSpec.scala
+++ /dev/null
@@ -1,79 +0,0 @@
-package service
-
-import org.specs2.mutable.Specification
-import java.util.Date
-import model.GroupMember
-
-class AccountServiceSpec extends Specification with ServiceSpecBase {
-
- "AccountService" should {
- val RootMailAddress = "root@localhost"
-
- "getAllUsers" in { withTestDB { implicit session =>
- AccountService.getAllUsers() must be like{
- case List(model.Account("root", "root", RootMailAddress, _, true, _, _, _, None, None, false, false)) => ok
- }
- }}
-
- "getAccountByUserName" in { withTestDB { implicit session =>
- AccountService.getAccountByUserName("root") must beSome.like {
- case user => user.userName must_== "root"
- }
-
- AccountService.getAccountByUserName("invalid user name") must beNone
- }}
-
- "getAccountByMailAddress" in { withTestDB { implicit session =>
- AccountService.getAccountByMailAddress(RootMailAddress) must beSome
- }}
-
- "updateLastLoginDate" in { withTestDB { implicit session =>
- val root = "root"
- def user() =
- AccountService.getAccountByUserName(root).getOrElse(sys.error(s"user $root does not exists"))
-
- user().lastLoginDate must beNone
- val date1 = new Date
- AccountService.updateLastLoginDate(root)
- user().lastLoginDate must beSome.like{ case date =>
- date must be_>(date1)
- }
- val date2 = new Date
- Thread.sleep(1000)
- AccountService.updateLastLoginDate(root)
- user().lastLoginDate must beSome.like{ case date =>
- date must be_>(date2)
- }
- }}
-
- "updateAccount" in { withTestDB { implicit session =>
- val root = "root"
- def user() =
- AccountService.getAccountByUserName(root).getOrElse(sys.error(s"user $root does not exists"))
-
- val newAddress = "new mail address"
- AccountService.updateAccount(user().copy(mailAddress = newAddress))
- user().mailAddress must_== newAddress
- }}
-
- "group" in { withTestDB { implicit session =>
- val group1 = "group1"
- val user1 = "root"
- AccountService.createGroup(group1, None)
-
- AccountService.getGroupMembers(group1) must_== Nil
- AccountService.getGroupsByUserName(user1) must_== Nil
-
- AccountService.updateGroupMembers(group1, List((user1, true)))
-
- AccountService.getGroupMembers(group1) must_== List(GroupMember(group1, user1, true))
- AccountService.getGroupsByUserName(user1) must_== List(group1)
-
- AccountService.updateGroupMembers(group1, Nil)
-
- AccountService.getGroupMembers(group1) must_== Nil
- AccountService.getGroupsByUserName(user1) must_== Nil
- }}
- }
-}
-
diff --git a/src/test/scala/service/ServiceSpecBase.scala b/src/test/scala/service/ServiceSpecBase.scala
deleted file mode 100644
index 048227f..0000000
--- a/src/test/scala/service/ServiceSpecBase.scala
+++ /dev/null
@@ -1,70 +0,0 @@
-package service
-
-import model.Profile._
-import profile.simple._
-import util.ControlUtil._
-import util.DatabaseConfig
-import java.sql.DriverManager
-import org.apache.commons.io.FileUtils
-import scala.util.Random
-import java.io.File
-import model._
-
-trait ServiceSpecBase {
-
- def withTestDB[A](action: (Session) => A): A = {
- util.FileUtil.withTmpDir(new File(FileUtils.getTempDirectory(), Random.alphanumeric.take(10).mkString)){ dir =>
- val (url, user, pass) = (DatabaseConfig.url(Some(dir.toString)), DatabaseConfig.user, DatabaseConfig.password)
- org.h2.Driver.load()
- using(DriverManager.getConnection(url, user, pass)){ conn =>
- servlet.AutoUpdate.versions.reverse.foreach(_.update(conn, Thread.currentThread.getContextClassLoader))
- }
- Database.forURL(url, user, pass).withSession { session =>
- action(session)
- }
- }
- }
-
- def generateNewAccount(name:String)(implicit s:Session):Account = {
- AccountService.createAccount(name, name, name, s"${name}@example.com", false, None)
- AccountService.getAccountByUserName(name).get
- }
-
- lazy val dummyService = new RepositoryService with AccountService with IssuesService with PullRequestService
- with CommitStatusService (){}
-
- def generateNewUserWithDBRepository(userName:String, repositoryName:String)(implicit s:Session):Account = {
- val ac = generateNewAccount(userName)
- dummyService.createRepository(repositoryName, userName, None, false)
- ac
- }
-
- def generateNewIssue(userName:String, repositoryName:String, requestUserName:String="root")(implicit s:Session): Int = {
- dummyService.createIssue(
- owner = userName,
- repository = repositoryName,
- loginUser = requestUserName,
- title = "issue title",
- content = None,
- assignedUserName = None,
- milestoneId = None,
- isPullRequest = true)
- }
-
- def generateNewPullRequest(base:String, request:String)(implicit s:Session):(Issue, PullRequest) = {
- val Array(baseUserName, baseRepositoryName, baesBranch)=base.split("/")
- val Array(requestUserName, requestRepositoryName, requestBranch)=request.split("/")
- val issueId = generateNewIssue(baseUserName, baseRepositoryName, requestUserName)
- dummyService.createPullRequest(
- originUserName = baseUserName,
- originRepositoryName = baseRepositoryName,
- issueId = issueId,
- originBranch = baesBranch,
- requestUserName = requestUserName,
- requestRepositoryName = requestRepositoryName,
- requestBranch = requestBranch,
- commitIdFrom = baesBranch,
- commitIdTo = requestBranch)
- dummyService.getPullRequest(baseUserName, baseRepositoryName, issueId).get
- }
-}
diff --git a/src/test/scala/ssh/GitCommandSpec.scala b/src/test/scala/ssh/GitCommandSpec.scala
deleted file mode 100644
index 6c571ae..0000000
--- a/src/test/scala/ssh/GitCommandSpec.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package ssh
-
-import org.specs2.mutable._
-import org.specs2.mock.Mockito
-import org.apache.sshd.server.command.UnknownCommand
-import javax.servlet.ServletContext
-
-class GitCommandFactorySpec extends Specification with Mockito {
-
- val factory = new GitCommandFactory("http://localhost:8080")
-
- "createCommand" should {
- "returns GitReceivePack when command is git-receive-pack" in {
- factory.createCommand("git-receive-pack '/owner/repo.git'").isInstanceOf[GitReceivePack] must beTrue
- factory.createCommand("git-receive-pack '/owner/repo.wiki.git'").isInstanceOf[GitReceivePack] must beTrue
-
- }
- "returns GitUploadPack when command is git-upload-pack" in {
- factory.createCommand("git-upload-pack '/owner/repo.git'").isInstanceOf[GitUploadPack] must beTrue
- factory.createCommand("git-upload-pack '/owner/repo.wiki.git'").isInstanceOf[GitUploadPack] must beTrue
-
- }
- "returns UnknownCommand when command is not git-(upload|receive)-pack" in {
- factory.createCommand("git- '/owner/repo.git'").isInstanceOf[UnknownCommand] must beTrue
- factory.createCommand("git-pack '/owner/repo.git'").isInstanceOf[UnknownCommand] must beTrue
- factory.createCommand("git-a-pack '/owner/repo.git'").isInstanceOf[UnknownCommand] must beTrue
- factory.createCommand("git-up-pack '/owner/repo.git'").isInstanceOf[UnknownCommand] must beTrue
- factory.createCommand("\ngit-upload-pack '/owner/repo.git'").isInstanceOf[UnknownCommand] must beTrue
- }
- "returns UnknownCommand when git command has no valid arguments" in {
- // must be: git-upload-pack '/owner/repository_name.git'
- factory.createCommand("git-upload-pack").isInstanceOf[UnknownCommand] must beTrue
- factory.createCommand("git-upload-pack /owner/repo.git").isInstanceOf[UnknownCommand] must beTrue
- factory.createCommand("git-upload-pack 'owner/repo.git'").isInstanceOf[UnknownCommand] must beTrue
- factory.createCommand("git-upload-pack '/ownerrepo.git'").isInstanceOf[UnknownCommand] must beTrue
- factory.createCommand("git-upload-pack '/owner/repo.wiki'").isInstanceOf[UnknownCommand] must beTrue
- }
- }
-
-}
diff --git a/src/test/scala/util/StringUtilSpec.scala b/src/test/scala/util/StringUtilSpec.scala
deleted file mode 100644
index caaa2dc..0000000
--- a/src/test/scala/util/StringUtilSpec.scala
+++ /dev/null
@@ -1,56 +0,0 @@
-package util
-
-import org.specs2.mutable._
-
-class StringUtilSpec extends Specification {
-
- "urlDecode" should {
- "decode encoded string to original string" in {
- val encoded = StringUtil.urlEncode("あいうえお")
- StringUtil.urlDecode(encoded) mustEqual "あいうえお"
- }
- }
-
- "splitWords" should {
- "split string by whitespaces" in {
- val split = StringUtil.splitWords("aa bb\tcc dd \t ee")
- split mustEqual Array("aa", "bb", "cc", "dd", "ee")
- }
- }
-
- "escapeHtml" should {
- "escape &, <, > and \"" in {
- StringUtil.escapeHtml("a & b") mustEqual "<a href="/test">a & b</a>"
- }
- }
-
- "md5" should {
- "generate MD5 hash" in {
- StringUtil.md5("abc") mustEqual "900150983cd24fb0d6963f7d28e17f72"
- }
- }
-
- "sha1" should {
- "generate SHA1 hash" in {
- StringUtil.sha1("abc") mustEqual "a9993e364706816aba3e25717850c26c9cd0d89d"
- }
- }
-
- "extractIssueId" should {
- "extract '#xxx' and return extracted id" in {
- StringUtil.extractIssueId("(refs #123)").toSeq mustEqual Seq("123")
- }
- "returns Nil from message which does not contain #xxx" in {
- StringUtil.extractIssueId("this is test!").toSeq mustEqual Nil
- }
- }
-
- "extractCloseId" should {
- "extract 'close #xxx' and return extracted id" in {
- StringUtil.extractCloseId("(close #123)").toSeq mustEqual Seq("123")
- }
- "returns Nil from message which does not contain close command" in {
- StringUtil.extractCloseId("(refs #123)").toSeq mustEqual Nil
- }
- }
-}
diff --git a/src/test/scala/util/ValidationsSpec.scala b/src/test/scala/util/ValidationsSpec.scala
deleted file mode 100644
index 92b58a2..0000000
--- a/src/test/scala/util/ValidationsSpec.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package util
-
-import org.specs2.mutable._
-import org.scalatra.i18n.Messages
-
-class ValidationsSpec extends Specification with Validations {
-
- "identifier" should {
- "validate id string " in {
- identifier.validate("id", "aa_ZZ-00.01", null) mustEqual None
- identifier.validate("id", "_aaaa", null) mustEqual Some("id starts with invalid character.")
- identifier.validate("id", "-aaaa", null) mustEqual Some("id starts with invalid character.")
- identifier.validate("id", "aa_ZZ#01", null) mustEqual Some("id contains invalid character.")
- }
- }
-
- "color" should {
- "validate color string " in {
- val messages = Messages()
- color.validate("color", "#88aaff", messages) mustEqual None
- color.validate("color", "#gghhii", messages) mustEqual Some("color must be '#[0-9a-fA-F]{6}'.")
- }
- }
-
- "date" should {
-// "validate date string " in {
-// date().validate("date", "2013-10-05", Map[String, String]()) mustEqual Nil
-// date().validate("date", "2013-10-5" , Map[String, String]()) mustEqual List(("date", "date must be '\\d{4}-\\d{2}-\\d{2}'."))
-// }
- "convert date string " in {
- val result = date().convert("2013-10-05", null)
- new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(result) mustEqual "2013-10-05 00:00:00"
- }
- }
-
-}
diff --git a/src/test/scala/view/AvatarImageProviderSpec.scala b/src/test/scala/view/AvatarImageProviderSpec.scala
deleted file mode 100644
index 78c32ab..0000000
--- a/src/test/scala/view/AvatarImageProviderSpec.scala
+++ /dev/null
@@ -1,120 +0,0 @@
-package view
-
-import java.util.Date
-
-import org.specs2.mutable._
-import org.specs2.mock.Mockito
-import service.RequestCache
-import model.Account
-import service.SystemSettingsService.SystemSettings
-import play.twirl.api.Html
-import javax.servlet.http.HttpServletRequest
-
-class AvatarImageProviderSpec extends Specification with Mockito {
-
- val request = mock[HttpServletRequest]
- request.getRequestURL returns new StringBuffer("http://localhost:8080/path.html")
- request.getRequestURI returns "/path.html"
- request.getContextPath returns ""
-
- "getAvatarImageHtml" should {
- "show Gravatar image for no image account if gravatar integration is enabled" in {
- implicit val context = app.Context(createSystemSettings(true), None, request)
- val provider = new AvatarImageProviderImpl(Some(createAccount(None)))
-
- provider.toHtml("user", 32).toString mustEqual
- ""
- }
-
- "show uploaded image even if gravatar integration is enabled" in {
- implicit val context = app.Context(createSystemSettings(true), None, request)
- val provider = new AvatarImageProviderImpl(Some(createAccount(Some("icon.png"))))
-
- provider.toHtml("user", 32).toString mustEqual
- ""
- }
-
- "show local image for no image account if gravatar integration is disabled" in {
- implicit val context = app.Context(createSystemSettings(false), None, request)
- val provider = new AvatarImageProviderImpl(Some(createAccount(None)))
-
- provider.toHtml("user", 32).toString mustEqual
- ""
- }
-
- "show Gravatar image for specified mail address if gravatar integration is enabled" in {
- implicit val context = app.Context(createSystemSettings(true), None, request)
- val provider = new AvatarImageProviderImpl(None)
-
- provider.toHtml("user", 20, "hoge@hoge.com").toString mustEqual
- ""
- }
-
- "show unknown image for unknown user if gravatar integration is enabled" in {
- implicit val context = app.Context(createSystemSettings(true), None, request)
- val provider = new AvatarImageProviderImpl(None)
-
- provider.toHtml("user", 20).toString mustEqual
- ""
- }
-
- "show unknown image for specified mail address if gravatar integration is disabled" in {
- implicit val context = app.Context(createSystemSettings(false), None, request)
- val provider = new AvatarImageProviderImpl(None)
-
- provider.toHtml("user", 20, "hoge@hoge.com").toString mustEqual
- ""
- }
-
- "add tooltip if it's enabled" in {
- implicit val context = app.Context(createSystemSettings(false), None, request)
- val provider = new AvatarImageProviderImpl(None)
-
- provider.toHtml("user", 20, "hoge@hoge.com", true).toString mustEqual
- ""
- }
- }
-
- private def createAccount(image: Option[String]) =
- Account(
- userName = "user",
- fullName = "user@localhost",
- mailAddress = "",
- password = "",
- isAdmin = false,
- url = None,
- registeredDate = new Date(),
- updatedDate = new Date(),
- lastLoginDate = None,
- image = image,
- isGroupAccount = false,
- isRemoved = false)
-
- private def createSystemSettings(useGravatar: Boolean) =
- SystemSettings(
- baseUrl = None,
- information = None,
- allowAccountRegistration = false,
- allowAnonymousAccess = true,
- isCreateRepoOptionPublic = true,
- gravatar = useGravatar,
- notification = false,
- ssh = false,
- sshPort = None,
- smtp = None,
- ldapAuthentication = false,
- ldap = None)
-
- /**
- * Adapter to test AvatarImageProviderImpl.
- */
- class AvatarImageProviderImpl(account: Option[Account]) extends AvatarImageProvider with RequestCache {
-
- def toHtml(userName: String, size: Int, mailAddress: String = "", tooltip: Boolean = false)
- (implicit context: app.Context): Html = getAvatarImageHtml(userName, size, mailAddress, tooltip)
-
- override def getAccountByMailAddress(mailAddress: String)(implicit context: app.Context): Option[Account] = account
- override def getAccountByUserName(userName: String)(implicit context: app.Context): Option[Account] = account
- }
-
-}
diff --git a/src/test/scala/view/GitBucketHtmlSerializerSpec.scala b/src/test/scala/view/GitBucketHtmlSerializerSpec.scala
deleted file mode 100644
index 687db70..0000000
--- a/src/test/scala/view/GitBucketHtmlSerializerSpec.scala
+++ /dev/null
@@ -1,93 +0,0 @@
-package view
-
-import org.specs2.mutable._
-
-class GitBucketHtmlSerializerSpec extends Specification {
-
- import GitBucketHtmlSerializer._
-
- "generateAnchorName" should {
- "convert whitespace characters to hyphens" in {
- val before = "foo bar baz"
- val after = generateAnchorName(before)
- after mustEqual "foo-bar-baz"
- }
-
- "normalize characters with diacritics" in {
- val before = "Dónde estará mi vida"
- val after = generateAnchorName(before)
- after mustEqual "do%cc%81nde-estara%cc%81-mi-vida"
- }
-
- "omit special characters" in {
- val before = "foo!bar@baz>9000"
- val after = generateAnchorName(before)
- after mustEqual "foo%21bar%40baz%3e9000"
- }
- }
-
- "escapeTaskList" should {
- "convert '- [ ] ' to '* task: :'" in {
- val before = "- [ ] aaaa"
- val after = escapeTaskList(before)
- after mustEqual "* task: : aaaa"
- }
-
- "convert ' - [ ] ' to ' * task: :'" in {
- val before = " - [ ] aaaa"
- val after = escapeTaskList(before)
- after mustEqual " * task: : aaaa"
- }
-
- "convert only first '- [ ] '" in {
- val before = " - [ ] aaaa - [ ] bbb"
- val after = escapeTaskList(before)
- after mustEqual " * task: : aaaa - [ ] bbb"
- }
-
- "convert '- [x] ' to '* task:x:'" in {
- val before = " - [x] aaaa"
- val after = escapeTaskList(before)
- after mustEqual " * task:x: aaaa"
- }
-
- "convert multi lines" in {
- val before = """
-tasks
-- [x] aaaa
-- [ ] bbb
-"""
- val after = escapeTaskList(before)
- after mustEqual """
-tasks
-* task:x: aaaa
-* task: : bbb
-"""
- }
-
- "no convert if inserted before '- [ ] '" in {
- val before = " a - [ ] aaaa"
- val after = escapeTaskList(before)
- after mustEqual " a - [ ] aaaa"
- }
-
- "no convert '- [] '" in {
- val before = " - [] aaaa"
- val after = escapeTaskList(before)
- after mustEqual " - [] aaaa"
- }
-
- "no convert '- [ ]a'" in {
- val before = " - [ ]a aaaa"
- val after = escapeTaskList(before)
- after mustEqual " - [ ]a aaaa"
- }
-
- "no convert '-[ ] '" in {
- val before = " -[ ] aaaa"
- val after = escapeTaskList(before)
- after mustEqual " -[ ] aaaa"
- }
- }
-}
-
diff --git a/src/test/scala/view/PaginationSpec.scala b/src/test/scala/view/PaginationSpec.scala
deleted file mode 100644
index 20c3488..0000000
--- a/src/test/scala/view/PaginationSpec.scala
+++ /dev/null
@@ -1,69 +0,0 @@
-package view
-
-import org.specs2.mutable._
-import util.ControlUtil._
-
-class PaginationSpec extends Specification {
-
- "max" should {
- "return max page number" in {
- val pagination = Pagination(1, 100, 10, 6)
- pagination.max mustEqual 10
- }
- }
-
- "omitLeft and omitRight" should {
- "return true if pagination links at their side will be omitted" in {
- defining(Pagination(1, 100, 10, 6)){ pagination =>
- pagination.omitLeft mustEqual false
- pagination.omitRight mustEqual true
- }
- defining(Pagination(9, 100, 10, 6)){ pagination =>
- pagination.omitLeft mustEqual true
- pagination.omitRight mustEqual false
- }
- }
- }
-
- "visibleFor" should {
- "return true for visible pagination links" in {
- defining(Pagination(1, 100, 10, 6)){ pagination =>
- pagination.visibleFor(1) mustEqual true
- pagination.visibleFor(2) mustEqual true
- pagination.visibleFor(3) mustEqual true
- pagination.visibleFor(4) mustEqual true
- pagination.visibleFor(5) mustEqual true
- pagination.visibleFor(6) mustEqual false
- pagination.visibleFor(7) mustEqual false
- pagination.visibleFor(8) mustEqual false
- pagination.visibleFor(9) mustEqual false
- pagination.visibleFor(10) mustEqual true
- }
- defining(Pagination(5, 100, 10, 6)){ pagination =>
- pagination.visibleFor(1) mustEqual true
- pagination.visibleFor(2) mustEqual false
- pagination.visibleFor(3) mustEqual false
- pagination.visibleFor(4) mustEqual true
- pagination.visibleFor(5) mustEqual true
- pagination.visibleFor(6) mustEqual true
- pagination.visibleFor(7) mustEqual false
- pagination.visibleFor(8) mustEqual false
- pagination.visibleFor(9) mustEqual false
- pagination.visibleFor(10) mustEqual true
- }
- defining(Pagination(8, 100, 10, 6)){ pagination =>
- pagination.visibleFor(1) mustEqual true
- pagination.visibleFor(2) mustEqual false
- pagination.visibleFor(3) mustEqual false
- pagination.visibleFor(4) mustEqual false
- pagination.visibleFor(5) mustEqual false
- pagination.visibleFor(6) mustEqual true
- pagination.visibleFor(7) mustEqual true
- pagination.visibleFor(8) mustEqual true
- pagination.visibleFor(9) mustEqual true
- pagination.visibleFor(10) mustEqual true
- }
- }
- }
-
-}
+
+}
+
diff --git a/src/main/twirl/gitbucket/core/account/group.scala.html b/src/main/twirl/gitbucket/core/account/group.scala.html
new file mode 100644
index 0000000..921beb2
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/group.scala.html
@@ -0,0 +1,140 @@
+@(account: Option[gitbucket.core.model.Account], members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(if(account.isEmpty) "Create group" else "Edit group"){
+
+ @menu("profile", settings.ssh)
+
+
+ @helper.html.information(info)
+ @if(LDAPUtil.isDummyMailAddress(account)){
+Please register your mail address.
}
+
+
+
+
+}
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/account/main.scala.html b/src/main/twirl/gitbucket/core/account/main.scala.html
new file mode 100644
index 0000000..b4467f9
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/main.scala.html
@@ -0,0 +1,59 @@
+@(account: gitbucket.core.model.Account, groupNames: List[String], active: String,
+ isGroupManager: Boolean = false)(body: Html)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(account.userName){
+
+
+}
diff --git a/src/main/twirl/gitbucket/core/account/members.scala.html b/src/main/twirl/gitbucket/core/account/members.scala.html
new file mode 100644
index 0000000..0291223
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/members.scala.html
@@ -0,0 +1,16 @@
+@(account: gitbucket.core.model.Account, members: List[String], isGroupManager: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@main(account, Nil, "members", isGroupManager){
+ @if(members.isEmpty){
+ No members
+ } else {
+ @members.map { userName =>
+
+
+
+
+
+
+
+
+ @avatar(account.userName, 270)
+ @account.fullName
+ @account.userName
+
+ @if(account.url.isDefined){
+
+ }
+
+ @if(groupNames.nonEmpty){
+ Joined on @date(account.registeredDate)
+
+
+ }
+
+ Groups
+ @groupNames.map { groupName =>
+ @avatar(groupName, 36, tooltip = true)
+ }
+
+
+ @body
+
+
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/account/menu.scala.html b/src/main/twirl/gitbucket/core/account/menu.scala.html
new file mode 100644
index 0000000..47734f9
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/menu.scala.html
@@ -0,0 +1,17 @@
+@(active: String, ssh: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+
+ @avatar(userName, 20) @userName
+
+
+
+
diff --git a/src/main/twirl/gitbucket/core/account/newrepo.scala.html b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
new file mode 100644
index 0000000..607bd0b
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
@@ -0,0 +1,74 @@
+@(groupNames: List[String],
+isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main("Create a New Repository"){
+
+
+
+}
+
diff --git a/src/main/twirl/gitbucket/core/account/register.scala.html b/src/main/twirl/gitbucket/core/account/register.scala.html
new file mode 100644
index 0000000..5810d95
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/register.scala.html
@@ -0,0 +1,50 @@
+@()(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main("Create your account"){
+
+
+}
diff --git a/src/main/twirl/gitbucket/core/account/repositories.scala.html b/src/main/twirl/gitbucket/core/account/repositories.scala.html
new file mode 100644
index 0000000..b515163
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/repositories.scala.html
@@ -0,0 +1,33 @@
+@(account: gitbucket.core.model.Account, groupNames: List[String],
+ repositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
+ isGroupManager: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@main(account, groupNames, "repositories", isGroupManager){
+ @if(repositories.isEmpty){
+ No repositories
+ } else {
+ @repositories.map { repository =>
+ Create your account
+ +
+
+
+ }
+ }
+}
diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html
new file mode 100644
index 0000000..7229082
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html
@@ -0,0 +1,48 @@
+@(account: gitbucket.core.model.Account, sshKeys: List[gitbucket.core.model.SshKey])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.ssh.SshUtil
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main("SSH Keys"){
+
+
+
+ @repository.name
+ @if(repository.repository.isPrivate){
+
+ }
+
+ @if(repository.repository.originUserName.isDefined){
+
+ }
+ @if(repository.repository.description.isDefined){
+ @repository.repository.description
+ }
+ Updated @helper.html.datetimeago(repository.repository.lastActivityDate)
+
+
+}
diff --git a/src/main/twirl/gitbucket/core/admin/menu.scala.html b/src/main/twirl/gitbucket/core/admin/menu.scala.html
new file mode 100644
index 0000000..e5f6f3d
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html
@@ -0,0 +1,24 @@
+@(active: String)(body: Html)(implicit context: gitbucket.core.controller.Context)
+@import context._
+
+
+
+ @menu("ssh", settings.ssh)
+
+
+
+
+
+
+ SSH Keys
+
+ @if(sshKeys.isEmpty){
+ No keys
+ }
+ @sshKeys.zipWithIndex.map { case (key, i) =>
+ @if(i != 0){
+
+ } + @key.title (@SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid.")) + Delete + } +
+ + } + @key.title (@SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid.")) + Delete + } +
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/admin/system.scala.html b/src/main/twirl/gitbucket/core/admin/system.scala.html
new file mode 100644
index 0000000..47e0221
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/admin/system.scala.html
@@ -0,0 +1,294 @@
+@(info: Option[Any])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@import gitbucket.core.util.Directory._
+@html.main("System Settings"){
+ @menu("system"){
+ @helper.html.information(info)
+
+ }
+}
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/admin/users/group.scala.html b/src/main/twirl/gitbucket/core/admin/users/group.scala.html
new file mode 100644
index 0000000..bac702b
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/admin/users/group.scala.html
@@ -0,0 +1,135 @@
+@(account: Option[gitbucket.core.model.Account], members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(if(account.isEmpty) "New Group" else "Update Group"){
+ @admin.html.menu("users"){
+
+ }
+}
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/admin/users/list.scala.html b/src/main/twirl/gitbucket/core/admin/users/list.scala.html
new file mode 100644
index 0000000..1c8f17b
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/admin/users/list.scala.html
@@ -0,0 +1,71 @@
+@(users: List[gitbucket.core.model.Account], members: Map[String, List[String]], includeRemoved: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main("Manage Users"){
+ @admin.html.menu("users"){
+
+
+
+
+
+
+
+
+
+
+ @body
+
+ |
+
+
+ @avatar(account.userName, 20)
+ @account.userName
+ @if(account.isGroupAccount){
+ (Group)
+ } else {
+ @if(account.isAdmin){
+ (Administrator)
+ } else {
+ (Normal)
+ }
+ }
+ @if(account.isGroupAccount){
+ @members(account.userName).map { userName =>
+ @avatar(userName, 20, tooltip = true)
+ }
+ }
+
+
+
+ + @if(!account.isGroupAccount){ + @account.mailAddress + } + @account.url.map { url => + @url + } +
+ Registered: @datetime(account.registeredDate)
+ Updated: @datetime(account.updatedDate)
+ @if(!account.isGroupAccount){
+ Last Login: @account.lastLoginDate.map(datetime)
+ }
+
+ |
+
+ @openCount Open
+
+
+
+ @closedCount Closed
+
+
+
+ @helper.html.dropdown("Visibility", flat = true){
+
+
+ @helper.html.checkicon(condition.visibility == Some("private"))
+ Private repository only
+
+
+
+
+ @helper.html.checkicon(condition.visibility == Some("public"))
+ Public repository only
+
+
+ }
+ @helper.html.dropdown("Organization", flat = true){
+ @groups.map { group =>
+
+
+ @helper.html.checkicon(condition.groups.contains(group))
+ @avatar(group, 20) @group
+
+
+ }
+ }
+ @helper.html.dropdown("Sort", flat = true){
+
+
+ @helper.html.checkicon(condition.sort == "created" && condition.direction == "desc") Newest
+
+
+
+
+ @helper.html.checkicon(condition.sort == "created" && condition.direction == "asc") Oldest
+
+
+
+
+ @helper.html.checkicon(condition.sort == "comments" && condition.direction == "desc") Most commented
+
+
+
+
+ @helper.html.checkicon(condition.sort == "comments" && condition.direction == "asc") Least commented
+
+
+
+
+ @helper.html.checkicon(condition.sort == "updated" && condition.direction == "desc") Recently updated
+
+
+
+
+ @helper.html.checkicon(condition.sort == "updated" && condition.direction == "asc") Least recently updated
+
+
+ }
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/dashboard/issues.scala.html b/src/main/twirl/gitbucket/core/dashboard/issues.scala.html
new file mode 100644
index 0000000..af395e5
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/dashboard/issues.scala.html
@@ -0,0 +1,16 @@
+@(issues: List[gitbucket.core.service.IssuesService.IssueInfo],
+ page: Int,
+ openCount: Int,
+ closedCount: Int,
+ condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
+ filter: String,
+ groups: List[String])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main("Issues"){
+ @dashboard.html.tab("issues")
+
+ @issuesnavi(filter, "issues", condition)
+ @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
+
+}
diff --git a/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
new file mode 100644
index 0000000..6140ba0
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
@@ -0,0 +1,62 @@
+@(issues: List[gitbucket.core.service.IssuesService.IssueInfo],
+ page: Int,
+ openCount: Int,
+ closedCount: Int,
+ condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
+ filter: String,
+ groups: List[String])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@import gitbucket.core.service.IssuesService
+@import gitbucket.core.service.IssuesService.IssueInfo
+| + @dashboard.html.header(openCount, closedCount, condition, groups) + | +
|---|
|
+ @if(issue.isPullRequest){
+
+ } else {
+
+ }
+ @issue.userName/@issue.repositoryName ･
+ @if(issue.isPullRequest){
+ @issue.title
+ } else {
+ @issue.title
+ }
+ @gitbucket.core.issues.html.commitstatus(issue, commitStatus)
+ @labels.map { label =>
+ @label.labelName
+ }
+
+ @issue.assignedUserName.map { userName =>
+ @avatar(userName, 20, tooltip = true)
+ }
+ @if(commentCount > 0){
+
+ @commentCount
+
+ } else {
+
+ @commentCount
+
+ }
+
+
+ #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)
+ @milestone.map { milestone =>
+
+ @milestone
+ }
+ |
+
+ @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), IssuesService.IssueLimit, 10, condition.toURL)
+
diff --git a/src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html b/src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html
new file mode 100644
index 0000000..5770f82
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html
@@ -0,0 +1,22 @@
+@(filter: String,
+ active: String,
+ condition: gitbucket.core.service.IssuesService.IssueSearchCondition)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+
diff --git a/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html b/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
new file mode 100644
index 0000000..46dba30
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
@@ -0,0 +1,16 @@
+@(issues: List[gitbucket.core.service.IssuesService.IssueInfo],
+ page: Int,
+ openCount: Int,
+ closedCount: Int,
+ condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
+ filter: String,
+ groups: List[String])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main("Pull Requests"){
+ @dashboard.html.tab("pulls")
+
+ @issuesnavi(filter, "pulls", condition)
+ @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
+
+}
diff --git a/src/main/twirl/gitbucket/core/dashboard/tab.scala.html b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
new file mode 100644
index 0000000..6906048
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
@@ -0,0 +1,47 @@
+@(active: String = "")(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+
+
+
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/error.scala.html b/src/main/twirl/gitbucket/core/error.scala.html
new file mode 100644
index 0000000..48e5507
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/error.scala.html
@@ -0,0 +1,4 @@
+@(title: String)(implicit context: gitbucket.core.controller.Context)
+@main("Error"){
+ @title
+} \ No newline at end of file diff --git a/src/main/twirl/gitbucket/core/helper/account.scala.html b/src/main/twirl/gitbucket/core/helper/account.scala.html new file mode 100644 index 0000000..4b62e72 --- /dev/null +++ b/src/main/twirl/gitbucket/core/helper/account.scala.html @@ -0,0 +1,15 @@ +@(id: String, width: Int)(implicit context: gitbucket.core.controller.Context) +@import context._ + + diff --git a/src/main/twirl/gitbucket/core/helper/activities.scala.html b/src/main/twirl/gitbucket/core/helper/activities.scala.html new file mode 100644 index 0000000..18856c2 --- /dev/null +++ b/src/main/twirl/gitbucket/core/helper/activities.scala.html @@ -0,0 +1,99 @@ +@(activities: List[gitbucket.core.model.Activity])(implicit context: gitbucket.core.controller.Context) +@import context._ +@import gitbucket.core.view.helpers._ + +@if(activities.isEmpty){ + No activity +} else { + @activities.map { activity => +
+ @(activity.activityType match {
+ case "open_issue" => detailActivity(activity, "activity-issue.png")
+ case "comment_issue" => detailActivity(activity, "activity-comment.png")
+ case "comment_commit" => detailActivity(activity, "activity-comment.png")
+ case "close_issue" => detailActivity(activity, "activity-issue-close.png")
+ case "reopen_issue" => detailActivity(activity, "activity-issue-reopen.png")
+ case "open_pullreq" => detailActivity(activity, "activity-merge.png")
+ case "merge_pullreq" => detailActivity(activity, "activity-merge.png")
+ case "create_repository" => simpleActivity(activity, "activity-create-repository.png")
+ case "create_branch" => simpleActivity(activity, "activity-branch.png")
+ case "delete_branch" => simpleActivity(activity, "activity-delete.png")
+ case "create_tag" => simpleActivity(activity, "activity-tag.png")
+ case "delete_tag" => simpleActivity(activity, "activity-delete.png")
+ case "fork" => simpleActivity(activity, "activity-fork.png")
+ case "push" => customActivity(activity, "activity-commit.png"){
+
+ }
+ case "create_wiki" => customActivity(activity, "activity-wiki.png"){
+
+ }
+ case "edit_wiki" => customActivity(activity, "activity-wiki.png"){
+ activity.additionalInfo.get.split(":") match {
+ case Array(pageName, commitId) =>
+
+ case Array(pageName) =>
+
+ }
+ }
+ })
+
+ }
+}
+
+@detailActivity(activity: gitbucket.core.model.Activity, image: String) = {
+
+
+}
+
+@customActivity(activity: gitbucket.core.model.Activity, image: String)(additionalInfo: Any) = {
+ @helper.html.datetimeago(activity.activityDate)
+
+ @avatar(activity.activityUserName, 16)
+ @activityMessage(activity.message)
+
+ @activity.additionalInfo.map { additionalInfo =>
+
+ }
+
+
+}
+
+@simpleActivity(activity: gitbucket.core.model.Activity, image: String) = {
+ @helper.html.datetimeago(activity.activityDate)
+
+ @avatar(activity.activityUserName, 16)
+ @activityMessage(activity.message)
+
+ @additionalInfo
+
+
+}
+
diff --git a/src/main/twirl/gitbucket/core/helper/attached.scala.html b/src/main/twirl/gitbucket/core/helper/attached.scala.html
new file mode 100644
index 0000000..33bd58e
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/attached.scala.html
@@ -0,0 +1,33 @@
+@(owner: String, repository: String)(textarea: Html)(implicit context: gitbucket.core.controller.Context)
+@import context._
+
+ @avatar(activity.activityUserName, 16)
+ @activityMessage(activity.message)
+ @helper.html.datetimeago(activity.activityDate)
+
+
+ @textarea
+
+@defining("(id=\")([\\w\\-]*)(\")".r.findFirstMatchIn(textarea.body).map(_.group(2))){ textareaId =>
+
+}
diff --git a/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html b/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html
new file mode 100644
index 0000000..f97e166
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html
@@ -0,0 +1,64 @@
+@(branch: String = "",
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ hasWritePermission: Boolean)(body: Html)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.service.RepositoryService
+@import context._
+@import gitbucket.core._
+@import gitbucket.core.view.helpers._
+@helper.html.dropdown(
+ value = if(branch.length == 40) branch.substring(0, 10) else branch,
+ prefix = if(branch.length == 40) "tree" else if(repository.branchList.contains(branch)) "branch" else "tree",
+ mini = true
+) {
+ Attach images by dragging & dropping, or selecting them.
+Switch branches
+
diff --git a/src/main/twirl/gitbucket/core/helper/copy.scala.html b/src/main/twirl/gitbucket/core/helper/copy.scala.html
new file mode 100644
index 0000000..7a09a52
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/copy.scala.html
@@ -0,0 +1,55 @@
+@(id: String, value: String)(html: Html)
+@avatar(comment.commentedUserName, 48)
+
+
+
+ @user(comment.commentedUserName, styleClass="username strong")
+
+ commented
+ @if(comment.pullRequest){
+ on this Pull Request
+ }else{
+ @if(comment.fileName.isDefined){
+ on @comment.fileName.get
+ }
+ in @comment.commitId.substring(0, 7)
+ }
+ @helper.html.datetimeago(comment.registeredDate)
+
+
+ @if(hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false)){
+
+
+ }
+
+
+
+ @markdown(comment.content, repository, false, true, true, hasWritePermission)
+
+
+ @html
+
+
+
diff --git a/src/main/twirl/gitbucket/core/helper/datepicker.scala.html b/src/main/twirl/gitbucket/core/helper/datepicker.scala.html
new file mode 100644
index 0000000..c221629
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/datepicker.scala.html
@@ -0,0 +1,11 @@
+@(name: String, value: Option[java.util.Date])
+@import gitbucket.core.view.helpers
+
+
+
+
+
diff --git a/src/main/twirl/gitbucket/core/helper/datetimeago.scala.html b/src/main/twirl/gitbucket/core/helper/datetimeago.scala.html
new file mode 100644
index 0000000..ded15a4
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/datetimeago.scala.html
@@ -0,0 +1,10 @@
+@(latestUpdatedDate: java.util.Date,
+ recentOnly: Boolean = true)
+@import gitbucket.core.view.helpers._
+
+ @if(recentOnly){
+ @datetimeAgoRecentOnly(latestUpdatedDate)
+ }else{
+ @datetimeAgo(latestUpdatedDate)
+ }
+
diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html
new file mode 100644
index 0000000..2877060
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html
@@ -0,0 +1,251 @@
+@(diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ newCommitId: Option[String],
+ oldCommitId: Option[String],
+ showIndex: Boolean,
+ issueId: Option[Int],
+ hasWritePermission: Boolean,
+ showLineNotes: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@import org.eclipse.jgit.diff.DiffEntry.ChangeType
+@if(showIndex){
+
+
+
+}
+@diffs.zipWithIndex.map { case (diff, i) =>
+
+
+
+ Showing @diffs.size changed @plural(diffs.size, "file")
+
+
+
+
+
+ @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
+  @diff.oldPath -> @diff.newPath
+ @if(newCommitId.isDefined){
+
+ }
+ }
+ @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){
+ @if(diff.changeType == ChangeType.ADD){
+ 
+ }else{
+ 
+ } @diff.newPath
+ @if(newCommitId.isDefined){
+
+ }
+ }
+ @if(diff.changeType == ChangeType.DELETE){
+  @diff.oldPath
+ @if(oldCommitId.isDefined){
+
+ }
+ }
+ |
+
|---|
| + @if(diff.newContent != None || diff.oldContent != None){ + + + + } else { + Not supported + } + | +
+
+
+
diff --git a/src/main/twirl/gitbucket/core/helper/error.scala.html b/src/main/twirl/gitbucket/core/helper/error.scala.html
new file mode 100644
index 0000000..00f43e2
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/error.scala.html
@@ -0,0 +1,7 @@
+@(error: Option[Any])
+@if(error.isDefined){
+
+
+ @error
+
+}
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/helper/feed.scala.xml b/src/main/twirl/gitbucket/core/helper/feed.scala.xml
new file mode 100644
index 0000000..865cee9
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/feed.scala.xml
@@ -0,0 +1,27 @@
+@(activities: List[gitbucket.core.model.Activity])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+Where should we fork this repository?
+ \ No newline at end of file diff --git a/src/main/twirl/gitbucket/core/helper/information.scala.html b/src/main/twirl/gitbucket/core/helper/information.scala.html new file mode 100644 index 0000000..ff382a2 --- /dev/null +++ b/src/main/twirl/gitbucket/core/helper/information.scala.html @@ -0,0 +1,7 @@ +@(info: Option[Any]) +@if(info.isDefined){ +
+
+ @info
+
+}
diff --git a/src/main/twirl/gitbucket/core/helper/paginator.scala.html b/src/main/twirl/gitbucket/core/helper/paginator.scala.html
new file mode 100644
index 0000000..609e149
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/paginator.scala.html
@@ -0,0 +1,34 @@
+@(page: Int, count: Int, limit: Int, width: Int, baseURL: String)
+@defining(gitbucket.core.view.Pagination(page, count, limit, width)){ p =>
+ @if(p.count > p.limit){
+
+
+
+ }
+}
diff --git a/src/main/twirl/gitbucket/core/helper/preview.scala.html b/src/main/twirl/gitbucket/core/helper/preview.scala.html
new file mode 100644
index 0000000..86e940b
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/preview.scala.html
@@ -0,0 +1,58 @@
+@(repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ content: String,
+ enableWikiLink: Boolean,
+ enableRefsLink: Boolean,
+ enableTaskList: Boolean,
+ hasWritePermission: Boolean,
+ style: String = "",
+ placeholder: String = "Leave a comment",
+ elastic: Boolean = false,
+ uid: Long = new java.util.Date().getTime())(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core._
+@import gitbucket.core.view.helpers._
+
+
+
+
+
+
diff --git a/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html b/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html
new file mode 100644
index 0000000..88462a5
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html
@@ -0,0 +1,13 @@
+@(repository: gitbucket.core.service.RepositoryService.RepositoryInfo, large: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.service.RepositoryService
+@import context._
+@import gitbucket.core.view.helpers._
+@if(repository.repository.isPrivate){
+
+
+
+
+ @textarea = {
+
+ }
+ @if(enableWikiLink){
+ @textarea
+ } else {
+ @helper.html.attached(repository.owner, repository.name)(textarea)
+ }
+
+
+
+
+
+
+} else {
+ @if(repository.repository.originUserName.isDefined){
+
+ } else {
+
+ }
+}
diff --git a/src/main/twirl/gitbucket/core/helper/uploadavatar.scala.html b/src/main/twirl/gitbucket/core/helper/uploadavatar.scala.html
new file mode 100644
index 0000000..6cf76e0
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/helper/uploadavatar.scala.html
@@ -0,0 +1,51 @@
+@(account: Option[gitbucket.core.model.Account])(implicit context: gitbucket.core.controller.Context)
+@import context._
+
+ @if(account.nonEmpty && account.get.image.nonEmpty){
+ 
+ } else {
+
+@if(account.nonEmpty && account.get.image.nonEmpty){
+
+}
+
+@if(account.isEmpty || account.get.image.isEmpty){
+
+}
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/index.scala.html b/src/main/twirl/gitbucket/core/index.scala.html
new file mode 100644
index 0000000..7976e2a
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/index.scala.html
@@ -0,0 +1,80 @@
+@(activities: List[gitbucket.core.model.Activity],
+ recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
+ userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@main("GitBucket"){
+ @dashboard.html.tab()
+ Upload Image
+ }
+
+
+}
diff --git a/src/main/twirl/gitbucket/core/issues/commentform.scala.html b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
new file mode 100644
index 0000000..20b4dc4
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
@@ -0,0 +1,31 @@
+@(issue: gitbucket.core.model.Issue,
+ reopenable: Boolean,
+ hasWritePermission: Boolean,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@if(loginAccount.isDefined){
+
+
+
+
+
+
+
+
+ @helper.html.activities(activities)
+
+
+ @settings.information.map { information =>
+
+
+ }
+
+
+
+
+
+ @Html(information)
+
+ }
+ @if(loginAccount.isEmpty){
+ @signinform(settings)
+ } else {
+ |
+
+ New repository
+
+ Your repositories (@userRepositories.size)
+ |
+
|---|
| No repositories | +
| + @helper.html.repositoryicon(repository, false) + @if(repository.owner == loginAccount.get.userName){ + @repository.name + } else { + @repository.owner/@repository.name + } + | +
| + Recent updated repositories + | +
|---|
| No repositories | +
| + @helper.html.repositoryicon(repository, false) + @repository.owner/@repository.name + | +
+ +} + diff --git a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html new file mode 100644 index 0000000..6658819 --- /dev/null +++ b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html @@ -0,0 +1,264 @@ +@(issue: Option[gitbucket.core.model.Issue], + comments: List[gitbucket.core.model.Comment], + hasWritePermission: Boolean, + repository: gitbucket.core.service.RepositoryService.RepositoryInfo, + pullreq: Option[gitbucket.core.model.PullRequest] = None)(implicit context: gitbucket.core.controller.Context) +@import context._ +@import gitbucket.core.view.helpers._ +@import gitbucket.core.model.CommitComment +@if(issue.isDefined){ +
@avatar(issue.get.openedUserName, 48)
+
+
+}
+
+@comments.map {
+ case comment: gitbucket.core.model.IssueComment => {
+ @if(comment.action != "close" && comment.action != "reopen" && comment.action != "delete_branch"){
+
+ @user(issue.get.openedUserName, styleClass="username strong") commented @helper.html.datetimeago(issue.get.registeredDate)
+
+ @if(hasWritePermission || loginAccount.map(_.userName == issue.get.openedUserName).getOrElse(false)){
+
+ }
+
+
+
+ @markdown(issue.get.content getOrElse "No description provided.", repository, false, true, true, hasWritePermission)
+
+ @avatar(comment.commentedUserName, 48)
+
+
+ }
+ @if(comment.action == "merge"){
+
+ @user(comment.commentedUserName, styleClass="username strong")
+
+ @if(comment.action == "comment"){
+ commented
+ } else {
+ @if(pullreq.isEmpty){ referenced the issue } else { referenced the pull request }
+ }
+ @helper.html.datetimeago(comment.registeredDate)
+
+
+ @if(comment.action != "commit" && comment.action != "merge" && comment.action != "refer"
+ && (hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
+
+
+ }
+
+
+
+ @if(comment.action == "commit" && comment.content.split(" ").last.matches("[a-f0-9]{40}")){
+ @defining(comment.content.substring(comment.content.length - 40)){ id =>
+
+
+ @markdown(comment.content.substring(0, comment.content.length - 41), repository, false, true, true, hasWritePermission)
+ }
+ } else {
+ @if(comment.action == "refer"){
+ @defining(comment.content.split(":")){ case Array(issueId, rest @ _*) =>
+ Issue #@issueId: @rest.mkString(":")
+ }
+ } else {
+ @markdown(comment.content, repository, false, true, true, hasWritePermission)
+ }
+ }
+
+ Merged
+ @avatar(comment.commentedUserName, 20)
+ @user(comment.commentedUserName, styleClass="username strong") merged commit
+ }
+ @if(comment.action == "close" || comment.action == "close_comment"){
+ @pullreq.map(_.commitIdTo.substring(0, 7)) into
+ @if(pullreq.get.requestUserName == repository.owner){
+ @pullreq.map(_.branch) from @pullreq.map(_.requestBranch)
+ } else {
+ @pullreq.map(_.userName):@pullreq.map(_.branch) from @pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch)
+ }
+ @helper.html.datetimeago(comment.registeredDate)
+
+ Closed
+ @avatar(comment.commentedUserName, 20)
+ @if(issue.isDefined && issue.get.isPullRequest){
+ @user(comment.commentedUserName, styleClass="username strong") closed the pull request @helper.html.datetimeago(comment.registeredDate)
+ } else {
+ @user(comment.commentedUserName, styleClass="username strong") closed the issue @helper.html.datetimeago(comment.registeredDate)
+ }
+
+ }
+ @if(comment.action == "reopen" || comment.action == "reopen_comment"){
+
+ Reopened
+ @avatar(comment.commentedUserName, 20)
+ @user(comment.commentedUserName, styleClass="username strong") reopened the issue @helper.html.datetimeago(comment.registeredDate)
+
+ }
+ @if(comment.action == "delete_branch"){
+
+ Deleted
+ @avatar(comment.commentedUserName, 20)
+ @user(comment.commentedUserName, styleClass="username strong") deleted the @pullreq.map(_.requestBranch) branch @helper.html.datetimeago(comment.registeredDate)
+
+ }
+ }
+ case comment: CommitComment => {
+ @helper.html.commitcomment(comment, hasWritePermission, repository, pullreq.map(_.commitIdTo))
+ }
+}
+
diff --git a/src/main/twirl/gitbucket/core/issues/commitstatus.scala.html b/src/main/twirl/gitbucket/core/issues/commitstatus.scala.html
new file mode 100644
index 0000000..944951f
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/commitstatus.scala.html
@@ -0,0 +1,19 @@
+@(issue: gitbucket.core.model.Issue, statusInfo: Option[gitbucket.core.service.IssuesService.CommitStatusInfo])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers._
+@statusInfo.map{ status =>
+ @if(status.count==1 && status.state.isDefined){
+ @if(status.targetUrl.isDefined){
+ @commitStateIcon(status.state.get)
+ }else{
+ @commitStateIcon(status.state.get)
+ }
+ }else{
+ @defining(status.count==status.successCount){ isSuccess =>
+ @if(isSuccess){
+ ✔
+ }else{
+ ×
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/issues/create.scala.html b/src/main/twirl/gitbucket/core/issues/create.scala.html
new file mode 100644
index 0000000..a45b047
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/create.scala.html
@@ -0,0 +1,148 @@
+@(collaborators: List[String],
+ milestones: List[gitbucket.core.model.Milestone],
+ labels: List[gitbucket.core.model.Label],
+ hasWritePermission: Boolean,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){
+ @html.menu("issues", repository){
+ @navigation("issues", false, repository)
+ + + } +} + diff --git a/src/main/twirl/gitbucket/core/issues/editcomment.scala.html b/src/main/twirl/gitbucket/core/issues/editcomment.scala.html new file mode 100644 index 0000000..07a815d --- /dev/null +++ b/src/main/twirl/gitbucket/core/issues/editcomment.scala.html @@ -0,0 +1,42 @@ +@(content: String, commentId: Int, owner: String, repository: String)(implicit context: gitbucket.core.controller.Context) +@import context._ + +@helper.html.attached(owner, repository){ + +} +
+
+
+
+
diff --git a/src/main/twirl/gitbucket/core/issues/editissue.scala.html b/src/main/twirl/gitbucket/core/issues/editissue.scala.html
new file mode 100644
index 0000000..5dfb18f
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/editissue.scala.html
@@ -0,0 +1,38 @@
+@(content: Option[String], issueId: Int, owner: String, repository: String)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@helper.html.attached(owner, repository){
+
+}
+
+
+
+
+
diff --git a/src/main/twirl/gitbucket/core/issues/issue.scala.html b/src/main/twirl/gitbucket/core/issues/issue.scala.html
new file mode 100644
index 0000000..5ced5fc
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/issue.scala.html
@@ -0,0 +1,92 @@
+@(issue: gitbucket.core.model.Issue,
+ comments: List[gitbucket.core.model.IssueComment],
+ issueLabels: List[gitbucket.core.model.Label],
+ collaborators: List[String],
+ milestones: List[(gitbucket.core.model.Milestone, Int, Int)],
+ labels: List[gitbucket.core.model.Label],
+ hasWritePermission: Boolean,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
+ @html.menu("issues", repository){
+
+
+ @if(issue.closed) {
+ Closed
+ } else {
+ Open
+ }
+
+ @user(issue.openedUserName, styleClass="username strong") opened this issue @helper.html.datetimeago(issue.registeredDate) - @defining(
+ comments.count( _.action.contains("comment") )
+ ){ count =>
+ @count @plural(count, "comment")
+ }
+
+
+ @if(hasWritePermission || loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){
+ Edit
+ }
+ New issue
+
+
+ + + @issue.title + #@issue.issueId + + +
++
+
+
+ }
+}
+
diff --git a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
new file mode 100644
index 0000000..84aee5e
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
@@ -0,0 +1,173 @@
+@(issue: gitbucket.core.model.Issue,
+ comments: List[gitbucket.core.model.Comment],
+ issueLabels: List[gitbucket.core.model.Label],
+ collaborators: List[String],
+ milestones: List[(gitbucket.core.model.Milestone, Int, Int)],
+ labels: List[gitbucket.core.model.Label],
+ hasWritePermission: Boolean,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers._
+
+ @commentlist(Some(issue), comments, hasWritePermission, repository)
+ @commentform(issue, true, hasWritePermission, repository)
+
+
+ @issueinfo(issue, comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
+
+
+ Labels
+ @if(hasWritePermission){
+
+
+ @helper.html.dropdown(right = true) {
+ @labels.map { label =>
+
+
+ @helper.html.checkicon(issueLabels.exists(_.labelId == label.labelId))
+
+ @label.labelName
+
+
+ }
+ }
+
+ }
+-
+ @labellist(issueLabels)
+
+
+ Milestone
+ @if(hasWritePermission){
+
+
+ @helper.html.dropdown(right = true) {
+ Clear this milestone
+ @milestones.filter(_._1.closedDate.isEmpty).map { case (milestone, _, _) =>
+
+
+ @helper.html.checkicon(Some(milestone.milestoneId) == issue.milestoneId) @milestone.title
+
+ }
+ }
+
+ }
+
+ @milestone.dueDate.map { dueDate =>
+ @if(isPast(dueDate)){
+ 
Due by @date(dueDate)
+ } else {
+ Due by @date(dueDate)
+ }
+ }.getOrElse {
+ No due date
+ }
+
+
+ Due by @date(dueDate)
+ } else {
+ Due by @date(dueDate)
+ }
+ }.getOrElse {
+ No due date
+ }
+
+ @issue.milestoneId.map { milestoneId =>
+ @milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) =>
+ @issues.milestones.html.progress(openCount + closeCount, closeCount)
+ }
+ }
+
+
+ @issue.milestoneId.map { milestoneId =>
+ @milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) =>
+ @milestone.title
+ }
+ }.getOrElse {
+ No milestone
+ }
+
++
+ Assignee
+ @if(hasWritePermission){
+
+
+ @issue.assignedUserName.map { userName =>
+ @avatar(userName, 20) @user(userName, styleClass="username strong small")
+ }.getOrElse{
+ No one
+ }
+
+
+ @helper.html.dropdown(right = true) {
+ Clear assignee
+ @collaborators.map { collaborator =>
+
+
+ @helper.html.checkicon(Some(collaborator) == issue.assignedUserName)@avatar(collaborator, 20) @collaborator
+
+
+ }
+ }
+
+ }
++
+ @defining((issue.openedUserName :: comments.map(_.commentedUserName)).distinct){ participants =>
+
+
diff --git a/src/main/twirl/gitbucket/core/issues/labellist.scala.html b/src/main/twirl/gitbucket/core/issues/labellist.scala.html
new file mode 100644
index 0000000..38b2aa3
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/labellist.scala.html
@@ -0,0 +1,7 @@
+@(issueLabels: List[gitbucket.core.model.Label])
+@if(issueLabels.isEmpty){
+ @participants.size @plural(participants.size, "participant")
+ @participants.map { participant => @avatarLink(participant, 20, tooltip = true) }
+ }
+
+
+
+
+}
diff --git a/src/main/twirl/gitbucket/core/issues/labels/label.scala.html b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
new file mode 100644
index 0000000..b7cee42
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
@@ -0,0 +1,36 @@
+@(label: gitbucket.core.model.Label,
+ counts: Map[String, Int],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+
+
+
+
+
+ 
+ @label.labelName
+
+
+ @if(hasWritePermission){
+
+ }
+
+ @counts.get(label.labelName).getOrElse(0) open issues
+
+ + +
| + @labels.size labels + | +
|---|
| + No labels to show. + @if(hasWritePermission){ + Create a new label. + } + | +
+@if(condition.nonEmpty){ + +} +
+ 
+ |
+
+
+
+
+ @openCount Open
+
+
+
+ @closedCount Closed
+
+
+
+ @helper.html.dropdown("Author", flat = true) {
+ @collaborators.map { collaborator =>
+
+ @if(hasWritePermission){
+
+ @helper.html.dropdown("Mark as", flat = true) {
+
+ }
+ |
+
|---|
| + @if(target == "issues"){ + No issues to show. + } else { + No pull requests to show. + } + @if(condition.labels.nonEmpty || condition.milestone.isDefined){ + Clear active filters. + } else { + @if(repository.isDefined){ + @if(target == "issues"){ + Create a new issue. + } else { + Create a new pull request. + } + } + } + | +
|
+ @if(hasWritePermission){
+
+ }
+
+ @if(repository.isEmpty){
+ @issue.repositoryName ･
+ }
+ @if(target == "issues"){
+ @issue.title
+ } else {
+ @issue.title
+ }
+ @commitstatus(issue, commitStatus)
+ @labels.map { label =>
+ @label.labelName
+ }
+
+ @issue.assignedUserName.map { userName =>
+ @avatar(userName, 20, tooltip = true)
+ }
+ @if(commentCount > 0){
+
+ @commentCount
+
+ } else {
+
+ @commentCount
+
+ }
+
+
+ #@issue.issueId opened @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username")
+ @milestone.map { milestone =>
+
+ @milestone
+ }
+ |
+
+ @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), gitbucket.core.service.IssuesService.IssueLimit, 10, condition.toURL)
+
+
diff --git a/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html
new file mode 100644
index 0000000..dc4ef3b
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html
@@ -0,0 +1,47 @@
+@(milestone: Option[gitbucket.core.model.Milestone],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"Milestones - ${repository.owner}/${repository.name}"){
+ @html.menu("issues", repository){
+ @if(milestone.isEmpty){
+ New milestone
+Create a new milestone to help organize your issues and pull requests.
+ } else {
+ @issues.html.navigation("milestones", false, repository)
+ + } +
+ + } +} diff --git a/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html new file mode 100644 index 0000000..98e29e4 --- /dev/null +++ b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html @@ -0,0 +1,105 @@ +@(state: String, + milestones: List[(gitbucket.core.model.Milestone, Int, Int)], + repository: gitbucket.core.service.RepositoryService.RepositoryInfo, + hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context) +@import context._ +@import gitbucket.core.view.helpers._ +@html.main(s"Milestones - ${repository.owner}/${repository.name}"){ + @html.menu("issues", repository){ + @issues.html.navigation("milestones", hasWritePermission, repository) +
+
+
+
+ 
+ @milestones.count(_._1.closedDate.isEmpty) Open
+
+
+
+ @milestones.count(_._1.closedDate.isDefined) Closed
+
+
+ |
+
|---|
|
+
+
+ @if(milestone.description.isDefined){
+
+ @milestone.title
+
+
+ @if(milestone.closedDate.isDefined){
+ Closed @helper.html.datetimeago(milestone.closedDate.get)
+ } else {
+ @milestone.dueDate.map { dueDate =>
+ @if(isPast(dueDate)){
+
+ Due by @date(dueDate)
+ } else {
+ Due by @date(dueDate)
+ }
+ }.getOrElse {
+ No due date
+ }
+ }
+
+ @progress(openCount + closedCount, closedCount)
+
+
+
+
+ @if(closedCount == 0){
+ 0%
+ } else {
+ @((closedCount.toDouble / (openCount + closedCount).toDouble * 100).toInt)%
+ } complete
+ @openCount open
+ @closedCount closed
+
+
+
+ @markdown(milestone.description.get, repository, false, false)
+
+ }
+ |
+
| + No milestones to show. + @if(hasWritePermission){ + Create a new milestone. + } + | +
+ @if(progress > 0){
+
+ }
+
diff --git a/src/main/twirl/gitbucket/core/issues/navigation.scala.html b/src/main/twirl/gitbucket/core/issues/navigation.scala.html
new file mode 100644
index 0000000..eb2f077
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/navigation.scala.html
@@ -0,0 +1,58 @@
+@(active: String,
+ newButton: Boolean,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ condition: Option[gitbucket.core.service.IssuesService.IssueSearchCondition] = None)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+
diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html
new file mode 100644
index 0000000..1026201
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -0,0 +1,93 @@
+@(title: String, repository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo] = None)(body: Html)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.plugin.PluginRegistry
+@import gitbucket.core.servlet.AutoUpdate
+@import context._
+@import gitbucket.core.view.helpers._
+
+
+
+
+
+ } else {
+
+
+ }
+ @if(expand){ @label}
+ @if(expand && count > 0){
+ @count
+ }
+
+
+ @helper.html.information(info)
+ @helper.html.error(error)
+ @if(repository.commitCount > 0){
+
+
+
+ }
+
+ @if(loginAccount.isEmpty){
+ Fork
+ } else {
+ @if(isNoGroup) {
+ Fork
+ } else {
+ Fork
+ }
+ }
+ @repository.forkedCount
+
+
+ @helper.html.repositoryicon(repository, true)
+ @repository.owner / @repository.name
+
+ @defining(repository.repository){ x =>
+ @if(repository.repository.originRepositoryName.isDefined){
+
+
+ forked from @x.parentUserName/@x.parentRepositoryName
+
+ }
+ }
+ +
+
+
diff --git a/src/main/twirl/gitbucket/core/pulls/commits.scala.html b/src/main/twirl/gitbucket/core/pulls/commits.scala.html
new file mode 100644
index 0000000..43ed945
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/pulls/commits.scala.html
@@ -0,0 +1,35 @@
+@(commits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]],
+ comments: Option[List[gitbucket.core.model.Comment]] = None,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@import gitbucket.core.model._
+
+
+ @if(expand){
+
+
+ HTTP clone URL
+
+ @helper.html.copy("repository-url-copy", repository.httpUrl){
+
+ }
+ @if(settings.ssh && loginAccount.isDefined){
+
+ }
+ @id.map { id =>
+
+ Download ZIP
+
+
+ Download TAR.GZ
+
+ }
+ }
+
+ @if(expand){
+ @repository.repository.description.map { description =>
+
+@description
+ } + + } + @body +
+ 
+ @repository.commitCount commits
+ 
+ 
+ @repository.branchList.length branches
+ 
+ 
+ @repository.tags.length releases
+
+
+ @commits.map { day =>
+
+
diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
new file mode 100644
index 0000000..d706075
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
@@ -0,0 +1,155 @@
+@(commits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]],
+ diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo],
+ members: List[(String, String)],
+ comments: List[gitbucket.core.model.Comment],
+ originId: String,
+ forkedId: String,
+ sourceId: String,
+ commitId: String,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ originRepository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ forkedRepository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){
+ @html.menu("pulls", repository){
+ | @date(day.head.commitTime) | +|||
|---|---|---|---|
| + @avatar(commit, 20) + @user(commit.authorName, commit.authorEmailAddress, "username") + | +@commit.shortMessage | ++ @if(comments.isDefined){ + @comments.get.flatMap @{ + case comment: CommitComment => Some(comment) + case other => None + }.count(t => t.commitId == commit.id && !t.pullRequest) + } + | ++ @commit.id.substring(0, 7) + | +
+
+
+
+ @if(commits.nonEmpty && hasWritePermission){
+
+
+ }
+ @if(commits.isEmpty){
+
+ There isn't anything to compare.+ @originRepository.owner:@originId and @forkedRepository.owner:@forkedId are identical. + |
+
Showing you all comments on commits in this comparison.
+ @issues.html.commentlist(None, comments, hasWritePermission, repository, None) + } + } +} + diff --git a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html new file mode 100644 index 0000000..d005b40 --- /dev/null +++ b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html @@ -0,0 +1,68 @@ +@(issue: gitbucket.core.model.Issue, + pullreq: gitbucket.core.model.PullRequest, + comments: List[gitbucket.core.model.Comment], + issueLabels: List[gitbucket.core.model.Label], + collaborators: List[String], + milestones: List[(gitbucket.core.model.Milestone, Int, Int)], + labels: List[gitbucket.core.model.Label], + hasWritePermission: Boolean, + repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) +@import context._ +@import gitbucket.core.view.helpers._ +@import gitbucket.core.model._ + +
+
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/pulls/mergecheck.scala.html b/src/main/twirl/gitbucket/core/pulls/mergecheck.scala.html
new file mode 100644
index 0000000..dcc5af8
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/pulls/mergecheck.scala.html
@@ -0,0 +1,9 @@
+@(hasConflict: Boolean)
+@if(hasConflict){
+
+
+
+ @issues.html.commentlist(Some(issue), comments, hasWritePermission, repository, Some(pullreq))
+
+ @defining(comments.flatMap {
+ case comment: gitbucket.core.model.IssueComment => Some(comment)
+ case other => None
+ }.exists(_.action == "merge")){ merged =>
+ @if(hasWritePermission && !issue.closed){
+
+ }
+ @if(hasWritePermission && issue.closed && pullreq.userName == pullreq.requestUserName && merged &&
+ pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){
+ 
Checking...
+
+
+ }
+ @issues.html.commentform(issue, !merged, hasWritePermission, repository)
+ }
+
+ Delete branch
+
+
+ Pull request successfully merged and closed
+
+ You're all set-the @pullreq.requestBranch branch can be safely deleted.
+
+ @issues.html.issueinfo(issue, comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
+
+We can’t automatically merge these branches
+Don't worry, you can still submit the pull request.
+} else { +Able to merge
+These branches can be automatically merged.
+} + diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html new file mode 100644 index 0000000..f6c1d4a --- /dev/null +++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html @@ -0,0 +1,153 @@ +@(hasConflict: Boolean, + hasProblem: Boolean, + issue: gitbucket.core.model.Issue, + pullreq: gitbucket.core.model.PullRequest, + statuses: List[model.CommitStatus], + repository: gitbucket.core.service.RepositoryService.RepositoryInfo, + requestRepositoryUrl: String)(implicit context: gitbucket.core.controller.Context) +@import context._ +@import gitbucket.core.view.helpers._ +@import model.CommitState +
+
+
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
new file mode 100644
index 0000000..bcfd7d8
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
@@ -0,0 +1,125 @@
+@(issue: gitbucket.core.model.Issue,
+ pullreq: gitbucket.core.model.PullRequest,
+ comments: List[gitbucket.core.model.Comment],
+ issueLabels: List[gitbucket.core.model.Label],
+ collaborators: List[String],
+ milestones: List[(gitbucket.core.model.Milestone, Int, Int)],
+ labels: List[gitbucket.core.model.Label],
+ dayByDayCommits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]],
+ diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo],
+ hasWritePermission: Boolean,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@import gitbucket.core.model._
+@html.main(s"${issue.title} - Pull Request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
+ @html.menu("pulls", repository){
+ @defining(dayByDayCommits.flatten){ commits =>
+
+
+
+ @if(!statuses.isEmpty){
+
+
+
+ @if(statuses.size==1){
+ @defining(statuses.head){ status =>
+
+ }
+
+ @status.targetUrl.map{ url => Details }
+
+ @commitStateText(status.state, pullreq.commitIdTo)
+ @status.description.map{ desc => — @desc }
+
+ }
+ }else{
+ @defining(statuses.groupBy(_.state)){ stateMap => @defining(CommitState.combine(stateMap.keySet)){ state =>
+
+
+ } }
+ }
+
+
+
+
+ @if(hasConflict){
+ We can’t automatically merge this pull request.
+ } else{ @if(hasProblem){
+ Merge with caution!
+ } else {
+ This pull request can be automatically merged.
+ } }
+
+
+ @if(hasConflict){
+ Use the command line to resolve conflicts before continuing.
+ } else {
+ You can also merge branches on the command line.
+ }
+
+
+
+
+
+ @if(issue.closed) {
+ @comments.flatMap @{
+ case comment: IssueComment => Some(comment)
+ case _ => None
+ }.find(_.action == "merge").map{ comment =>
+ Merged
+
+ @user(comment.commentedUserName, styleClass="username strong") merged @commits.size @plural(commits.size, "commit")
+ into
+ @if(hasWritePermission || loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){
+ Edit
+ }
+ New issue
+
+
+ + + @issue.title + #@issue.issueId + + +
+@pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch
+ @helper.html.datetimeago(comment.registeredDate)
+
+ }.getOrElse {
+ Closed
+
+ @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
+ into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch
+
+ }
+ } else {
+ Open
+
+ @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
+ into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch
+
+ }
+ + +
+
+ }
+ }
+}
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html
new file mode 100644
index 0000000..99f1062
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html
@@ -0,0 +1,134 @@
+@(branch: String,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ pathList: List[String],
+ content: gitbucket.core.util.JGitUtil.ContentInfo,
+ latestCommit: gitbucket.core.util.JGitUtil.CommitInfo,
+ hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+ @html.menu("code", repository){
+
+ @pulls.html.conversation(issue, pullreq, comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
+
+
+ @pulls.html.commits(dayByDayCommits, Some(comments), repository)
+
+
+ @helper.html.diff(diffs, repository, Some(commits.head.id), Some(commits.last.id), true, Some(pullreq.issueId), hasWritePermission, true)
+
+
+ @helper.html.branchcontrol(
+ branch,
+ repository,
+ hasWritePermission
+ ){
+ @repository.branchList.map { x =>
+ @helper.html.checkicon(x == branch) @x
+ }
+ }
+ @repository.name /
+ @pathList.zipWithIndex.map { case (section, i) =>
+ @if(i == pathList.length - 1){
+ @section
+ } else {
+ @section /
+ }
+ }
+
+
+ |
+
+ @avatar(latestCommit, 20)
+ @user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
+ @helper.html.datetimeago(latestCommit.commitTime)
+
+
+
+ |
+
|---|
|
+ @if(content.viewType == "text"){
+ @defining(pathList.reverse.head) { file =>
+ @if(renderableSuffixes.find(suffix => file.toLowerCase.endsWith(suffix))) {
+
+ @renderMarkup(pathList, content.content.get, branch, repository, false, false)
+
+ } else {
+ @content.content.get+ } + } + } + @if(content.viewType == "image"){ + |
+
Branches
+| All branches | +
|---|
|
+
+ @branch.mergeInfo.map{ info =>
+ @prs.map{ case (pull, issue) =>
+ #@issue.issueId
+ @if(issue.closed) {
+ @if(info.isMerged){
+ Merged
+ }else{
+ Closed
+ }
+ } else {
+ Open
+ }
+ }.getOrElse{
+ @if(context.loginAccount.isDefined){
+ New Pull Request
+ }else{
+ Compare
+ }
+ }
+ @if(hasWritePermission){
+ @if(prs.map(!_._2.closed).getOrElse(false)){
+
+ }else{
+
+ }
+ }
+ }
+
+
+ @branch.name
+
+
+
+ @if(branch.mergeInfo.isEmpty){
+ Default
+ }else{
+ @branch.mergeInfo.map{ info =>
+
+ }
+ }
+
+
+
+
+ |
} + + +} diff --git a/src/main/twirl/gitbucket/core/repo/commit.scala.html b/src/main/twirl/gitbucket/core/repo/commit.scala.html new file mode 100644 index 0000000..4588ff7 --- /dev/null +++ b/src/main/twirl/gitbucket/core/repo/commit.scala.html @@ -0,0 +1,154 @@ +@(commitId: String, + commit: gitbucket.core.util.JGitUtil.CommitInfo, + branches: List[String], + tags: List[String], + comments: List[gitbucket.core.model.Comment], + repository: gitbucket.core.service.RepositoryService.RepositoryInfo, + diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo], + oldCommitId: Option[String], + hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context) +@import gitbucket.core.util.Implicits._ +@import context._ +@import gitbucket.core.view.helpers._ +@html.main(commit.shortMessage, Some(repository)){ + @html.menu("code", repository){ +
|
+
+ Browse code
+
+ @link(commit.summary, repository)
+ @if(commit.description.isDefined){
+ @link(commit.description.get, repository)+ } + + |
+
|---|
|
+
+
+
+
+
+ @if(commit.parents.size == 0){
+ 0 parent
+ }
+ @if(commit.parents.size == 1){
+ 1 parent
+ @commit.parents(0).substring(0, 7)
+ }
+ commit @commit.id
+
+ @if(commit.parents.size > 1){
+
+ @commit.parents.size parents
+ @commit.parents.map { parent =>
+ @parent.substring(0, 7)
+ }.mkHtml(" + ")
+
+
+ }
+ |
+
+ @branches.zipWithIndex.map { case (branch, i) =>
+ 
+ @tags.zipWithIndex.map { case (tag, i) =>
+
+ @issues.html.commentlist(None, comments, hasWritePermission, repository, None)
+
+ @commentform(commitId = commitId, hasWritePermission = hasWritePermission, repository = repository)
+ }
+}
+
+
diff --git a/src/main/twirl/gitbucket/core/repo/commits.scala.html b/src/main/twirl/gitbucket/core/repo/commits.scala.html
new file mode 100644
index 0000000..01b5d2c
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/repo/commits.scala.html
@@ -0,0 +1,81 @@
+@(pathList: List[String],
+ branch: String,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ commits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]],
+ page: Int,
+ hasNext: Boolean,
+ hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+ @html.menu("code", repository){
+
+ @helper.html.branchcontrol(
+ branch,
+ repository,
+ hasWritePermission
+ ){
+ @repository.branchList.map { x =>
+ @helper.html.checkicon(x == branch) @x
+ }
+ }
+ @if(pathList.isEmpty){
+ @repository.name / Commit History
+ }
+ @if(pathList.nonEmpty){
+ History for
+ @repository.name /
+ @pathList.zipWithIndex.map { case (section, i) =>
+ @if(i == pathList.length - 1){
+ @section
+ } else {
+ @section /
+ }
+ }
+ }
+
+ @commits.map { day =>
+ | @date(day.head.commitTime) | +
|---|
|
+
+
+
+ @avatar(commit, 40)
+
+ |
+
+
+
+
+ }
+}
diff --git a/src/main/twirl/gitbucket/core/repo/delete.scala.html b/src/main/twirl/gitbucket/core/repo/delete.scala.html
new file mode 100644
index 0000000..fd96793
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/repo/delete.scala.html
@@ -0,0 +1,61 @@
+@(branch: String,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ pathList: List[String],
+ fileName: String,
+ content: gitbucket.core.util.JGitUtil.ContentInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"Deleting ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) {
+ @html.menu("code", repository){
+
+ }
+}
+
+
+
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/repo/editcomment.scala.html b/src/main/twirl/gitbucket/core/repo/editcomment.scala.html
new file mode 100644
index 0000000..5e1c4cf
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/repo/editcomment.scala.html
@@ -0,0 +1,45 @@
+@(content: String, commentId: Int, owner: String, repository: String)(implicit context: gitbucket.core.controller.Context)
+@import context._
+
+@helper.html.attached(owner, repository){
+
+}
+
+
+
+
+
diff --git a/src/main/twirl/gitbucket/core/repo/editor.scala.html b/src/main/twirl/gitbucket/core/repo/editor.scala.html
new file mode 100644
index 0000000..27fa4fc
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/repo/editor.scala.html
@@ -0,0 +1,147 @@
+@(branch: String,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ pathList: List[String],
+ fileName: Option[String],
+ content: gitbucket.core.util.JGitUtil.ContentInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(if(fileName.isEmpty) "New File" else s"Editing ${fileName.get} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) {
+ @html.menu("code", repository){
+
+ }
+}
+
+
+
+
+
diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html
new file mode 100644
index 0000000..11d5f70
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/repo/files.scala.html
@@ -0,0 +1,123 @@
+@(branch: String,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ pathList: List[String],
+ groupNames: List[String],
+ latestCommit: gitbucket.core.util.JGitUtil.CommitInfo,
+ files: List[gitbucket.core.util.JGitUtil.FileInfo],
+ readme: Option[(List[String], String)],
+ hasWritePermission: Boolean,
+ info: Option[Any] = None,
+ error: Option[Any] = None)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+ @html.menu("code", repository, Some(branch), pathList.isEmpty, groupNames.isEmpty, info, error){
+
+ @helper.html.branchcontrol(
+ branch,
+ repository,
+ hasWritePermission
+ ){
+ @repository.branchList.map { x =>
+ @helper.html.checkicon(x == branch) @x
+ }
+ }
+ @repository.name /
+ @pathList.zipWithIndex.map { case (section, i) =>
+ @section /
+ }
+ @if(hasWritePermission){
+ 
+ }
+
+
+ }
+ | + + @if(latestCommit.description.isDefined){ + ... + + } + | +|||
|---|---|---|---|
| + + | +|||
| + | .. | ++ | + |
+ @if(file.isDirectory){
+ @if(file.linkUrl.isDefined){
+ 
+ } else {
+ 
+ }
+ } else {
+ 
+ }
+ |
+ + @if(file.isDirectory){ + @if(file.linkUrl.isDefined){ + + @file.name.split("/").toList.init match { + case Nil => {} + case list => {@list.mkString("", "/", "/")} + }@file.name.split("/").toList.last + + } else { + + @file.name.split("/").toList.init match { + case Nil => {} + case list => {@list.mkString("", "/", "/")} + }@file.name.split("/").toList.last + + } + } else { + @file.name + } + | ++ + [@user(file.author, file.mailAddress)] + | +@helper.html.datetimeago(file.time, false) | +
+
+ }
+ }
+}
diff --git a/src/main/twirl/gitbucket/core/repo/forked.scala.html b/src/main/twirl/gitbucket/core/repo/forked.scala.html
new file mode 100644
index 0000000..63dd866
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/repo/forked.scala.html
@@ -0,0 +1,35 @@
+@(originRepository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo],
+ members: List[(String, String)],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+ @html.menu("network", repository){
+
+ @filePath.reverse.head
+ @renderMarkup(filePath, content, branch, repository, false, false)
+ Members of the @repository.name Network
+
+ @if(originRepository.isDefined){
+ @avatar(originRepository.get.owner, 20)
+
+ @originRepository.get.owner / @originRepository.get.name
+
+ } else {
+ @avatar(repository.repository.originUserName.get, 20)
+
+ @repository.repository.originUserName / @repository.repository.originRepositoryName
+
+ }
+ (origin)
+
+ @members.map { case (owner, name) =>
+
+ }
+ }
+}
diff --git a/src/main/twirl/gitbucket/core/repo/guide.scala.html b/src/main/twirl/gitbucket/core/repo/guide.scala.html
new file mode 100644
index 0000000..cdb4099
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/repo/guide.scala.html
@@ -0,0 +1,43 @@
+@(repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.service.SystemSettingsService
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+ @html.menu("code", repository){
+ @if(!hasWritePermission){
+ This is an empty repository
+ } else { +Quick setup — if you've done this kind of thing before
+ +Create a new repository on the command line
+ @pre { + touch README.md + git init + git add README.md + git commit -m "first commit" + git remote add origin @repository.httpUrl + git push -u origin master + } +Push an existing repository from the command line
+ @pre { + git remote add origin @repository.httpUrl + git push -u origin master + } + + } + } +} \ No newline at end of file diff --git a/src/main/twirl/gitbucket/core/repo/tags.scala.html b/src/main/twirl/gitbucket/core/repo/tags.scala.html new file mode 100644 index 0000000..75c2634 --- /dev/null +++ b/src/main/twirl/gitbucket/core/repo/tags.scala.html @@ -0,0 +1,27 @@ +@(repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) +@import context._ +@import gitbucket.core.view.helpers._ +@html.main(s"${repository.owner}/${repository.name}", Some(repository)) { + @html.menu("code", repository){ +Tags
+| Tag | +Date | +Commit | +Download | +
|---|---|---|---|
| @tag.name | +@helper.html.datetimeago(tag.time, false) | +@tag.id.substring(0, 10) | ++ ZIP + TAR.GZ + | +
We couldn't find any code matching '@query'
+ } else { +We've found @files.size code @plural(files.size, "result")
+ } + @files.drop((page - 1) * CodeLimit).take(CodeLimit).map { file => +
+
+ }
+ @helper.html.paginator(page, files.size, CodeLimit, 10,
+ s"${url(repository)}/search?q=${urlEncode(query)}&type=code")
+ }
+}
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/search/issues.scala.html b/src/main/twirl/gitbucket/core/search/issues.scala.html
new file mode 100644
index 0000000..df7baa6
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/search/issues.scala.html
@@ -0,0 +1,35 @@
+@(issues: List[gitbucket.core.service.RepositorySearchService.IssueSearchResult],
+ fileCount: Int,
+ query: String,
+ page: Int,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@import gitbucket.core.service.RepositorySearchService._
+@html.main("Search Results", Some(repository)){
+ @menu("issue", fileCount, issues.size, query, repository){
+ @if(issues.isEmpty){
+ @file.path
+Last committed @helper.html.datetimeago(file.lastModified)
+ @Html(file.highlightText)+
We couldn't find any code matching '@query'
+ } else { +We've found @issues.size code @plural(issues.size, "result")
+ } + @issues.drop((page - 1) * IssueLimit).take(IssueLimit).map { issue => +
+
+ }
+ @helper.html.paginator(page, issues.size, IssueLimit, 10,
+ s"${url(repository)}/search?q=${urlEncode(query)}&type=issue")
+ }
+}
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/search/menu.scala.html b/src/main/twirl/gitbucket/core/search/menu.scala.html
new file mode 100644
index 0000000..93c7e38
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/search/menu.scala.html
@@ -0,0 +1,38 @@
+@(active: String, fileCount: Int, issueCount: Int, query: String,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.menu("", repository){
+ #@issue.issueId
+ @issue.title
+ @if(issue.highlightText.nonEmpty){ +@Html(issue.highlightText)+ } +
+ Opened by @issue.openedUserName
+ @helper.html.datetimeago(issue.registeredDate)
+ @if(issue.commentCount > 0){
+ @issue.commentCount @plural(issue.commentCount, "comment")
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/settings/collaborators.scala.html b/src/main/twirl/gitbucket/core/settings/collaborators.scala.html
new file mode 100644
index 0000000..9eb2915
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/settings/collaborators.scala.html
@@ -0,0 +1,35 @@
+@(collaborators: List[String],
+ isGroupRepository: Boolean,
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main("Settings", Some(repository)){
+ @html.menu("settings", repository){
+ @menu("collaborators", repository){
+
+
+
+
+
+
+
+ @body
+
+ Manage Collaborators
+-
+ @collaborators.map { collaboratorName =>
+
- + @collaboratorName + @if(!isGroupRepository){ + (remove) + } else { + @if(repository.managers.contains(collaboratorName)){ + (Manager) + } + } + + } +
+
+ }
+ }
+}
+
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/settings/hooks.scala.html b/src/main/twirl/gitbucket/core/settings/hooks.scala.html
new file mode 100644
index 0000000..bb6d681
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/settings/hooks.scala.html
@@ -0,0 +1,27 @@
+@(webHooks: List[gitbucket.core.model.WebHook],
+ enteredUrl: Option[Any],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ info: Option[Any])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main("Settings", Some(repository)){
+ @html.menu("settings", repository){
+ @menu("hooks", repository){
+ @helper.html.information(info)
+ Danger Zone
+
+
+
+
+ WebHook URLs
+-
+ @webHooks.map { webHook =>
+
- @webHook.url (remove) + } +
+
diff --git a/src/main/twirl/gitbucket/core/settings/options.scala.html b/src/main/twirl/gitbucket/core/settings/options.scala.html
new file mode 100644
index 0000000..e64287e
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/settings/options.scala.html
@@ -0,0 +1,100 @@
+@(repository: gitbucket.core.service.RepositoryService.RepositoryInfo, info: Option[Any])(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main("Settings", Some(repository)){
+ @html.menu("settings", repository){
+ @menu("options", repository){
+ @helper.html.information(info)
+
+ }
+ }
+}
diff --git a/src/main/twirl/gitbucket/core/signin.scala.html b/src/main/twirl/gitbucket/core/signin.scala.html
new file mode 100644
index 0000000..ca80383
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/signin.scala.html
@@ -0,0 +1,13 @@
+@()(implicit context: gitbucket.core.controller.Context)
+@import context._
+@main("Sign in"){
+
+
+
+
+
+
+ @body
+
+
+ @settings.information.map { information =>
+
+}
diff --git a/src/main/twirl/gitbucket/core/signinform.scala.html b/src/main/twirl/gitbucket/core/signinform.scala.html
new file mode 100644
index 0000000..b3312f9
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/signinform.scala.html
@@ -0,0 +1,29 @@
+@(systemSettings: gitbucket.core.service.SystemSettingsService.SystemSettings)(implicit context: gitbucket.core.controller.Context)
+@import context._
+
+
+ @Html(information)
+
+ }
+ @signinform(settings)
+ | + @if(systemSettings.allowAccountRegistration){ + + } + Sign in + | +
|---|
| + + | +
+ @helper.html.diff(diffs, repository, None, None, false, None, false, false)
+
+ @if(hasWritePermission){
+
+ @if(pageName.isDefined){
+ Revert Changes
+ } else {
+ Revert Changes
+ }
+
+ }
+ }
+}
diff --git a/src/main/twirl/gitbucket/core/wiki/edit.scala.html b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
new file mode 100644
index 0000000..3b3e1a2
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
@@ -0,0 +1,39 @@
+@(pageName: String,
+ page: Option[gitbucket.core.service.WikiService.WikiPageInfo],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
+ @html.menu("wiki", repository){
+
+
+ }
+}
+
diff --git a/src/main/twirl/gitbucket/core/wiki/history.scala.html b/src/main/twirl/gitbucket/core/wiki/history.scala.html
new file mode 100644
index 0000000..8c4d65c
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/wiki/history.scala.html
@@ -0,0 +1,77 @@
+@(pageName: Option[String],
+ commits: List[gitbucket.core.util.JGitUtil.CommitInfo],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){
+ @html.menu("wiki", repository){
+
+ |
+ Revisions
+
+
+
+ |
+ ||
|---|---|---|
| + | @avatar(commit, 20) @user(commit.authorName, commit.authorEmailAddress) | ++ @helper.html.datetimeago(commit.authorTime): @commit.shortMessage + | +
+
+
+
+ | Pages @pages.length | +
|---|
+
|
+
+ Clone this wiki locally
+
+ @helper.html.copy("repository-url-copy", httpUrl(repository)){
+
+ }
+ @if(settings.ssh && loginAccount.isDefined){
+
+ }
+
+
+ }
+}
+@if(settings.ssh && loginAccount.isDefined){
+
+}
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/wiki/pages.scala.html b/src/main/twirl/gitbucket/core/wiki/pages.scala.html
new file mode 100644
index 0000000..a8b5206
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/wiki/pages.scala.html
@@ -0,0 +1,26 @@
+@(pages: List[String],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import context._
+@import gitbucket.core.view.helpers._
+@html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){
+ @html.menu("wiki", repository){
+
+
+ @markdown(page.content, repository, true, false, false, false, pages)
+
+ -
+ @pages.map { page =>
+
- @page + } +
- @(activity.activityType match {
- case "open_issue" => detailActivity(activity, "activity-issue.png")
- case "comment_issue" => detailActivity(activity, "activity-comment.png")
- case "comment_commit" => detailActivity(activity, "activity-comment.png")
- case "close_issue" => detailActivity(activity, "activity-issue-close.png")
- case "reopen_issue" => detailActivity(activity, "activity-issue-reopen.png")
- case "open_pullreq" => detailActivity(activity, "activity-merge.png")
- case "merge_pullreq" => detailActivity(activity, "activity-merge.png")
- case "create_repository" => simpleActivity(activity, "activity-create-repository.png")
- case "create_branch" => simpleActivity(activity, "activity-branch.png")
- case "delete_branch" => simpleActivity(activity, "activity-delete.png")
- case "create_tag" => simpleActivity(activity, "activity-tag.png")
- case "delete_tag" => simpleActivity(activity, "activity-delete.png")
- case "fork" => simpleActivity(activity, "activity-fork.png")
- case "push" => customActivity(activity, "activity-commit.png"){
-
- }
- case "create_wiki" => customActivity(activity, "activity-wiki.png"){
-
- }
- case "edit_wiki" => customActivity(activity, "activity-wiki.png"){
- activity.additionalInfo.get.split(":") match {
- case Array(pageName, commitId) =>
-
- case Array(pageName) =>
-
- }
- }
- })
-
- }
-}
-
-@detailActivity(activity: model.Activity, image: String) = {
-
-
-}
-
-@customActivity(activity: model.Activity, image: String)(additionalInfo: Any) = {
- @helper.html.datetimeago(activity.activityDate)
-
- @avatar(activity.activityUserName, 16)
- @activityMessage(activity.message)
-
- @activity.additionalInfo.map { additionalInfo =>
-
- }
-
-
-}
-
-@simpleActivity(activity: model.Activity, image: String) = {
- @helper.html.datetimeago(activity.activityDate)
-
- @avatar(activity.activityUserName, 16)
- @activityMessage(activity.message)
-
- @additionalInfo
-
-
-}
-
diff --git a/src/main/twirl/helper/attached.scala.html b/src/main/twirl/helper/attached.scala.html
deleted file mode 100644
index e0fbc5e..0000000
--- a/src/main/twirl/helper/attached.scala.html
+++ /dev/null
@@ -1,33 +0,0 @@
-@(owner: String, repository: String)(textarea: Html)(implicit context: app.Context)
-@import context._
-
- @avatar(activity.activityUserName, 16)
- @activityMessage(activity.message)
- @helper.html.datetimeago(activity.activityDate)
-
-
- @textarea
-
-@defining("(id=\")([\\w\\-]*)(\")".r.findFirstMatchIn(textarea.body).map(_.group(2))){ textareaId =>
-
-}
diff --git a/src/main/twirl/helper/branchcontrol.scala.html b/src/main/twirl/helper/branchcontrol.scala.html
deleted file mode 100644
index 5381688..0000000
--- a/src/main/twirl/helper/branchcontrol.scala.html
+++ /dev/null
@@ -1,62 +0,0 @@
-@(branch: String = "",
- repository: service.RepositoryService.RepositoryInfo,
- hasWritePermission: Boolean)(body: Html)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@helper.html.dropdown(
- value = if(branch.length == 40) branch.substring(0, 10) else branch,
- prefix = if(branch.length == 40) "tree" else if(repository.branchList.contains(branch)) "branch" else "tree",
- mini = true
-) {
- Attach images by dragging & dropping, or selecting them.
-Switch branches
-
diff --git a/src/main/twirl/helper/copy.scala.html b/src/main/twirl/helper/copy.scala.html
deleted file mode 100644
index 7a09a52..0000000
--- a/src/main/twirl/helper/copy.scala.html
+++ /dev/null
@@ -1,55 +0,0 @@
-@(id: String, value: String)(html: Html)
-@avatar(comment.commentedUserName, 48)
-
-
-
- @user(comment.commentedUserName, styleClass="username strong")
-
- commented
- @if(comment.pullRequest){
- on this Pull Request
- }else{
- @if(comment.fileName.isDefined){
- on @comment.fileName.get
- }
- in @comment.commitId.substring(0, 7)
- }
- @helper.html.datetimeago(comment.registeredDate)
-
-
- @if(hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false)){
-
-
- }
-
-
-
- @markdown(comment.content, repository, false, true, true, hasWritePermission)
-
-
- @html
-
-
-
diff --git a/src/main/twirl/helper/datepicker.scala.html b/src/main/twirl/helper/datepicker.scala.html
deleted file mode 100644
index 0247315..0000000
--- a/src/main/twirl/helper/datepicker.scala.html
+++ /dev/null
@@ -1,11 +0,0 @@
-@(name: String, value: Option[java.util.Date])
-@import view.helpers
-
-
-
-
-
diff --git a/src/main/twirl/helper/datetimeago.scala.html b/src/main/twirl/helper/datetimeago.scala.html
deleted file mode 100644
index 3b68f34..0000000
--- a/src/main/twirl/helper/datetimeago.scala.html
+++ /dev/null
@@ -1,10 +0,0 @@
-@(latestUpdatedDate: java.util.Date,
- recentOnly: Boolean = true)
-@import view.helpers._
-
- @if(recentOnly){
- @datetimeAgoRecentOnly(latestUpdatedDate)
- }else{
- @datetimeAgo(latestUpdatedDate)
- }
-
diff --git a/src/main/twirl/helper/diff.scala.html b/src/main/twirl/helper/diff.scala.html
deleted file mode 100644
index 6c95cc5..0000000
--- a/src/main/twirl/helper/diff.scala.html
+++ /dev/null
@@ -1,251 +0,0 @@
-@(diffs: Seq[util.JGitUtil.DiffInfo],
- repository: service.RepositoryService.RepositoryInfo,
- newCommitId: Option[String],
- oldCommitId: Option[String],
- showIndex: Boolean,
- issueId: Option[Int],
- hasWritePermission: Boolean,
- showLineNotes: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@import org.eclipse.jgit.diff.DiffEntry.ChangeType
-@if(showIndex){
-
-
-
-}
-@diffs.zipWithIndex.map { case (diff, i) =>
-
-
-
- Showing @diffs.size changed @plural(diffs.size, "file")
-
-
-
-
- |
- @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
- @diff.oldPath -> @diff.newPath
- @if(newCommitId.isDefined){
-
- }
- }
- @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){
- @if(diff.changeType == ChangeType.ADD){
-
- }else{
-
- } @diff.newPath
- @if(newCommitId.isDefined){
-
- }
- }
- @if(diff.changeType == ChangeType.DELETE){
- @diff.oldPath
- @if(oldCommitId.isDefined){
-
- }
- }
- |
-
|---|
| - @if(diff.newContent != None || diff.oldContent != None){ - - - - } else { - Not supported - } - | -
-
-
-
diff --git a/src/main/twirl/helper/error.scala.html b/src/main/twirl/helper/error.scala.html
deleted file mode 100644
index 00f43e2..0000000
--- a/src/main/twirl/helper/error.scala.html
+++ /dev/null
@@ -1,7 +0,0 @@
-@(error: Option[Any])
-@if(error.isDefined){
-
-
- @error
-
-}
\ No newline at end of file
diff --git a/src/main/twirl/helper/feed.scala.xml b/src/main/twirl/helper/feed.scala.xml
deleted file mode 100644
index 7b1dd66..0000000
--- a/src/main/twirl/helper/feed.scala.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-@(activities: List[model.Activity])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-Where should we fork this repository?
- \ No newline at end of file diff --git a/src/main/twirl/helper/information.scala.html b/src/main/twirl/helper/information.scala.html deleted file mode 100644 index ff382a2..0000000 --- a/src/main/twirl/helper/information.scala.html +++ /dev/null @@ -1,7 +0,0 @@ -@(info: Option[Any]) -@if(info.isDefined){ -
-
- @info
-
-}
diff --git a/src/main/twirl/helper/paginator.scala.html b/src/main/twirl/helper/paginator.scala.html
deleted file mode 100644
index 0925004..0000000
--- a/src/main/twirl/helper/paginator.scala.html
+++ /dev/null
@@ -1,34 +0,0 @@
-@(page: Int, count: Int, limit: Int, width: Int, baseURL: String)
-@defining(view.Pagination(page, count, limit, width)){ p =>
- @if(p.count > p.limit){
-
-
-
- }
-}
diff --git a/src/main/twirl/helper/preview.scala.html b/src/main/twirl/helper/preview.scala.html
deleted file mode 100644
index 9a0f0bb..0000000
--- a/src/main/twirl/helper/preview.scala.html
+++ /dev/null
@@ -1,49 +0,0 @@
-@(repository: service.RepositoryService.RepositoryInfo, content: String, enableWikiLink: Boolean, enableRefsLink: Boolean, enableTaskList: Boolean, hasWritePermission: Boolean,
- style: String = "", placeholder: String = "Leave a comment", elastic: Boolean = false, uid: Long = new java.util.Date().getTime())(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
-
-
-
-
-
diff --git a/src/main/twirl/helper/repositoryicon.scala.html b/src/main/twirl/helper/repositoryicon.scala.html
deleted file mode 100644
index 95daa2d..0000000
--- a/src/main/twirl/helper/repositoryicon.scala.html
+++ /dev/null
@@ -1,12 +0,0 @@
-@(repository: service.RepositoryService.RepositoryInfo, large: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@if(repository.repository.isPrivate){
-
-
-
-
- @textarea = {
-
- }
- @if(enableWikiLink){
- @textarea
- } else {
- @helper.html.attached(repository.owner, repository.name)(textarea)
- }
-
-
-
-
-
-
-} else {
- @if(repository.repository.originUserName.isDefined){
-
- } else {
-
- }
-}
diff --git a/src/main/twirl/helper/uploadavatar.scala.html b/src/main/twirl/helper/uploadavatar.scala.html
deleted file mode 100644
index 06bc06e..0000000
--- a/src/main/twirl/helper/uploadavatar.scala.html
+++ /dev/null
@@ -1,51 +0,0 @@
-@(account: Option[model.Account])(implicit context: app.Context)
-@import context._
-
- @if(account.nonEmpty && account.get.image.nonEmpty){
-
- } else {
-
-@if(account.nonEmpty && account.get.image.nonEmpty){
-
-}
-
-@if(account.isEmpty || account.get.image.isEmpty){
-
-}
-
\ No newline at end of file
diff --git a/src/main/twirl/index.scala.html b/src/main/twirl/index.scala.html
deleted file mode 100644
index 816569f..0000000
--- a/src/main/twirl/index.scala.html
+++ /dev/null
@@ -1,80 +0,0 @@
-@(activities: List[model.Activity],
- recentRepositories: List[service.RepositoryService.RepositoryInfo],
- userRepositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@main("GitBucket"){
- @dashboard.html.tab()
- Upload Image
- }
-
-
-}
diff --git a/src/main/twirl/issues/commentform.scala.html b/src/main/twirl/issues/commentform.scala.html
deleted file mode 100644
index 04169c7..0000000
--- a/src/main/twirl/issues/commentform.scala.html
+++ /dev/null
@@ -1,31 +0,0 @@
-@(issue: model.Issue,
- reopenable: Boolean,
- hasWritePermission: Boolean,
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@if(loginAccount.isDefined){
-
-
-
-
-
-
-
-
- @helper.html.activities(activities)
-
-
- @settings.information.map { information =>
-
-
- }
-
-
-
-
-
- @Html(information)
-
- }
- @if(loginAccount.isEmpty){
- @signinform(settings)
- } else {
- |
-
- New repository
-
- Your repositories (@userRepositories.size)
- |
-
|---|
| No repositories | -
| - @helper.html.repositoryicon(repository, false) - @if(repository.owner == loginAccount.get.userName){ - @repository.name - } else { - @repository.owner/@repository.name - } - | -
| - Recent updated repositories - | -
|---|
| No repositories | -
| - @helper.html.repositoryicon(repository, false) - @repository.owner/@repository.name - | -
- -} - diff --git a/src/main/twirl/issues/commentlist.scala.html b/src/main/twirl/issues/commentlist.scala.html deleted file mode 100644 index d28c17c..0000000 --- a/src/main/twirl/issues/commentlist.scala.html +++ /dev/null @@ -1,263 +0,0 @@ -@(issue: Option[model.Issue], - comments: List[model.Comment], - hasWritePermission: Boolean, - repository: service.RepositoryService.RepositoryInfo, - pullreq: Option[model.PullRequest] = None)(implicit context: app.Context) -@import context._ -@import view.helpers._ -@if(issue.isDefined){ -
@avatar(issue.get.openedUserName, 48)
-
-
-}
-
-@comments.map {
- case comment: model.IssueComment => {
- @if(comment.action != "close" && comment.action != "reopen" && comment.action != "delete_branch"){
-
- @user(issue.get.openedUserName, styleClass="username strong") commented @helper.html.datetimeago(issue.get.registeredDate)
-
- @if(hasWritePermission || loginAccount.map(_.userName == issue.get.openedUserName).getOrElse(false)){
-
- }
-
-
-
- @markdown(issue.get.content getOrElse "No description provided.", repository, false, true, true, hasWritePermission)
-
- @avatar(comment.commentedUserName, 48)
-
-
- }
- @if(comment.action == "merge"){
-
- @user(comment.commentedUserName, styleClass="username strong")
-
- @if(comment.action == "comment"){
- commented
- } else {
- @if(pullreq.isEmpty){ referenced the issue } else { referenced the pull request }
- }
- @helper.html.datetimeago(comment.registeredDate)
-
-
- @if(comment.action != "commit" && comment.action != "merge" && comment.action != "refer"
- && (hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
-
-
- }
-
-
-
- @if(comment.action == "commit" && comment.content.split(" ").last.matches("[a-f0-9]{40}")){
- @defining(comment.content.substring(comment.content.length - 40)){ id =>
-
- @markdown(comment.content.substring(0, comment.content.length - 41), repository, false, true, true, hasWritePermission)
- }
- } else {
- @if(comment.action == "refer"){
- @defining(comment.content.split(":")){ case Array(issueId, rest @ _*) =>
- Issue #@issueId: @rest.mkString(":")
- }
- } else {
- @markdown(comment.content, repository, false, true, true, hasWritePermission)
- }
- }
-
-
- Merged
- @avatar(comment.commentedUserName, 20)
- @user(comment.commentedUserName, styleClass="username strong") merged commit
- }
- @if(comment.action == "close" || comment.action == "close_comment"){
- @pullreq.map(_.commitIdTo.substring(0, 7)) into
- @if(pullreq.get.requestUserName == repository.owner){
- @pullreq.map(_.branch) from @pullreq.map(_.requestBranch)
- } else {
- @pullreq.map(_.userName):@pullreq.map(_.branch) from @pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch)
- }
- @helper.html.datetimeago(comment.registeredDate)
-
- Closed
- @avatar(comment.commentedUserName, 20)
- @if(issue.isDefined && issue.get.isPullRequest){
- @user(comment.commentedUserName, styleClass="username strong") closed the pull request @helper.html.datetimeago(comment.registeredDate)
- } else {
- @user(comment.commentedUserName, styleClass="username strong") closed the issue @helper.html.datetimeago(comment.registeredDate)
- }
-
- }
- @if(comment.action == "reopen" || comment.action == "reopen_comment"){
-
- Reopened
- @avatar(comment.commentedUserName, 20)
- @user(comment.commentedUserName, styleClass="username strong") reopened the issue @helper.html.datetimeago(comment.registeredDate)
-
- }
- @if(comment.action == "delete_branch"){
-
- Deleted
- @avatar(comment.commentedUserName, 20)
- @user(comment.commentedUserName, styleClass="username strong") deleted the @pullreq.map(_.requestBranch) branch @helper.html.datetimeago(comment.registeredDate)
-
- }
- }
- case comment: model.CommitComment => {
- @helper.html.commitcomment(comment, hasWritePermission, repository, pullreq.map(_.commitIdTo))
- }
-}
-
diff --git a/src/main/twirl/issues/commitstatus.scala.html b/src/main/twirl/issues/commitstatus.scala.html
deleted file mode 100644
index 542b3f3..0000000
--- a/src/main/twirl/issues/commitstatus.scala.html
+++ /dev/null
@@ -1,19 +0,0 @@
-@(issue: model.Issue, statusInfo: Option[service.IssuesService.CommitStatusInfo])(implicit context: app.Context)
-@import view.helpers._
-@statusInfo.map{ status =>
- @if(status.count==1 && status.state.isDefined){
- @if(status.targetUrl.isDefined){
- @commitStateIcon(status.state.get)
- }else{
- @commitStateIcon(status.state.get)
- }
- }else{
- @defining(status.count==status.successCount){ isSuccess =>
- @if(isSuccess){
- ✔
- }else{
- ×
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html
deleted file mode 100644
index 4062651..0000000
--- a/src/main/twirl/issues/create.scala.html
+++ /dev/null
@@ -1,148 +0,0 @@
-@(collaborators: List[String],
- milestones: List[model.Milestone],
- labels: List[model.Label],
- hasWritePermission: Boolean,
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){
- @html.menu("issues", repository){
- @navigation("issues", false, repository)
- - - } -} - diff --git a/src/main/twirl/issues/editcomment.scala.html b/src/main/twirl/issues/editcomment.scala.html deleted file mode 100644 index 2353de4..0000000 --- a/src/main/twirl/issues/editcomment.scala.html +++ /dev/null @@ -1,42 +0,0 @@ -@(content: String, commentId: Int, owner: String, repository: String)(implicit context: app.Context) -@import context._ - -@helper.html.attached(owner, repository){ - -} -
-
-
-
-
diff --git a/src/main/twirl/issues/editissue.scala.html b/src/main/twirl/issues/editissue.scala.html
deleted file mode 100644
index 8ce1354..0000000
--- a/src/main/twirl/issues/editissue.scala.html
+++ /dev/null
@@ -1,38 +0,0 @@
-@(content: Option[String], issueId: Int, owner: String, repository: String)(implicit context: app.Context)
-@import context._
-@helper.html.attached(owner, repository){
-
-}
-
-
-
-
-
diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
deleted file mode 100644
index ba17a12..0000000
--- a/src/main/twirl/issues/issue.scala.html
+++ /dev/null
@@ -1,92 +0,0 @@
-@(issue: model.Issue,
- comments: List[model.IssueComment],
- issueLabels: List[model.Label],
- collaborators: List[String],
- milestones: List[(model.Milestone, Int, Int)],
- labels: List[model.Label],
- hasWritePermission: Boolean,
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
- @html.menu("issues", repository){
-
-
- @if(issue.closed) {
- Closed
- } else {
- Open
- }
-
- @user(issue.openedUserName, styleClass="username strong") opened this issue @helper.html.datetimeago(issue.registeredDate) - @defining(
- comments.count( _.action.contains("comment") )
- ){ count =>
- @count @plural(count, "comment")
- }
-
-
- @if(hasWritePermission || loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){
- Edit
- }
- New issue
-
-
- - - @issue.title - #@issue.issueId - - -
--
-
-
- }
-}
-
diff --git a/src/main/twirl/issues/issueinfo.scala.html b/src/main/twirl/issues/issueinfo.scala.html
deleted file mode 100644
index 0b1c5df..0000000
--- a/src/main/twirl/issues/issueinfo.scala.html
+++ /dev/null
@@ -1,173 +0,0 @@
-@(issue: model.Issue,
- comments: List[model.Comment],
- issueLabels: List[model.Label],
- collaborators: List[String],
- milestones: List[(model.Milestone, Int, Int)],
- labels: List[model.Label],
- hasWritePermission: Boolean,
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import view.helpers._
-
- @commentlist(Some(issue), comments, hasWritePermission, repository)
- @commentform(issue, true, hasWritePermission, repository)
-
-
- @issueinfo(issue, comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
-
-
- Labels
- @if(hasWritePermission){
-
-
- @helper.html.dropdown(right = true) {
- @labels.map { label =>
-
-
- @helper.html.checkicon(issueLabels.exists(_.labelId == label.labelId))
-
- @label.labelName
-
-
- }
- }
-
- }
--
- @labellist(issueLabels)
-
-
- Milestone
- @if(hasWritePermission){
-
-
- @helper.html.dropdown(right = true) {
- Clear this milestone
- @milestones.filter(_._1.closedDate.isEmpty).map { case (milestone, _, _) =>
-
-
- @helper.html.checkicon(Some(milestone.milestoneId) == issue.milestoneId) @milestone.title
-
- }
- }
-
- }
-
- @milestone.dueDate.map { dueDate =>
- @if(isPast(dueDate)){
- Due by @date(dueDate)
- } else {
- Due by @date(dueDate)
- }
- }.getOrElse {
- No due date
- }
-
-
- Due by @date(dueDate)
- } else {
- Due by @date(dueDate)
- }
- }.getOrElse {
- No due date
- }
-
- @issue.milestoneId.map { milestoneId =>
- @milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) =>
- @issues.milestones.html.progress(openCount + closeCount, closeCount)
- }
- }
-
-
- @issue.milestoneId.map { milestoneId =>
- @milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) =>
- @milestone.title
- }
- }.getOrElse {
- No milestone
- }
-
--
- Assignee
- @if(hasWritePermission){
-
-
- @issue.assignedUserName.map { userName =>
- @avatar(userName, 20) @user(userName, styleClass="username strong small")
- }.getOrElse{
- No one
- }
-
-
- @helper.html.dropdown(right = true) {
- Clear assignee
- @collaborators.map { collaborator =>
-
-
- @helper.html.checkicon(Some(collaborator) == issue.assignedUserName)@avatar(collaborator, 20) @collaborator
-
-
- }
- }
-
- }
--
- @defining((issue.openedUserName :: comments.map(_.commentedUserName)).distinct){ participants =>
-
-
diff --git a/src/main/twirl/issues/labellist.scala.html b/src/main/twirl/issues/labellist.scala.html
deleted file mode 100644
index ded3112..0000000
--- a/src/main/twirl/issues/labellist.scala.html
+++ /dev/null
@@ -1,7 +0,0 @@
-@(issueLabels: List[model.Label])
-@if(issueLabels.isEmpty){
- @participants.size @plural(participants.size, "participant")
- @participants.map { participant => @avatarLink(participant, 20, tooltip = true) }
- }
-
-
-
-
-}
diff --git a/src/main/twirl/issues/labels/label.scala.html b/src/main/twirl/issues/labels/label.scala.html
deleted file mode 100644
index 3b0e60b..0000000
--- a/src/main/twirl/issues/labels/label.scala.html
+++ /dev/null
@@ -1,36 +0,0 @@
-@(label: model.Label,
- counts: Map[String, Int],
- repository: service.RepositoryService.RepositoryInfo,
- hasWritePermission: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
-
-
-
-
-
-
- @if(hasWritePermission){
-
- }
-
- @counts.get(label.labelName).getOrElse(0) open issues
-
- - -
| - @labels.size labels - | -
|---|
| - No labels to show. - @if(hasWritePermission){ - Create a new label. - } - | -
-@if(condition.nonEmpty){ - -} -
|
-
-
-
-
- @openCount Open
-
-
-
- @closedCount Closed
-
-
-
- @helper.html.dropdown("Author", flat = true) {
- @collaborators.map { collaborator =>
-
- @if(hasWritePermission){
-
- @helper.html.dropdown("Mark as", flat = true) {
-
- }
- |
-
|---|
| - @if(target == "issues"){ - No issues to show. - } else { - No pull requests to show. - } - @if(condition.labels.nonEmpty || condition.milestone.isDefined){ - Clear active filters. - } else { - @if(repository.isDefined){ - @if(target == "issues"){ - Create a new issue. - } else { - Create a new pull request. - } - } - } - | -
|
- @if(hasWritePermission){
-
- }
-
- @if(repository.isEmpty){
- @issue.repositoryName ･
- }
- @if(target == "issues"){
- @issue.title
- } else {
- @issue.title
- }
- @commitstatus(issue, commitStatus)
- @labels.map { label =>
- @label.labelName
- }
-
- @issue.assignedUserName.map { userName =>
- @avatar(userName, 20, tooltip = true)
- }
- @if(commentCount > 0){
-
- @commentCount
-
- } else {
-
- @commentCount
-
- }
-
-
- #@issue.issueId opened @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username")
- @milestone.map { milestone =>
-
- @milestone
- }
- |
-
- @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 10, condition.toURL)
-
-
diff --git a/src/main/twirl/issues/milestones/edit.scala.html b/src/main/twirl/issues/milestones/edit.scala.html
deleted file mode 100644
index f876cf4..0000000
--- a/src/main/twirl/issues/milestones/edit.scala.html
+++ /dev/null
@@ -1,46 +0,0 @@
-@(milestone: Option[model.Milestone], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"Milestones - ${repository.owner}/${repository.name}"){
- @html.menu("issues", repository){
- @if(milestone.isEmpty){
- New milestone
-Create a new milestone to help organize your issues and pull requests.
- } else {
- @issues.html.navigation("milestones", false, repository)
- - } -
- - } -} diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html deleted file mode 100644 index 17476d1..0000000 --- a/src/main/twirl/issues/milestones/list.scala.html +++ /dev/null @@ -1,105 +0,0 @@ -@(state: String, - milestones: List[(model.Milestone, Int, Int)], - repository: service.RepositoryService.RepositoryInfo, - hasWritePermission: Boolean)(implicit context: app.Context) -@import context._ -@import view.helpers._ -@html.main(s"Milestones - ${repository.owner}/${repository.name}"){ - @html.menu("issues", repository){ - @issues.html.navigation("milestones", hasWritePermission, repository) -
-
|
-
-
-
- @milestones.count(_._1.closedDate.isEmpty) Open
-
-
-
- @milestones.count(_._1.closedDate.isDefined) Closed
-
-
- |
-
|---|
|
-
-
- @if(milestone.description.isDefined){
-
- @milestone.title
-
-
- @if(milestone.closedDate.isDefined){
- Closed @helper.html.datetimeago(milestone.closedDate.get)
- } else {
- @milestone.dueDate.map { dueDate =>
- @if(isPast(dueDate)){
-
- Due by @date(dueDate)
- } else {
- Due by @date(dueDate)
- }
- }.getOrElse {
- No due date
- }
- }
-
- @progress(openCount + closedCount, closedCount)
-
-
-
-
- @if(closedCount == 0){
- 0%
- } else {
- @((closedCount.toDouble / (openCount + closedCount).toDouble * 100).toInt)%
- } complete
- @openCount open
- @closedCount closed
-
-
-
- @markdown(milestone.description.get, repository, false, false)
-
- }
- |
-
| - No milestones to show. - @if(hasWritePermission){ - Create a new milestone. - } - | -
- @if(progress > 0){
-
- }
-
diff --git a/src/main/twirl/issues/navigation.scala.html b/src/main/twirl/issues/navigation.scala.html
deleted file mode 100644
index 9c1ee8c..0000000
--- a/src/main/twirl/issues/navigation.scala.html
+++ /dev/null
@@ -1,58 +0,0 @@
-@(active: String,
- newButton: Boolean,
- repository: service.RepositoryService.RepositoryInfo,
- condition: Option[service.IssuesService.IssueSearchCondition] = None)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
diff --git a/src/main/twirl/main.scala.html b/src/main/twirl/main.scala.html
deleted file mode 100644
index 6d35ff1..0000000
--- a/src/main/twirl/main.scala.html
+++ /dev/null
@@ -1,91 +0,0 @@
-@(title: String, repository: Option[service.RepositoryService.RepositoryInfo] = None)(body: Html)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
-
-
-
-
- } else {
-
-
- }
- @if(expand){ @label}
- @if(expand && count > 0){
- @count
- }
-
-
- @helper.html.information(info)
- @helper.html.error(error)
- @if(repository.commitCount > 0){
-
-
-
- }
-
- @if(loginAccount.isEmpty){
- Fork
- } else {
- @if(isNoGroup) {
- Fork
- } else {
- Fork
- }
- }
- @repository.forkedCount
-
-
- @helper.html.repositoryicon(repository, true)
- @repository.owner / @repository.name
-
- @defining(repository.repository){ x =>
- @if(repository.repository.originRepositoryName.isDefined){
-
-
- forked from @x.parentUserName/@x.parentRepositoryName
-
- }
- }
- -
-
-
diff --git a/src/main/twirl/pulls/commits.scala.html b/src/main/twirl/pulls/commits.scala.html
deleted file mode 100644
index 2d729b5..0000000
--- a/src/main/twirl/pulls/commits.scala.html
+++ /dev/null
@@ -1,34 +0,0 @@
-@(commits: Seq[Seq[util.JGitUtil.CommitInfo]],
- comments: Option[List[model.Comment]] = None,
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
-
- @if(expand){
-
-
- HTTP clone URL
-
- @helper.html.copy("repository-url-copy", repository.httpUrl){
-
- }
- @if(settings.ssh && loginAccount.isDefined){
-
- }
- @id.map { id =>
-
- Download ZIP
-
-
- Download TAR.GZ
-
- }
- }
-
- @if(expand){
- @repository.repository.description.map { description =>
-
-@description
- } - - } - @body -
-
- @commits.map { day =>
-
-
diff --git a/src/main/twirl/pulls/compare.scala.html b/src/main/twirl/pulls/compare.scala.html
deleted file mode 100644
index b606715..0000000
--- a/src/main/twirl/pulls/compare.scala.html
+++ /dev/null
@@ -1,155 +0,0 @@
-@(commits: Seq[Seq[util.JGitUtil.CommitInfo]],
- diffs: Seq[util.JGitUtil.DiffInfo],
- members: List[(String, String)],
- comments: List[model.Comment],
- originId: String,
- forkedId: String,
- sourceId: String,
- commitId: String,
- repository: service.RepositoryService.RepositoryInfo,
- originRepository: service.RepositoryService.RepositoryInfo,
- forkedRepository: service.RepositoryService.RepositoryInfo,
- hasWritePermission: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){
- @html.menu("pulls", repository){
- | @date(day.head.commitTime) | -|||
|---|---|---|---|
| - @avatar(commit, 20) - @user(commit.authorName, commit.authorEmailAddress, "username") - | -@commit.shortMessage | -- @if(comments.isDefined){ - @comments.get.flatMap @{ - case comment: model.CommitComment => Some(comment) - case other => None - }.count(t => t.commitId == commit.id && !t.pullRequest) - } - | -- @commit.id.substring(0, 7) - | -
-
-
-
- @if(commits.nonEmpty && hasWritePermission){
-
-
- }
- @if(commits.isEmpty){
-
- There isn't anything to compare.- @originRepository.owner:@originId and @forkedRepository.owner:@forkedId are identical. - |
-
Showing you all comments on commits in this comparison.
- @issues.html.commentlist(None, comments, hasWritePermission, repository, None) - } - } -} - diff --git a/src/main/twirl/pulls/conversation.scala.html b/src/main/twirl/pulls/conversation.scala.html deleted file mode 100644 index 82a8982..0000000 --- a/src/main/twirl/pulls/conversation.scala.html +++ /dev/null @@ -1,67 +0,0 @@ -@(issue: model.Issue, - pullreq: model.PullRequest, - comments: List[model.Comment], - issueLabels: List[model.Label], - collaborators: List[String], - milestones: List[(model.Milestone, Int, Int)], - labels: List[model.Label], - hasWritePermission: Boolean, - repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) -@import context._ -@import model.{IssueComment, CommitState} -@import view.helpers._ -
-
-
\ No newline at end of file
diff --git a/src/main/twirl/pulls/mergecheck.scala.html b/src/main/twirl/pulls/mergecheck.scala.html
deleted file mode 100644
index dcc5af8..0000000
--- a/src/main/twirl/pulls/mergecheck.scala.html
+++ /dev/null
@@ -1,9 +0,0 @@
-@(hasConflict: Boolean)
-@if(hasConflict){
-
-
-
- @issues.html.commentlist(Some(issue), comments, hasWritePermission, repository, Some(pullreq))
-
- @defining(comments.flatMap {
- case comment: IssueComment => Some(comment)
- case other => None
- }.exists(_.action == "merge")){ merged =>
- @if(hasWritePermission && !issue.closed){
-
- }
- @if(hasWritePermission && issue.closed && pullreq.userName == pullreq.requestUserName && merged &&
- pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){
-
-
- }
- @issues.html.commentform(issue, !merged, hasWritePermission, repository)
- }
-
- Delete branch
-
-
- Pull request successfully merged and closed
-
- You're all set-the @pullreq.requestBranch branch can be safely deleted.
-
- @issues.html.issueinfo(issue, comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
-
-We can’t automatically merge these branches
-Don't worry, you can still submit the pull request.
-} else { -Able to merge
-These branches can be automatically merged.
-} - diff --git a/src/main/twirl/pulls/mergeguide.scala.html b/src/main/twirl/pulls/mergeguide.scala.html deleted file mode 100644 index 21733ad..0000000 --- a/src/main/twirl/pulls/mergeguide.scala.html +++ /dev/null @@ -1,154 +0,0 @@ -@(hasConflict: Boolean, - hasProblem: Boolean, - issue: model.Issue, - pullreq: model.PullRequest, - statuses: List[model.CommitStatus], - repository: service.RepositoryService.RepositoryInfo, - requestRepositoryUrl: String)(implicit context: app.Context) -@import context._ -@import view.helpers._ -@import model.CommitState -
-
-
-
\ No newline at end of file
diff --git a/src/main/twirl/pulls/pullreq.scala.html b/src/main/twirl/pulls/pullreq.scala.html
deleted file mode 100644
index f6c3abf..0000000
--- a/src/main/twirl/pulls/pullreq.scala.html
+++ /dev/null
@@ -1,124 +0,0 @@
-@(issue: model.Issue,
- pullreq: model.PullRequest,
- comments: List[model.Comment],
- issueLabels: List[model.Label],
- collaborators: List[String],
- milestones: List[(model.Milestone, Int, Int)],
- labels: List[model.Label],
- dayByDayCommits: Seq[Seq[util.JGitUtil.CommitInfo]],
- diffs: Seq[util.JGitUtil.DiffInfo],
- hasWritePermission: Boolean,
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"${issue.title} - Pull Request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
- @html.menu("pulls", repository){
- @defining(dayByDayCommits.flatten){ commits =>
-
-
-
- @if(!statuses.isEmpty){
-
-
-
- @if(statuses.size==1){
- @defining(statuses.head){ status =>
-
- }
-
-
- @status.targetUrl.map{ url => Details }
-
- @commitStateText(status.state, pullreq.commitIdTo)
- @status.description.map{ desc => — @desc }
-
- }
- }else{
- @defining(statuses.groupBy(_.state)){ stateMap => @defining(CommitState.combine(stateMap.keySet)){ state =>
-
-
- } }
- }
-
-
-
-
- @if(hasConflict){
- We can’t automatically merge this pull request.
- } else{ @if(hasProblem){
- Merge with caution!
- } else {
- This pull request can be automatically merged.
- } }
-
-
- @if(hasConflict){
- Use the command line to resolve conflicts before continuing.
- } else {
- You can also merge branches on the command line.
- }
-
-
-
-
-
- @if(issue.closed) {
- @comments.flatMap @{
- case comment: model.IssueComment => Some(comment)
- case _ => None
- }.find(_.action == "merge").map{ comment =>
- Merged
-
- @user(comment.commentedUserName, styleClass="username strong") merged @commits.size @plural(commits.size, "commit")
- into
- @if(hasWritePermission || loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){
- Edit
- }
- New issue
-
-
- - - @issue.title - #@issue.issueId - - -
-@pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch
- @helper.html.datetimeago(comment.registeredDate)
-
- }.getOrElse {
- Closed
-
- @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
- into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch
-
- }
- } else {
- Open
-
- @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
- into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch
-
- }
- - -
-
- }
- }
-}
-
\ No newline at end of file
diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html
deleted file mode 100644
index 549d2e8..0000000
--- a/src/main/twirl/repo/blob.scala.html
+++ /dev/null
@@ -1,134 +0,0 @@
-@(branch: String,
- repository: service.RepositoryService.RepositoryInfo,
- pathList: List[String],
- content: util.JGitUtil.ContentInfo,
- latestCommit: util.JGitUtil.CommitInfo,
- hasWritePermission: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
- @html.menu("code", repository){
-
- @pulls.html.conversation(issue, pullreq, comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
-
-
- @pulls.html.commits(dayByDayCommits, Some(comments), repository)
-
-
- @helper.html.diff(diffs, repository, Some(commits.head.id), Some(commits.last.id), true, Some(pullreq.issueId), hasWritePermission, true)
-
-
- @helper.html.branchcontrol(
- branch,
- repository,
- hasWritePermission
- ){
- @repository.branchList.map { x =>
- @helper.html.checkicon(x == branch) @x
- }
- }
- @repository.name /
- @pathList.zipWithIndex.map { case (section, i) =>
- @if(i == pathList.length - 1){
- @section
- } else {
- @section /
- }
- }
-
-
- |
-
- @avatar(latestCommit, 20)
- @user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
- @helper.html.datetimeago(latestCommit.commitTime)
-
-
-
- |
-
|---|
|
- @if(content.viewType == "text"){
- @defining(pathList.reverse.head) { file =>
- @if(renderableSuffixes.find(suffix => file.toLowerCase.endsWith(suffix))) {
-
- @renderMarkup(pathList, content.content.get, branch, repository, false, false)
-
- } else {
- @content.content.get- } - } - } - @if(content.viewType == "image"){ - |
-
Branches
-| All branches | -
|---|
|
-
- @branch.mergeInfo.map{ info =>
- @prs.map{ case (pull, issue) =>
- #@issue.issueId
- @if(issue.closed) {
- @if(info.isMerged){
- Merged
- }else{
- Closed
- }
- } else {
- Open
- }
- }.getOrElse{
- @if(context.loginAccount.isDefined){
- New Pull Request
- }else{
- Compare
- }
- }
- @if(hasWritePermission){
- @if(prs.map(!_._2.closed).getOrElse(false)){
-
- }else{
-
- }
- }
- }
-
-
- @branch.name
-
-
-
- @if(branch.mergeInfo.isEmpty){
- Default
- }else{
- @branch.mergeInfo.map{ info =>
-
- }
- }
-
-
-
-
- |
} - - -} diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html deleted file mode 100644 index 49338c1..0000000 --- a/src/main/twirl/repo/commit.scala.html +++ /dev/null @@ -1,154 +0,0 @@ -@(commitId: String, - commit: util.JGitUtil.CommitInfo, - branches: List[String], - tags: List[String], - comments: List[model.Comment], - repository: service.RepositoryService.RepositoryInfo, - diffs: Seq[util.JGitUtil.DiffInfo], - oldCommitId: Option[String], - hasWritePermission: Boolean)(implicit context: app.Context) -@import context._ -@import view.helpers._ -@import util.Implicits._ -@html.main(commit.shortMessage, Some(repository)){ - @html.menu("code", repository){ -
|
-
- Browse code
-
- @link(commit.summary, repository)
- @if(commit.description.isDefined){
- @link(commit.description.get, repository)- } - - |
-
|---|
|
-
-
-
-
-
- @if(commit.parents.size == 0){
- 0 parent
- }
- @if(commit.parents.size == 1){
- 1 parent
- @commit.parents(0).substring(0, 7)
- }
- commit @commit.id
-
- @if(commit.parents.size > 1){
-
- @commit.parents.size parents
- @commit.parents.map { parent =>
- @parent.substring(0, 7)
- }.mkHtml(" + ")
-
-
- }
- |
-
- @issues.html.commentlist(None, comments, hasWritePermission, repository, None)
-
- @commentform(commitId = commitId, hasWritePermission = hasWritePermission, repository = repository)
- }
-}
-
-
diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html
deleted file mode 100644
index 443ab07..0000000
--- a/src/main/twirl/repo/commits.scala.html
+++ /dev/null
@@ -1,81 +0,0 @@
-@(pathList: List[String],
- branch: String,
- repository: service.RepositoryService.RepositoryInfo,
- commits: Seq[Seq[util.JGitUtil.CommitInfo]],
- page: Int,
- hasNext: Boolean,
- hasWritePermission: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
- @html.menu("code", repository){
-
- @helper.html.branchcontrol(
- branch,
- repository,
- hasWritePermission
- ){
- @repository.branchList.map { x =>
- @helper.html.checkicon(x == branch) @x
- }
- }
- @if(pathList.isEmpty){
- @repository.name / Commit History
- }
- @if(pathList.nonEmpty){
- History for
- @repository.name /
- @pathList.zipWithIndex.map { case (section, i) =>
- @if(i == pathList.length - 1){
- @section
- } else {
- @section /
- }
- }
- }
-
- @commits.map { day =>
- | @date(day.head.commitTime) | -
|---|
|
-
-
-
- @avatar(commit, 40)
-
- |
-
-
-
-
- }
-}
diff --git a/src/main/twirl/repo/delete.scala.html b/src/main/twirl/repo/delete.scala.html
deleted file mode 100644
index 7d589f3..0000000
--- a/src/main/twirl/repo/delete.scala.html
+++ /dev/null
@@ -1,61 +0,0 @@
-@(branch: String,
- repository: service.RepositoryService.RepositoryInfo,
- pathList: List[String],
- fileName: String,
- content: util.JGitUtil.ContentInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"Deleting ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) {
- @html.menu("code", repository){
-
- }
-}
-
-
-
-
\ No newline at end of file
diff --git a/src/main/twirl/repo/editcomment.scala.html b/src/main/twirl/repo/editcomment.scala.html
deleted file mode 100644
index d62e490..0000000
--- a/src/main/twirl/repo/editcomment.scala.html
+++ /dev/null
@@ -1,45 +0,0 @@
-@(content: String, commentId: Int, owner: String, repository: String)(implicit context: app.Context)
-@import context._
-
-@helper.html.attached(owner, repository){
-
-}
-
-
-
-
-
diff --git a/src/main/twirl/repo/editor.scala.html b/src/main/twirl/repo/editor.scala.html
deleted file mode 100644
index 606bc93..0000000
--- a/src/main/twirl/repo/editor.scala.html
+++ /dev/null
@@ -1,147 +0,0 @@
-@(branch: String,
- repository: service.RepositoryService.RepositoryInfo,
- pathList: List[String],
- fileName: Option[String],
- content: util.JGitUtil.ContentInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(if(fileName.isEmpty) "New File" else s"Editing ${fileName.get} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) {
- @html.menu("code", repository){
-
- }
-}
-
-
-
-
-
diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html
deleted file mode 100644
index f8ff085..0000000
--- a/src/main/twirl/repo/files.scala.html
+++ /dev/null
@@ -1,123 +0,0 @@
-@(branch: String,
- repository: service.RepositoryService.RepositoryInfo,
- pathList: List[String],
- groupNames: List[String],
- latestCommit: util.JGitUtil.CommitInfo,
- files: List[util.JGitUtil.FileInfo],
- readme: Option[(List[String], String)],
- hasWritePermission: Boolean,
- info: Option[Any] = None,
- error: Option[Any] = None)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
- @html.menu("code", repository, Some(branch), pathList.isEmpty, groupNames.isEmpty, info, error){
-
- @helper.html.branchcontrol(
- branch,
- repository,
- hasWritePermission
- ){
- @repository.branchList.map { x =>
- @helper.html.checkicon(x == branch) @x
- }
- }
- @repository.name /
- @pathList.zipWithIndex.map { case (section, i) =>
- @section /
- }
- @if(hasWritePermission){
-
- }
-
-
- }
- | - - @if(latestCommit.description.isDefined){ - ... - - } - | -|||
|---|---|---|---|
| - - | -|||
| - | .. | -- | - |
|
- @if(file.isDirectory){
- @if(file.linkUrl.isDefined){
-
- } else {
-
- }
- } else {
-
- }
- |
- - @if(file.isDirectory){ - @if(file.linkUrl.isDefined){ - - @file.name.split("/").toList.init match { - case Nil => {} - case list => {@list.mkString("", "/", "/")} - }@file.name.split("/").toList.last - - } else { - - @file.name.split("/").toList.init match { - case Nil => {} - case list => {@list.mkString("", "/", "/")} - }@file.name.split("/").toList.last - - } - } else { - @file.name - } - | -- - [@user(file.author, file.mailAddress)] - | -@helper.html.datetimeago(file.time, false) | -
-
- }
- }
-}
diff --git a/src/main/twirl/repo/forked.scala.html b/src/main/twirl/repo/forked.scala.html
deleted file mode 100644
index 0e5b4fe..0000000
--- a/src/main/twirl/repo/forked.scala.html
+++ /dev/null
@@ -1,35 +0,0 @@
-@(originRepository: Option[service.RepositoryService.RepositoryInfo],
- members: List[(String, String)],
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
- @html.menu("network", repository){
-
- @filePath.reverse.head
- @renderMarkup(filePath, content, branch, repository, false, false)
- Members of the @repository.name Network
-
- @if(originRepository.isDefined){
- @avatar(originRepository.get.owner, 20)
-
- @originRepository.get.owner / @originRepository.get.name
-
- } else {
- @avatar(repository.repository.originUserName.get, 20)
-
- @repository.repository.originUserName / @repository.repository.originRepositoryName
-
- }
- (origin)
-
- @members.map { case (owner, name) =>
-
- }
- }
-}
diff --git a/src/main/twirl/repo/guide.scala.html b/src/main/twirl/repo/guide.scala.html
deleted file mode 100644
index 4040097..0000000
--- a/src/main/twirl/repo/guide.scala.html
+++ /dev/null
@@ -1,42 +0,0 @@
-@(repository: service.RepositoryService.RepositoryInfo,
- hasWritePermission: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
- @html.menu("code", repository){
- @if(!hasWritePermission){
- This is an empty repository
- } else { -Quick setup — if you've done this kind of thing before
- -Create a new repository on the command line
- @pre { - touch README.md - git init - git add README.md - git commit -m "first commit" - git remote add origin @repository.httpUrl - git push -u origin master - } -Push an existing repository from the command line
- @pre { - git remote add origin @repository.httpUrl - git push -u origin master - } - - } - } -} \ No newline at end of file diff --git a/src/main/twirl/repo/tags.scala.html b/src/main/twirl/repo/tags.scala.html deleted file mode 100644 index cd611fb..0000000 --- a/src/main/twirl/repo/tags.scala.html +++ /dev/null @@ -1,27 +0,0 @@ -@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) -@import context._ -@import view.helpers._ -@html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.menu("code", repository){ -Tags
-| Tag | -Date | -Commit | -Download | -
|---|---|---|---|
| @tag.name | -@helper.html.datetimeago(tag.time, false) | -@tag.id.substring(0, 10) | -- ZIP - TAR.GZ - | -
We couldn't find any code matching '@query'
- } else { -We've found @files.size code @plural(files.size, "result")
- } - @files.drop((page - 1) * CodeLimit).take(CodeLimit).map { file => -
-
- }
- @helper.html.paginator(page, files.size, CodeLimit, 10,
- s"${url(repository)}/search?q=${urlEncode(query)}&type=code")
- }
-}
\ No newline at end of file
diff --git a/src/main/twirl/search/issues.scala.html b/src/main/twirl/search/issues.scala.html
deleted file mode 100644
index dcbc2a2..0000000
--- a/src/main/twirl/search/issues.scala.html
+++ /dev/null
@@ -1,35 +0,0 @@
-@(issues: List[service.RepositorySearchService.IssueSearchResult],
- fileCount: Int,
- query: String,
- page: Int,
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@import service.RepositorySearchService._
-@html.main("Search Results", Some(repository)){
- @menu("issue", fileCount, issues.size, query, repository){
- @if(issues.isEmpty){
- @file.path
-Last committed @helper.html.datetimeago(file.lastModified)
- @Html(file.highlightText)-
We couldn't find any code matching '@query'
- } else { -We've found @issues.size code @plural(issues.size, "result")
- } - @issues.drop((page - 1) * IssueLimit).take(IssueLimit).map { issue => -
-
- }
- @helper.html.paginator(page, issues.size, IssueLimit, 10,
- s"${url(repository)}/search?q=${urlEncode(query)}&type=issue")
- }
-}
\ No newline at end of file
diff --git a/src/main/twirl/search/menu.scala.html b/src/main/twirl/search/menu.scala.html
deleted file mode 100644
index c66b6ab..0000000
--- a/src/main/twirl/search/menu.scala.html
+++ /dev/null
@@ -1,38 +0,0 @@
-@(active: String, fileCount: Int, issueCount: Int, query: String,
- repository: service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.menu("", repository){
- #@issue.issueId
- @issue.title
- @if(issue.highlightText.nonEmpty){ -@Html(issue.highlightText)- } -
- Opened by @issue.openedUserName
- @helper.html.datetimeago(issue.registeredDate)
- @if(issue.commentCount > 0){
- @issue.commentCount @plural(issue.commentCount, "comment")
- }
-
-
-
-}
\ No newline at end of file
diff --git a/src/main/twirl/settings/collaborators.scala.html b/src/main/twirl/settings/collaborators.scala.html
deleted file mode 100644
index e225153..0000000
--- a/src/main/twirl/settings/collaborators.scala.html
+++ /dev/null
@@ -1,35 +0,0 @@
-@(collaborators: List[String],
- isGroupRepository: Boolean,
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Settings", Some(repository)){
- @html.menu("settings", repository){
- @menu("collaborators", repository){
-
-
-
-
-
-
-
- @body
-
- Manage Collaborators
--
- @collaborators.map { collaboratorName =>
-
- - @collaboratorName - @if(!isGroupRepository){ - (remove) - } else { - @if(repository.managers.contains(collaboratorName)){ - (Manager) - } - } - - } -
-
- }
- }
-}
-
\ No newline at end of file
diff --git a/src/main/twirl/settings/hooks.scala.html b/src/main/twirl/settings/hooks.scala.html
deleted file mode 100644
index 64e5f2b..0000000
--- a/src/main/twirl/settings/hooks.scala.html
+++ /dev/null
@@ -1,27 +0,0 @@
-@(webHooks: List[model.WebHook],
- enteredUrl: Option[Any],
- repository: service.RepositoryService.RepositoryInfo,
- info: Option[Any])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Settings", Some(repository)){
- @html.menu("settings", repository){
- @menu("hooks", repository){
- @helper.html.information(info)
- Danger Zone
-
-
-
-
- WebHook URLs
--
- @webHooks.map { webHook =>
-
- @webHook.url (remove) - } -
-
diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html
deleted file mode 100644
index 1483b43..0000000
--- a/src/main/twirl/settings/options.scala.html
+++ /dev/null
@@ -1,100 +0,0 @@
-@(repository: service.RepositoryService.RepositoryInfo, info: Option[Any])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Settings", Some(repository)){
- @html.menu("settings", repository){
- @menu("options", repository){
- @helper.html.information(info)
-
- }
- }
-}
diff --git a/src/main/twirl/signin.scala.html b/src/main/twirl/signin.scala.html
deleted file mode 100644
index 5416371..0000000
--- a/src/main/twirl/signin.scala.html
+++ /dev/null
@@ -1,13 +0,0 @@
-@()(implicit context: app.Context)
-@import context._
-@main("Sign in"){
-
-
-
-
-
-
- @body
-
-
- @settings.information.map { information =>
-
-}
diff --git a/src/main/twirl/signinform.scala.html b/src/main/twirl/signinform.scala.html
deleted file mode 100644
index 8be7f17..0000000
--- a/src/main/twirl/signinform.scala.html
+++ /dev/null
@@ -1,29 +0,0 @@
-@(systemSettings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
-@import context._
-
-
- @Html(information)
-
- }
- @signinform(settings)
- | - @if(systemSettings.allowAccountRegistration){ - - } - Sign in - | -
|---|
| - - | -
- @helper.html.diff(diffs, repository, None, None, false, None, false, false)
-
- @if(hasWritePermission){
-
- @if(pageName.isDefined){
- Revert Changes
- } else {
- Revert Changes
- }
-
- }
- }
-}
diff --git a/src/main/twirl/wiki/edit.scala.html b/src/main/twirl/wiki/edit.scala.html
deleted file mode 100644
index b918cc0..0000000
--- a/src/main/twirl/wiki/edit.scala.html
+++ /dev/null
@@ -1,39 +0,0 @@
-@(pageName: String,
- page: Option[service.WikiService.WikiPageInfo],
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
- @html.menu("wiki", repository){
-
-
- }
-}
-
diff --git a/src/main/twirl/wiki/history.scala.html b/src/main/twirl/wiki/history.scala.html
deleted file mode 100644
index a773160..0000000
--- a/src/main/twirl/wiki/history.scala.html
+++ /dev/null
@@ -1,77 +0,0 @@
-@(pageName: Option[String],
- commits: List[util.JGitUtil.CommitInfo],
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){
- @html.menu("wiki", repository){
-
- |
- Revisions
-
-
-
- |
- ||
|---|---|---|
| - | @avatar(commit, 20) @user(commit.authorName, commit.authorEmailAddress) | -- @helper.html.datetimeago(commit.authorTime): @commit.shortMessage - | -
-
-
-
- | Pages @pages.length | -
|---|
-
|
-
- Clone this wiki locally
-
- @helper.html.copy("repository-url-copy", httpUrl(repository)){
-
- }
- @if(settings.ssh && loginAccount.isDefined){
-
- }
-
-
- }
-}
-@if(settings.ssh && loginAccount.isDefined){
-
-}
\ No newline at end of file
diff --git a/src/main/twirl/wiki/pages.scala.html b/src/main/twirl/wiki/pages.scala.html
deleted file mode 100644
index ca1760d..0000000
--- a/src/main/twirl/wiki/pages.scala.html
+++ /dev/null
@@ -1,26 +0,0 @@
-@(pages: List[String],
- repository: service.RepositoryService.RepositoryInfo,
- hasWritePermission: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){
- @html.menu("wiki", repository){
-
-
- @markdown(page.content, repository, true, false, false, false, pages)
-
- -
- @pages.map { page =>
-
- @page - } -
"
+ }
+
+ "show uploaded image even if gravatar integration is enabled" in {
+ implicit val context = Context(createSystemSettings(true), None, request)
+ val provider = new AvatarImageProviderImpl(Some(createAccount(Some("icon.png"))))
+
+ provider.toHtml("user", 32).toString mustEqual
+ ""
+ }
+
+ "show unknown image for unknown user if gravatar integration is enabled" in {
+ implicit val context = Context(createSystemSettings(true), None, request)
+ val provider = new AvatarImageProviderImpl(None)
+
+ provider.toHtml("user", 20).toString mustEqual
+ ""
- }
-
- "show uploaded image even if gravatar integration is enabled" in {
- implicit val context = app.Context(createSystemSettings(true), None, request)
- val provider = new AvatarImageProviderImpl(Some(createAccount(Some("icon.png"))))
-
- provider.toHtml("user", 32).toString mustEqual
- ""
- }
-
- "show unknown image for unknown user if gravatar integration is enabled" in {
- implicit val context = app.Context(createSystemSettings(true), None, request)
- val provider = new AvatarImageProviderImpl(None)
-
- provider.toHtml("user", 20).toString mustEqual
- "