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

Improvements for validation.

Browse Source
This commit is contained in:
takezoe
2013-04-15 12:35:15 +09:00
parent 6fe7e19cb1
commit aa40822436
4 changed files with 92 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/main/scala/app/CreateRepositoryServlet.scala
View File

@@ -13,6 +13,13 @@ import org.apache.commons.io._
*/
class CreateRepositoryServlet extends ServletBase {
case class RepositoryCreationForm(name: String, description: String)
val form = mapping(
"name" -> trim(label("Repository name", text(required, maxlength(40), repository))),
"description" -> trim(label("Description" , text()))
)(RepositoryCreationForm.apply)
/**
* Show the new repository form.
*/
@@ -23,53 +30,41 @@ class CreateRepositoryServlet extends ServletBase {
/**
* Create new repository.
*/
post("/") {
withValidation(form, params){ form =>
val gitdir = getRepositoryDir(LoginUser, form.name)
val repository = new RepositoryBuilder().setGitDir(gitdir).setBare.build
repository.create
val config = repository.getConfig
config.setBoolean("http", null, "receivepack", true)
config.save
val tmpdir = getInitRepositoryDir(LoginUser, form.name)
try {
// Clone the repository
Git.cloneRepository.setURI(gitdir.toURI.toString).setDirectory(tmpdir).call
// Create README.md
FileUtils.writeStringToFile(new File(tmpdir, "README.md"), if(form.description.nonEmpty){
form.name + "\n===============\n\n" + form.description
} else {
form.name + "\n===============\n"
}, "UTF-8")
val git = Git.open(tmpdir)
git.add.addFilepattern("README.md").call
git.commit.setMessage("Initial commit").call
git.push.call
} finally {
FileUtils.deleteDirectory(tmpdir)
}
// redirect to the repository
redirect("/%s/%s".format(LoginUser, form.name))
}
}
get("/validate") {
contentType = "application/json"
form.validateAsJSON(params)
}
val form = mapping(
"name" -> trim(label("Repository name", text(required, maxlength(40), repository))),
"description" -> trim(label("Description" , text()))
)(RepositoryCreationForm.apply)
post("/", form) { form =>
val gitdir = getRepositoryDir(LoginUser, form.name)
val repository = new RepositoryBuilder().setGitDir(gitdir).setBare.build
repository.create
val config = repository.getConfig
config.setBoolean("http", null, "receivepack", true)
config.save
val tmpdir = getInitRepositoryDir(LoginUser, form.name)
try {
// Clone the repository
Git.cloneRepository.setURI(gitdir.toURI.toString).setDirectory(tmpdir).call
// Create README.md
FileUtils.writeStringToFile(new File(tmpdir, "README.md"), if(form.description.nonEmpty){
form.name + "\n===============\n\n" + form.description
} else {
form.name + "\n===============\n"
}, "UTF-8")
val git = Git.open(tmpdir)
git.add.addFilepattern("README.md").call
git.commit.setMessage("Initial commit").call
git.push.call
} finally {
FileUtils.deleteDirectory(tmpdir)
}
// redirect to the repository
redirect("/%s/%s".format(LoginUser, form.name))
}
def repository: Constraint = new Constraint(){
def validate(name: String, value: String): Option[String] = {
if(!value.matches("^[a-z0-9\\-_]+$")){
@@ -82,6 +77,4 @@ class CreateRepositoryServlet extends ServletBase {
}
}
case class RepositoryCreationForm(name: String, description: String)
}