Merge branch 'ace-editor'

src/main/scala/app/RepositoryViewerController.scala

@@ -1,8 +1,9 @@
 package app
 
+import _root_.util.JGitUtil.CommitInfo
 import util.Directory._
 import util.Implicits._
-import util.ControlUtil._
+import _root_.util.ControlUtil._
 import _root_.util._
 import service._
 import org.scalatra._
@@ -12,17 +13,53 @@ import org.eclipse.jgit.lib._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.treewalk._
 import java.util.zip.{ZipEntry, ZipOutputStream}
-import scala.Some
+import jp.sf.amateras.scalatra.forms._
+import org.eclipse.jgit.dircache.DirCache
+import org.eclipse.jgit.revwalk.{RevCommit, RevWalk}
 
-class RepositoryViewerController extends RepositoryViewerControllerBase 
+class RepositoryViewerController extends RepositoryViewerControllerBase
   with RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator
 
 /**
  * The repository viewer.
  */
-trait RepositoryViewerControllerBase extends ControllerBase { 
+trait RepositoryViewerControllerBase extends ControllerBase {
   self: RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator =>
 
+  case class EditorForm(
+    branch: String,
+    path: String,
+    content: String,
+    message: Option[String],
+    charset: String,
+    newFileName: String,
+    oldFileName: Option[String]
+  )
+
+  case class DeleteForm(
+    branch: String,
+    path: String,
+    message: Option[String],
+    fileName: String
+  )
+
+  val editorForm = mapping(
+    "branch"      -> trim(label("Branch", text(required))),
+    "path"        -> trim(label("Path", text())),
+    "content"     -> trim(label("Content", text(required))),
+    "message"     -> trim(label("Message", optional(text()))),
+    "charset"     -> trim(label("Charset", text(required))),
+    "newFileName" -> trim(label("Filename", text(required))),
+    "oldFileName" -> trim(label("Old filename", optional(text())))
+  )(EditorForm.apply)
+
+  val deleteForm = mapping(
+    "branch"   -> trim(label("Branch", text(required))),
+    "path"     -> trim(label("Path", text())),
+    "message"  -> trim(label("Message", optional(text()))),
+    "fileName" -> trim(label("Filename", text(required)))
+  )(DeleteForm.apply)
+
   /**
    * Returns converted HTML from Markdown for preview.
    */
@@ -71,6 +108,68 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     }
   })
 
+  get("/:owner/:repository/new/*")(collaboratorsOnly { repository =>
+    val (branch, path) = splitPath(repository, multiParams("splat").head)
+    repo.html.editor(branch, repository, if(path.length == 0) Nil else path.split("/").toList,
+      None, JGitUtil.ContentInfo("text", None, Some("UTF-8")))
+  })
+
+  get("/:owner/:repository/edit/*")(collaboratorsOnly { repository =>
+    val (branch, path) = splitPath(repository, multiParams("splat").head)
+
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+
+      getPathObjectId(git, path, revCommit).map { objectId =>
+        val paths = path.split("/")
+        repo.html.editor(branch, repository, paths.take(paths.size - 1).toList, Some(paths.last),
+          JGitUtil.getContentInfo(git, path, objectId))
+      } getOrElse NotFound
+    }
+  })
+
+  get("/:owner/:repository/remove/*")(collaboratorsOnly { repository =>
+    val (branch, path) = splitPath(repository, multiParams("splat").head)
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+
+      getPathObjectId(git, path, revCommit).map { objectId =>
+        val paths = path.split("/")
+        repo.html.delete(branch, repository, paths.take(paths.size - 1).toList, paths.last,
+          JGitUtil.getContentInfo(git, path, objectId))
+      } getOrElse NotFound
+    }
+  })
+
+  post("/:owner/:repository/create", editorForm)(collaboratorsOnly { (form, repository) =>
+    commitFile(repository, form.branch, form.path, Some(form.newFileName), None, form.content, form.charset,
+      form.message.getOrElse(s"Create ${form.newFileName}"))
+
+    redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
+      if(form.path.length == 0) form.newFileName else s"${form.path}/${form.newFileName}"
+    }")
+  })
+
+  post("/:owner/:repository/update", editorForm)(collaboratorsOnly { (form, repository) =>
+    commitFile(repository, form.branch, form.path, Some(form.newFileName), form.oldFileName, form.content, form.charset,
+      if(form.oldFileName.exists(_ == form.newFileName)){
+        form.message.getOrElse(s"Update ${form.newFileName}")
+      } else {
+        form.message.getOrElse(s"Rename ${form.oldFileName.get} to ${form.newFileName}")
+      })
+
+    redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
+      if(form.path.length == 0) form.newFileName else s"${form.path}/${form.newFileName}"
+    }")
+  })
+
+  post("/:owner/:repository/remove", deleteForm)(collaboratorsOnly { (form, repository) =>
+    commitFile(repository, form.branch, form.path, None, Some(form.fileName), "", "",
+      form.message.getOrElse(s"Delete ${form.fileName}"))
+
+    redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}${if(form.path.length == 0) "" else form.path}")
+  })
+
   /**
    * Displays the file content of the specified branch or commit.
    */
