commit 0afcb843d7ffd596991c4885cab768273a6eb42c Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 17:13:29 2016 -0600 Removed Upload stats as the upload table is just a temporary table commit 7ecd73ff5535612d79d471409173ee7f1fcfa157 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 08:42:41 2016 -0600 Fix for CodeMirror mode commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 08:03:33 2016 -0600 Made tabbing in editor use spaces commit 23af384c53206a8a40e11e45bf49d7a149c4adcd Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:56:46 2016 -0600 Fix for data-url commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9 Merge: 7fc8a89991ce42
Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:42:53 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit 7fc8a89cb495478225b02d613e647f99a1489634 Merge: fd3d86c c03d040 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:40:00 2016 -0600 Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:39:44 2016 -0600 Code cleanup commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 29 15:38:23 2016 -0600 Code cleanup commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 18:36:01 2016 -0600 Code cleanup and fixes commit c2895dc742f25f8412879c9fa15e18f27f42f194 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 18:24:04 2016 -0600 Fixes per Unknwon's requests commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef Merge: 889e9faad7ea88
Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 17:13:43 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go modules/setting/setting.go commit 889e9faf1bd8559a4979c8f46005d488c1a234d4 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:09:18 2016 -0600 Fix in gogs.js commit 47603edf223f147b114be65f3bd27bc1e88827a5 Merge: bb57912cf85e9e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:07:36 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit bb5791255867a71c11a77b639db050ad09c597a4 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:02:18 2016 -0600 Update for using CodeMirror mode addon commit d10d128c51039be19e2af9c66c63db66a9f2ec6d Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Tue Jul 19 16:12:57 2016 -0600 Update for Edit commit 34a34982025144e3225e389f7849eb6273c1d576 Merge: fa1b7521c7dcdd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Tue Jul 19 11:52:02 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go commit fa1b752be29cd455c5184ddac2ffe80b3489763e Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 15 18:35:42 2016 -0600 Feature for editing, creating, uploading and deleting files
257 lines
7.5 KiB
Go
257 lines
7.5 KiB
Go
// Copyright 2016 The Gogs Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package repo
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"fmt"
|
|
"github.com/gogits/gogs/models"
|
|
"github.com/gogits/gogs/modules/auth"
|
|
"github.com/gogits/gogs/modules/base"
|
|
"github.com/gogits/gogs/modules/context"
|
|
"github.com/gogits/gogs/modules/log"
|
|
"github.com/gogits/gogs/modules/setting"
|
|
"net/http"
|
|
"path"
|
|
)
|
|
|
|
const (
|
|
UPLOAD base.TplName = "repo/upload"
|
|
)
|
|
|
|
func renderUploadSettings(ctx *context.Context) {
|
|
ctx.Data["RequireDropzone"] = true
|
|
ctx.Data["IsUploadEnabled"] = setting.UploadEnabled
|
|
ctx.Data["UploadAllowedTypes"] = setting.UploadAllowedTypes
|
|
ctx.Data["UploadMaxSize"] = setting.UploadMaxSize
|
|
ctx.Data["UploadMaxFiles"] = setting.UploadMaxFiles
|
|
}
|
|
|
|
func UploadFile(ctx *context.Context) {
|
|
ctx.Data["PageIsUpload"] = true
|
|
|
|
userName := ctx.Repo.Owner.Name
|
|
repoName := ctx.Repo.Repository.Name
|
|
branchName := ctx.Repo.BranchName
|
|
branchLink := ctx.Repo.RepoLink + "/src/" + branchName
|
|
treeName := ctx.Repo.TreeName
|
|
|
|
treeNames := []string{""}
|
|
if len(treeName) > 0 {
|
|
treeNames = strings.Split(treeName, "/")
|
|
}
|
|
|
|
ctx.Data["UserName"] = userName
|
|
ctx.Data["RepoName"] = repoName
|
|
ctx.Data["BranchName"] = branchName
|
|
ctx.Data["TreeName"] = treeName
|
|
ctx.Data["TreeNames"] = treeNames
|
|
ctx.Data["BranchLink"] = branchLink
|
|
ctx.Data["CommitSummary"] = ""
|
|
ctx.Data["CommitMessage"] = ""
|
|
ctx.Data["CommitChoice"] = "direct"
|
|
ctx.Data["NewBranchName"] = ""
|
|
ctx.Data["CommitDirectlyToThisBranch"] = ctx.Tr("repo.commit_directly_to_this_branch", "<strong class=\"branch-name\">"+branchName+"</strong>")
|
|
ctx.Data["CreateNewBranch"] = ctx.Tr("repo.create_new_branch", "<strong>"+ctx.Tr("repo.new_branch")+"</strong>")
|
|
renderUploadSettings(ctx)
|
|
|
|
ctx.HTML(200, UPLOAD)
|
|
}
|
|
|
|
func UploadFilePost(ctx *context.Context, form auth.UploadRepoFileForm) {
|
|
ctx.Data["PageIsUpload"] = true
|
|
renderUploadSettings(ctx)
|
|
|
|
userName := ctx.Repo.Owner.Name
|
|
repoName := ctx.Repo.Repository.Name
|
|
oldBranchName := ctx.Repo.BranchName
|
|
branchName := oldBranchName
|
|
branchLink := ctx.Repo.RepoLink + "/src/" + branchName
|
|
commitChoice := form.CommitChoice
|
|
files := form.Files
|
|
|
|
if commitChoice == "commit-to-new-branch" {
|
|
branchName = form.NewBranchName
|
|
}
|
|
|
|
treeName := form.TreeName
|
|
treeName = strings.Trim(treeName, " ")
|
|
treeName = strings.Trim(treeName, "/")
|
|
|
|
treeNames := []string{""}
|
|
if len(treeName) > 0 {
|
|
treeNames = strings.Split(treeName, "/")
|
|
}
|
|
|
|
ctx.Data["UserName"] = userName
|
|
ctx.Data["RepoName"] = repoName
|
|
ctx.Data["BranchName"] = branchName
|
|
ctx.Data["TreeName"] = treeName
|
|
ctx.Data["TreeNames"] = treeNames
|
|
ctx.Data["BranchLink"] = branchLink
|
|
ctx.Data["CommitSummary"] = form.CommitSummary
|
|
ctx.Data["CommitMessage"] = form.CommitMessage
|
|
ctx.Data["CommitChoice"] = commitChoice
|
|
ctx.Data["NewBranchName"] = branchName
|
|
ctx.Data["CommitDirectlyToThisBranch"] = ctx.Tr("repo.commit_directly_to_this_branch", "<strong class=\"branch-name\">"+oldBranchName+"</strong>")
|
|
ctx.Data["CreateNewBranch"] = ctx.Tr("repo.create_new_branch", "<strong>"+ctx.Tr("repo.new_branch")+"</strong>")
|
|
|
|
if ctx.HasError() {
|
|
ctx.HTML(200, UPLOAD)
|
|
return
|
|
}
|
|
|
|
if oldBranchName != branchName {
|
|
if _, err := ctx.Repo.Repository.GetBranch(branchName); err == nil {
|
|
ctx.Data["Err_Branchname"] = true
|
|
ctx.RenderWithErr(ctx.Tr("repo.branch_already_exists"), UPLOAD, &form)
|
|
log.Error(4, "%s: %s - %s", "BranchName", branchName, "Branch already exists")
|
|
return
|
|
}
|
|
|
|
}
|
|
|
|
treepath := ""
|
|
for _, part := range treeNames {
|
|
treepath = path.Join(treepath, part)
|
|
entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treepath)
|
|
if err != nil {
|
|
// Means there is no item with that name, so we're good
|
|
break
|
|
}
|
|
if !entry.IsDir() {
|
|
ctx.Data["Err_Filename"] = true
|
|
ctx.RenderWithErr(ctx.Tr("repo.directory_is_a_file"), UPLOAD, &form)
|
|
log.Error(4, "%s: %s - %s", "UploadFile", treeName, "Directory given is a file")
|
|
return
|
|
}
|
|
}
|
|
|
|
message := ""
|
|
if form.CommitSummary != "" {
|
|
message = strings.Trim(form.CommitSummary, " ")
|
|
} else {
|
|
message = ctx.Tr("repo.add_files_to_dir", "'"+treeName+"'")
|
|
}
|
|
if strings.Trim(form.CommitMessage, " ") != "" {
|
|
message += "\n\n" + strings.Trim(form.CommitMessage, " ")
|
|
}
|
|
|
|
if err := ctx.Repo.Repository.UploadRepoFiles(ctx.User, oldBranchName, branchName, treeName, message, files); err != nil {
|
|
ctx.Data["Err_Directory"] = true
|
|
ctx.RenderWithErr(ctx.Tr("repo.unable_to_upload_files"), UPLOAD, &form)
|
|
log.Error(4, "%s: %v", "UploadFile", err)
|
|
return
|
|
}
|
|
|
|
// Was successful, so now need to call models.CommitRepoAction() with the new commitID for webhooks and watchers
|
|
if branch, err := ctx.Repo.Repository.GetBranch(branchName); err != nil {
|
|
log.Error(4, "repo.Repository.GetBranch(%s): %v", branchName, err)
|
|
} else if commit, err := branch.GetCommit(); err != nil {
|
|
log.Error(4, "branch.GetCommit(): %v", err)
|
|
} else {
|
|
pc := &models.PushCommits{
|
|
Len: 1,
|
|
Commits: []*models.PushCommit{&models.PushCommit{
|
|
commit.ID.String(),
|
|
commit.Message(),
|
|
commit.Author.Email,
|
|
commit.Author.Name,
|
|
}},
|
|
}
|
|
oldCommitID := ctx.Repo.CommitID
|
|
newCommitID := commit.ID.String()
|
|
if branchName != oldBranchName {
|
|
oldCommitID = "0000000000000000000000000000000000000000" // New Branch so we use all 0s
|
|
}
|
|
if err := models.CommitRepoAction(ctx.User.ID, ctx.Repo.Owner.ID, ctx.User.LowerName, ctx.Repo.Owner.Email,
|
|
ctx.Repo.Repository.ID, ctx.Repo.Owner.LowerName, ctx.Repo.Repository.Name, "refs/heads/"+branchName, pc,
|
|
oldCommitID, newCommitID); err != nil {
|
|
log.Error(4, "models.CommitRepoAction(branch = %s): %v", branchName, err)
|
|
}
|
|
models.HookQueue.Add(ctx.Repo.Repository.ID)
|
|
}
|
|
|
|
// Leaving this off until forked repos that get a branch can compare with forks master and not upstream
|
|
//if oldBranchName != branchName {
|
|
// ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/compare/" + oldBranchName + "..." + branchName))
|
|
//} else {
|
|
ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName))
|
|
//}
|
|
}
|
|
|
|
func UploadFileToServer(ctx *context.Context) {
|
|
if !setting.UploadEnabled {
|
|
ctx.Error(404, "upload is not enabled")
|
|
return
|
|
}
|
|
|
|
file, header, err := ctx.Req.FormFile("file")
|
|
if err != nil {
|
|
ctx.Error(500, fmt.Sprintf("FormFile: %v", err))
|
|
return
|
|
}
|
|
defer file.Close()
|
|
|
|
buf := make([]byte, 1024)
|
|
n, _ := file.Read(buf)
|
|
if n > 0 {
|
|
buf = buf[:n]
|
|
}
|
|
fileType := http.DetectContentType(buf)
|
|
|
|
if len(setting.UploadAllowedTypes) > 0 {
|
|
allowedTypes := strings.Split(setting.UploadAllowedTypes, ",")
|
|
allowed := false
|
|
for _, t := range allowedTypes {
|
|
t := strings.Trim(t, " ")
|
|
if t == "*/*" || t == fileType {
|
|
allowed = true
|
|
break
|
|
}
|
|
}
|
|
|
|
if !allowed {
|
|
ctx.Error(400, ErrFileTypeForbidden.Error())
|
|
return
|
|
}
|
|
}
|
|
|
|
up, err := models.NewUpload(header.Filename, buf, file, ctx.User.ID, ctx.Repo.Repository.ID)
|
|
if err != nil {
|
|
ctx.Error(500, fmt.Sprintf("NewUpload: %v", err))
|
|
return
|
|
}
|
|
|
|
log.Trace("New file uploaded: %s", up.UUID)
|
|
ctx.JSON(200, map[string]string{
|
|
"uuid": up.UUID,
|
|
})
|
|
}
|
|
|
|
func RemoveUploadFileFromServer(ctx *context.Context, form auth.RemoveUploadFileForm) {
|
|
if !setting.UploadEnabled {
|
|
ctx.Error(404, "upload is not enabled")
|
|
return
|
|
}
|
|
|
|
if len(form.File) == 0 {
|
|
ctx.Error(404, "invalid params")
|
|
return
|
|
}
|
|
|
|
uuid := form.File
|
|
|
|
if err := models.RemoveUpload(uuid, ctx.User.ID, ctx.Repo.Repository.ID); err != nil {
|
|
ctx.Error(500, fmt.Sprintf("RemoveUpload: %v", err))
|
|
return
|
|
}
|
|
|
|
log.Trace("Upload file removed: %s", uuid)
|
|
ctx.JSON(200, map[string]string{
|
|
"uuid": uuid,
|
|
})
|
|
}
|