mirror of https://github.com/go-gitea/gitea.git
Web editor: support upload files
Unknwon
9 years ago
parent
7c31f235da
commit
643142acab
@ -1,253 +0,0 @@
|
|||||||
// 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 (
|
|
||||||
"fmt"
|
|
||||||
"net/http"
|
|
||||||
"path"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
git "github.com/gogits/git-module"
|
|
||||||
|
|
||||||
"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"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
UPLOAD base.TplName = "repo/upload"
|
|
||||||
)
|
|
||||||
|
|
||||||
func renderUploadSettings(ctx *context.Context) {
|
|
||||||
ctx.Data["RequireDropzone"] = true
|
|
||||||
ctx.Data["IsUploadEnabled"] = setting.Repository.Upload.Enabled
|
|
||||||
ctx.Data["UploadAllowedTypes"] = strings.Join(setting.Repository.Upload.AllowedTypes, ",")
|
|
||||||
ctx.Data["UploadMaxSize"] = setting.Repository.Upload.FileMaxSize
|
|
||||||
ctx.Data["UploadMaxFiles"] = setting.Repository.Upload.MaxFiles
|
|
||||||
}
|
|
||||||
|
|
||||||
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.TreePath
|
|
||||||
|
|
||||||
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.CommitToPushCommit(commit)},
|
|
||||||
}
|
|
||||||
oldCommitID := ctx.Repo.CommitID
|
|
||||||
newCommitID := commit.ID.String()
|
|
||||||
if branchName != oldBranchName {
|
|
||||||
oldCommitID = "0000000000000000000000000000000000000000" // New Branch so we use all 0s
|
|
||||||
}
|
|
||||||
if err := models.CommitRepoAction(models.CommitRepoActionOptions{
|
|
||||||
PusherName: ctx.User.Name,
|
|
||||||
RepoOwnerID: ctx.Repo.Owner.ID,
|
|
||||||
RepoName: ctx.Repo.Owner.Name,
|
|
||||||
RefFullName: git.BRANCH_PREFIX + branchName,
|
|
||||||
OldCommitID: oldCommitID,
|
|
||||||
NewCommitID: newCommitID,
|
|
||||||
Commits: pc,
|
|
||||||
}); err != nil {
|
|
||||||
log.Error(4, "models.CommitRepoAction(branch = %s): %v", branchName, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName)
|
|
||||||
}
|
|
||||||
|
|
||||||
func UploadFileToServer(ctx *context.Context) {
|
|
||||||
if !setting.Repository.Upload.Enabled {
|
|
||||||
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.Repository.Upload.AllowedTypes) > 0 {
|
|
||||||
allowed := false
|
|
||||||
for _, t := range setting.Repository.Upload.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.Repository.Upload.Enabled {
|
|
||||||
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,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@ -1 +1 @@
|
|||||||
0.9.94.0830
|
0.9.95.0830
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
{{template "base/head" .}}
|
||||||
|
<div class="repository file editor upload">
|
||||||
|
{{template "repo/header" .}}
|
||||||
|
<div class="ui container">
|
||||||
|
{{template "base/alert" .}}
|
||||||
|
<form class="ui comment form" method="post">
|
||||||
|
{{.CsrfTokenHtml}}
|
||||||
|
<div class="ui secondary menu">
|
||||||
|
<div class="item fitted treepath">
|
||||||
|
<div class="ui breadcrumb field {{if .Err_TreePath}}error{{end}}">
|
||||||
|
<a class="section" href="{{EscapePound $.BranchLink}}">{{.Repository.Name}}</a>
|
||||||
|
{{ $n := len .TreeNames}}
|
||||||
|
{{ $l := Subtract $n 1}}
|
||||||
|
{{range $i, $v := .TreeNames}}
|
||||||
|
<div class="divider"> / </div>
|
||||||
|
{{if eq $i $l}}
|
||||||
|
<input type="text" id="file-name" value="{{$v}}" placeholder="{{$.i18n.Tr "repo.editor.add_subdir"}}" autofocus>
|
||||||
|
<span class="octicon octicon-info poping up" data-content="{{$.i18n.Tr "repo.editor.filename_help"}}" data-position="bottom center" data-variation="tiny inverted"></span>
|
||||||
|
{{else}}
|
||||||
|
<span class="section"><a href="{{EscapePound $.BranchLink}}/{{EscapePound $v}}">{{$v}}</a></span>
|
||||||
|
{{end}}
|
||||||
|
{{end}}
|
||||||
|
<span>{{.i18n.Tr "repo.editor.or"}} <a href="{{EscapePound $.BranchLink}}{{if not .IsNewFile}}/{{EscapePound .TreePath}}{{end}}">{{.i18n.Tr "repo.editor.cancel_lower"}}</a></span>
|
||||||
|
<input type="hidden" id="tree_path" name="tree_path" value="{{.TreePath}}" required>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<div class="files"></div>
|
||||||
|
<div class="ui basic button dropzone" id="dropzone" data-upload-url="{{.RepoLink}}/upload-file" data-remove-url="{{.RepoLink}}/upload-remove" data-csrf="{{.CsrfToken}}" data-accepts="{{.UploadAllowedTypes}}" data-max-file="{{.UploadMaxFiles}}" data-max-size="{{.UploadMaxSize}}" data-default-message="{{.i18n.Tr "dropzone.default_message"}}" data-invalid-input-type="{{.i18n.Tr "dropzone.invalid_input_type"}}" data-file-too-big="{{.i18n.Tr "dropzone.file_too_big"}}" data-remove-file="{{.i18n.Tr "dropzone.remove_file"}}"></div>
|
||||||
|
</div>
|
||||||
|
{{template "repo/editor/commit_form" .}}
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{template "base/footer" .}}
|
||||||
@ -1,79 +0,0 @@
|
|||||||
{{template "base/head" .}}
|
|
||||||
<div class="repository file upload">
|
|
||||||
{{template "repo/header" .}}
|
|
||||||
<div class="ui container">
|
|
||||||
{{.branchName}}
|
|
||||||
{{template "base/alert" .}}
|
|
||||||
<form class="ui comment form" action="{{EscapePound $.Link}}" method="post">
|
|
||||||
{{.CsrfTokenHtml}}
|
|
||||||
<div class="ui secondary menu">
|
|
||||||
<div class="item fitted" style="width:100%;">
|
|
||||||
<div class="ui breadcrumb field{{if .Err_Directory}} error{{end}}">
|
|
||||||
<a class="section" href="{{EscapePound $.BranchLink}}">{{.Repository.Name}}</a>
|
|
||||||
{{ $n := len .TreeNames}}
|
|
||||||
{{ $l := Subtract $n 1}}
|
|
||||||
{{range $i, $v := .TreeNames}}
|
|
||||||
<div class="divider"> / </div>
|
|
||||||
{{if eq $i $l}}
|
|
||||||
<input type="text" id="file-name" value="{{$v}}" placeholder="{{$.i18n.Tr "repo.add_subdir"}}">
|
|
||||||
{{else}}
|
|
||||||
<span class="section"><a href="{{EscapePound $.BranchLink}}/{{EscapePound $v}}">{{$v}}</a></span>
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
<button class="clipboard-tree-name icon octicon octicon-clippy poping up" type="button" data-content="{{.i18n.Tr "repo.copy_file_path_to_clipboard"}}" data-position="bottom center" data-variation="tiny inverted"></button>
|
|
||||||
<span class="repo-edit-file-cancel">{{.i18n.Tr "repo.or"}} <a href="{{EscapePound $.BranchLink}}/{{EscapePound $.TreeName}}">{{.i18n.Tr "repo.cancel_lower"}}</a></span>
|
|
||||||
<input type="hidden" id="tree-name" name="tree_name" value="{{.TreeName}}">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="field ui upload">
|
|
||||||
<div class="files"></div>
|
|
||||||
<div class="ui basic button dropzone" id="dropzone" data-upload-url="{{.RepoLink}}/upload-file" data-remove-url="{{.RepoLink}}/upload-remove" data-csrf="{{.CsrfToken}}" data-accepts="{{.UploadAllowedTypes}}" data-max-file="{{.UploadMaxFiles}}" data-max-size="{{.UploadMaxSize}}" data-default-message="{{.i18n.Tr "dropzone.default_message"}}" data-invalid-input-type="{{.i18n.Tr "dropzone.invalid_input_type"}}" data-file-too-big="{{.i18n.Tr "dropzone.file_too_big"}}" data-remove-file="{{.i18n.Tr "dropzone.remove_file"}}"></div>
|
|
||||||
</div>
|
|
||||||
<div class="commit-form-wrapper">
|
|
||||||
<img width="48" height="48" class="ui rounded image commit-form-avatar" src="{{.SignedUser.AvatarLink}}">
|
|
||||||
<div class="commit-form">
|
|
||||||
<h3>{{.i18n.Tr "repo.commit_changes"}}</h3>
|
|
||||||
<div class="field">
|
|
||||||
<input name="commit_summary" placeholder="{{.i18n.Tr "repo.add_files_to_dir" .TreeName}}" value="{{.CommitSummary}}">
|
|
||||||
</div>
|
|
||||||
<div class="field">
|
|
||||||
<textarea name="commit_message" placeholder="{{.i18n.Tr "repo.default_commit_message"}}">{{.CommitMessage}}</textarea>
|
|
||||||
</div>
|
|
||||||
<div class="quick-pull-choice js-quick-pull-choice ">
|
|
||||||
<dl class="form-group">
|
|
||||||
<dd>
|
|
||||||
<div class="form-checkbox">
|
|
||||||
<label>
|
|
||||||
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct"{{if eq .CommitChoice "direct"}} checked="checked"{{end}}>
|
|
||||||
<i class="octicon octicon-git-commit" height="16" width="14"></i>
|
|
||||||
{{.CommitDirectlyToThisBranch | Safe}}
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="form-checkbox">
|
|
||||||
<label>
|
|
||||||
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch"{{if eq .CommitChoice "commit-to-new-branch"}} checked="checked"{{end}}>
|
|
||||||
<i class="octicon octicon-git-pull-request" height="16" width="12"></i>
|
|
||||||
{{.CreateNewBranch | Safe}}
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</dd>
|
|
||||||
</dl>
|
|
||||||
<div class="quick-pull-branch-name">
|
|
||||||
<div class="new-branch-name-input{{if .Err_Branchname}} error{{end}}">
|
|
||||||
<i class="octicon octicon-git-branch quick-pull-new-branch-icon" height="16" width="10"></i>
|
|
||||||
<input type="text" name="new_branch_name" value="{{.NewBranchName}}" class="form-control input-contrast mr-2 js-quick-pull-new-branch-name" placeholder="New branch name…">
|
|
||||||
<span class="text-muted js-quick-pull-normalization-info"></span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="ui green button">
|
|
||||||
{{.i18n.Tr "repo.commit_changes"}}
|
|
||||||
</button>
|
|
||||||
<a class="ui button red" href="{{EscapePound $.BranchLink}}/{{EscapePound $.TreeName}}">{{.i18n.Tr "repo.cancel"}}</a>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{template "base/footer" .}}
|
|
||||||
Loading…
Reference in New Issue