@@ -80,19 +179,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
     using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
-
-      @scala.annotation.tailrec
-      def getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
-        case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
-        case true  => getPathObjectId(path, walk)
-        case false => None
-      }
-
-      using(new TreeWalk(git.getRepository)){ treeWalk =>
-        treeWalk.addTree(revCommit.getTree)
-        treeWalk.setRecursive(true)
-        getPathObjectId(path, treeWalk)
-      } map { objectId =>
+      getPathObjectId(git, path, revCommit).map { objectId =>
         if(raw){
           // Download
           defining(JGitUtil.getContentFromId(git, objectId, false).get){ bytes =>
@@ -100,25 +187,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             bytes
           }
         } else {
-          // Viewer
-          val large  = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)
-          val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other"
-          val bytes  = if(viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None
-
-          val content = if(viewer == "other"){
-            if(bytes.isDefined && FileUtil.isText(bytes.get)){
-              // text
-              JGitUtil.ContentInfo("text", bytes.map(StringUtil.convertFromByteArray))
-            } else {
-              // binary
-              JGitUtil.ContentInfo("binary", None)
-            }
-          } else {
-            // image or large
-            JGitUtil.ContentInfo(viewer, None)
-          }
-
-          repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit))
+          repo.html.blob(id, repository, path.split("/").toList, JGitUtil.getContentInfo(git, path, objectId),
+            new JGitUtil.CommitInfo(revCommit), hasWritePermission(repository.owner, repository.name, context.loginAccount))
         }
       } getOrElse NotFound
     }
@@ -240,7 +310,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         repository.repository.originRepositoryName.getOrElse(repository.name)),
       repository)
   })
