Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 14:05:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #4)The base of activity timeline is completed.

Browse Source
This commit is contained in:
takezoe
2013-07-07 13:40:04 +09:00
parent 129020dbc4
commit 6005282d9f
5 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/model/Activity.scala
View File

@@ -13,6 +13,12 @@ object Activities extends Table[Activity]("ACTIVITY") with BasicTemplate with Fu
def autoInc = userName ~ repositoryName ~ activityUserName ~ activityType ~ message ~ additionalInfo.? ~ activityDate returning activityId
}
object CommitLog extends Table[(String, String, String)]("COMMIT_LOG") with BasicTemplate {
def commitId = column[String]("COMMIT_ID")
def * = userName ~ repositoryName ~ commitId
def byPrimaryKey(userName: String, repositoryName: String, commitId: String) = byRepository(userName, repositoryName) && (this.commitId is commitId.bind)
}
case class Activity(
activityId: Int,
userName: String,

10
src/main/scala/service/ActivityService.scala
View File

@@ -87,14 +87,20 @@ trait ActivityService {
None,
currentDate)
def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String,
branchName: String, commits: List[util.JGitUtil.CommitInfo]) =
def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
Activities.autoInc insert(userName, repositoryName, activityUserName,
"create_tag",
s"[user:${activityUserName}] created branch [tag:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
None,
currentDate)
def insertCommitId(userName: String, repositoryName: String, commitId: String) = {
CommitLog insert (userName, repositoryName, commitId)
}
def existsCommitId(userName: String, repositoryName: String, commitId: String): Boolean =
Query(CommitLog).filter(_.byPrimaryKey(userName, repositoryName, commitId)).firstOption.isDefined
private def cut(value: String, length: Int): String =
if(value.length > length) value.substring(0, length) + "..." else value
}

36
src/main/scala/servlet/GitRepositoryServlet.scala
View File

@@ -76,37 +76,37 @@ class CommitLogHook(owner: String, repository: String, userName: String) extends
JGitUtil.withGit(Directory.getRepositoryDir(owner, repository)) { git =>
commands.asScala.foreach { command =>
val commits = JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
.filter(commit => JGitUtil.getBranchesOfCommit(git, commit.id).length == 1)
val refName = command.getRefName.split("/")
println("****************************")
println(command.getRefName)
println(command.getMessage)
println(command.getResult)
println(command.getType)
println("****************************")
// apply issue comment
if(refName(1) == "heads"){
commits.foreach { commit =>
val newCommits = commits.flatMap { commit =>
if(!existsCommitId(owner, repository, commit.id)){
insertCommitId(owner, repository, commit.id)
"(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(commit.fullMessage).matchData.foreach { matchData =>
val issueId = matchData.group(2)
if(getAccountByUserName(commit.committer).isDefined && getIssue(owner, repository, issueId).isDefined){
createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage, None)
}
}
}
}
git.getRepository.getAllRefs.asScala.map { e =>
println(e._1)
}
Some(commit)
} else None
}.toList
// record activity
if(refName(1) == "heads"){
recordPushActivity(owner, repository, userName, refName(2), commits)
command.getType match {
case ReceiveCommand.Type.CREATE => {
recordCreateBranchActivity(owner, repository, userName, refName(2))
recordPushActivity(owner, repository, userName, refName(2), newCommits)
}
case ReceiveCommand.Type.UPDATE => recordPushActivity(owner, repository, userName, refName(2), newCommits)
case _ =>
}
} else if(refName(1) == "tags"){
recordCreateTagActivity(owner, repository, userName, refName(2), commits)
command.getType match {
case ReceiveCommand.Type.CREATE => recordCreateTagActivity(owner, repository, userName, refName(2), newCommits)
case _ =>
}
}
}
}