diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala index c16873b..ae4652b 100644 --- a/src/main/scala/app/IndexController.scala +++ b/src/main/scala/app/IndexController.scala @@ -1,13 +1,28 @@ package app +import util._ +import util.Directory._ import service._ +import jp.sf.amateras.scalatra.forms._ +import org.eclipse.jgit.api.Git +import org.apache.commons.io.FileUtils class IndexController extends IndexControllerBase with RepositoryService with AccountService with SystemSettingsService with ActivityService + with ReferrerAuthenticator trait IndexControllerBase extends ControllerBase { self: RepositoryService - with SystemSettingsService with ActivityService => - + with SystemSettingsService with ActivityService + with ReferrerAuthenticator => + + val searchForm = mapping( + "query" -> trim(text(required)), // TODO optional? + "owner" -> trim(text(required)), + "repository" -> trim(text(required)) + )(SearchForm.apply) + + case class SearchForm(query: String, owner: String, repository: String) + get("/"){ val loginAccount = context.loginAccount @@ -18,4 +33,60 @@ ) } -} \ No newline at end of file + post("/search", searchForm){ form => + redirect(s"${form.owner}/${form.repository}/search?q=${StringUtil.urlEncode(form.query)}") + } + + // TODO readable only + get("/:owner/:repository/search")(referrersOnly { repository => + val owner = params("owner") + val name = params("repository") + val query = params("q") + val target = params.getOrElse("type", "Code") + + target.toLowerCase match { + case "issue" => { + // TODO search issue + } + case _ => { + JGitUtil.withGit(getRepositoryDir(owner, name)){ git => + // TODO search code + val dir = new java.io.File(getTemporaryDir(owner, name), "search") + if(!dir.exists){ + val git = Git + .cloneRepository.setDirectory(dir) + .setURI(getRepositoryDir(owner, name).toURI.toString) + .setBranch(repository.repository.defaultBranch) + .call + git.getRepository.close + } else { + val git = Git.open(dir) + git.pull.call + if(git.getRepository.getBranch != repository.repository.defaultBranch){ + git.checkout.setName(repository.repository.defaultBranch).call + } + git.getRepository.close + } + + search.html.code(searchDirectory(query, dir).map { file => + FileSearchResult( + file.getAbsolutePath.substring(dir.getAbsolutePath.length + 1).replace('\\', '/'), + new java.util.Date(file.lastModified) + ) + }, query, repository) + } + } + } + }) + + private def searchDirectory(query: String, dir: java.io.File, matched: List[java.io.File] = Nil): List[java.io.File] = { + dir.listFiles.toList.flatMap { + case file if(file.isDirectory && file.getName != ".git") => searchDirectory(query, file, matched) + case file if(file.isFile && FileUtils.readFileToString(file).contains(query)) => matched :+ file + case _ => matched + } + } + +} + +case class FileSearchResult(path: String, lastModified: java.util.Date) \ No newline at end of file diff --git a/src/main/twirl/main.scala.html b/src/main/twirl/main.scala.html index 58a8915..c5fca8a 100644 --- a/src/main/twirl/main.scala.html +++ b/src/main/twirl/main.scala.html @@ -29,7 +29,7 @@ -

@@ -41,7 +41,13 @@ GitBucket

@repository.map { repository => - + @if(loginAccount.isDefined){ + + } else { + + } + + } @if(loginAccount.isDefined){ @@ -65,5 +71,12 @@

@body

+ diff --git a/src/main/twirl/search/code.scala.html b/src/main/twirl/search/code.scala.html new file mode 100644 index 0000000..3cdea88 --- /dev/null +++ b/src/main/twirl/search/code.scala.html @@ -0,0 +1,16 @@ +@(files: List[app.FileSearchResult], query: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) +@import context._ +@import view.helpers._ +@html.main("Search Results", Some(repository)){ + @if(files.isEmpty){ +

We couldn't find any code matching '@query'

+ } else { +

We've found @files.size code @plural(files.size, "result")

+ } + @files.map { file => +

@file.path

@datetime(file.lastModified)

+ } +} \ No newline at end of file