-  
+
   private def splitPath(repository: service.RepositoryService.RepositoryInfo, path: String): (String, String) = {
     val id = repository.branchList.collectFirst {
       case branch if(path == branch || path.startsWith(branch + "/")) => branch
@@ -256,7 +326,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
   /**
    * Provides HTML of the file list.
-   * 
+   *
    * @param repository the repository information
    * @param revstr the branch name or commit id(optional)
    * @param path the directory path (optional)
@@ -286,11 +356,77 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             repo.html.files(revision, repository,
               if(path == ".") Nil else path.split("/").toList, // current path
               new JGitUtil.CommitInfo(revCommit), // latest commit
-              files, readme)
+              files, readme, hasWritePermission(repository.owner, repository.name, context.loginAccount))
           }
         } getOrElse NotFound
       }
     }
   }
-  
+
+  private def commitFile(repository: service.RepositoryService.RepositoryInfo,
+                         branch: String, path: String, newFileName: Option[String], oldFileName: Option[String],
+                         content: String, charset: String, message: String) = {
+
+    val newPath = newFileName.map { newFileName => if(path.length == 0) newFileName else s"${path}/${newFileName}" }
+    val oldPath = oldFileName.map { oldFileName => if(path.length == 0) oldFileName else s"${path}/${oldFileName}" }
+
+    LockUtil.lock(s"${repository.owner}/${repository.name}"){
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+        val loginAccount = context.loginAccount.get
+        val builder  = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headName = s"refs/heads/${branch}"
+        val headTip  = git.getRepository.resolve(s"refs/heads/${branch}")
+
+        JGitUtil.processTree(git, headTip){ (path, tree) =>
+          if(!newPath.exists(_ == path) && !oldPath.exists(_ == path)){
+            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+          }
+        }
+
+        newPath.foreach { newPath =>
+          builder.add(JGitUtil.createDirCacheEntry(newPath, FileMode.REGULAR_FILE,
+            inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
+        }
+        builder.finish()
+
+        val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
+          loginAccount.fullName, loginAccount.mailAddress, message)
+
+        inserter.flush()
+        inserter.release()
+
+        // update refs
+        val refUpdate = git.getRepository.updateRef(headName)
+        refUpdate.setNewObjectId(commitId)
+        refUpdate.setForceUpdate(false)
+        refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+        //refUpdate.setRefLogMessage("merged", true)
+        refUpdate.update()
+
+        // record activity
+        recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch,
+          List(new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))))
+
+        // TODO invoke hook
+
+      }
+    }
+  }
+
+  private def getPathObjectId(git: Git, path: String, revCommit: RevCommit): Option[ObjectId] = {
+    @scala.annotation.tailrec
+    def _getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
+      case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
+      case true  => _getPathObjectId(path, walk)
+      case false => None
+    }
+
+    using(new TreeWalk(git.getRepository)){ treeWalk =>
+      treeWalk.addTree(revCommit.getTree)
+      treeWalk.setRecursive(true)
+      _getPathObjectId(path, treeWalk)
+    }
+  }
+
 }

src/main/scala/service/WikiService.scala

@@ -175,17 +175,9 @@ trait WikiService {
             val inserter = git.getRepository.newObjectInserter()
             val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
 
-            using(new RevWalk(git.getRepository)){ revWalk =>
-              using(new TreeWalk(git.getRepository)){ treeWalk =>
-                val index = treeWalk.addTree(revWalk.parseTree(headId))
-                treeWalk.setRecursive(true)
-                while(treeWalk.next){
-                  val path = treeWalk.getPathString
-                  val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
-                  if(revertInfo.find(x => x.filePath == path).isEmpty){
-                    builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-                  }
-                }
+            JGitUtil.processTree(git, headId){ (path, tree) =>
+              if(revertInfo.find(x => x.filePath == path).isEmpty){
+                builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
               }
             }
 
@@ -226,22 +218,14 @@ trait WikiService {
         var removed  = false
 
         if(headId != null){
-          using(new RevWalk(git.getRepository)){ revWalk =>
-            using(new TreeWalk(git.getRepository)){ treeWalk =>
-              val index = treeWalk.addTree(revWalk.parseTree(headId))
-              treeWalk.setRecursive(true)
-              while(treeWalk.next){
-                val path = treeWalk.getPathString
-                val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
-                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)
-                }
-              }
+          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)
             }
           }
         }
@@ -262,7 +246,7 @@ trait WikiService {
               message
             })
 
-          Some(newHeadId)
+          Some(newHeadId.getName)
         } else None
       }
     }
@@ -280,26 +264,17 @@ trait WikiService {
         val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
         var removed  = false
 
-        using(new RevWalk(git.getRepository)){ revWalk =>
-          using(new TreeWalk(git.getRepository)){ treeWalk =>
-            val index = treeWalk.addTree(revWalk.parseTree(headId))
-            treeWalk.setRecursive(true)
-            while(treeWalk.next){
-              val path = treeWalk.getPathString
-              val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
-              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), committer, mailAddress, message)
+        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), committer, mailAddress, message)
+        }
       }
     }
   }

src/main/scala/util/JGitUtil.scala

@@ -92,8 +92,9 @@ object JGitUtil {
    *
    * @param viewType "image", "large" or "other"
    * @param content the string content
+   * @param charset the character encoding
    */
-  case class ContentInfo(viewType: String, content: Option[String])
+  case class ContentInfo(viewType: String, content: Option[String], charset: Option[String])
 
   /**
    * The tag data.
@@ -480,7 +481,7 @@ object JGitUtil {
   }
 
   def createNewCommit(git: Git, inserter: ObjectInserter, headId: AnyObjectId, treeId: AnyObjectId,
-                              fullName: String, mailAddress: String, message: String): String = {
+                              fullName: String, mailAddress: String, message: String): ObjectId = {
     val newCommit = new CommitBuilder()
     newCommit.setCommitter(new PersonIdent(fullName, mailAddress))
     newCommit.setAuthor(new PersonIdent(fullName, mailAddress))
@@ -498,7 +499,7 @@ object JGitUtil {
     refUpdate.setNewObjectId(newHeadId)
     refUpdate.update()
 
-    newHeadId.getName
+    newHeadId
   }
 
   /**
@@ -549,6 +550,26 @@ object JGitUtil {
     }
   }
 
+  def getContentInfo(git: Git, path: String, objectId: ObjectId): ContentInfo = {
+    // Viewer
+    val large  = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)
+    val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other"
+    val bytes  = if(viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None
+
+    if(viewer == "other"){
+      if(bytes.isDefined && FileUtil.isText(bytes.get)){
+        // text
+        ContentInfo("text", Some(StringUtil.convertFromByteArray(bytes.get)), Some(StringUtil.detectEncoding(bytes.get)))
+      } else {
+        // binary
+        ContentInfo("binary", None, None)
+      }
+    } else {
+      // image or large
+      ContentInfo(viewer, None, None)
+    }
+  }
+
   /**
    * Get object content of the given object id as byte array from the Git repository.
    *
@@ -584,4 +605,17 @@ object JGitUtil {
     existIds.toSeq
   }
 
+  def processTree(git: Git, id: ObjectId)(f: (String, CanonicalTreeParser) => Unit) = {
+    using(new RevWalk(git.getRepository)){ revWalk =>
+      using(new TreeWalk(git.getRepository)){ treeWalk =>
+        val index = treeWalk.addTree(revWalk.parseTree(id))
+        treeWalk.setRecursive(true)
+        while(treeWalk.next){
+          f(treeWalk.getPathString, treeWalk.getTree(index, classOf[CanonicalTreeParser]))
+        }
+      }
+    }
+  }
+
+
 }

src/main/scala/view/helpers.scala

@@ -163,6 +163,45 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    */
   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(".tcl"))     => "tcl"
+      case x if(x.endsWith(".yml"))     => "yaml"
+      case _ => "plain_text"
+    }
+  }
+
   /**
    * Implicit conversion to add mkHtml() to Seq[Html].
    */