mirror/git.txt
0
0
Fork 0
mirror of https://dev.sigpipe.me/dashie/git.txt synced 2025-10-06 02:42:43 +02:00
Code Issues Projects Releases Wiki Activity

Revert "A flash message before Handle is useless and won't work as expected"

Browse Source 
This reverts commit ea31d6a1fb.
This commit is contained in:
Dashie
2018-03-08 11:14:13 +01:00
parent a7c9c3c20f
commit 98ee036020
2 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
routers/gitxt/gitxt.go
View File

@@ -265,6 +265,8 @@ func View(ctx *context.Context) {
repo, err := git.OpenRepository(repoPath)
if err != nil {
log.Warn("Could not open repository %s: %s", ctx.Gitxt.Gitxt.Hash, err)
// TODO: The Flash isn't rendered
ctx.Flash.Error(ctx.Tr("gitxt_git.could_not_open"))
ctx.Handle(500, "GitxtView", err)
return
}
@@ -273,6 +275,8 @@ func View(ctx *context.Context) {
isEmpty, err := repo.IsEmpty()
if err != nil || isEmpty {
log.Warn("Empty repository or corrupted %s: %s", ctx.Gitxt.Gitxt.Hash, err)
ctx.Flash.Error(ctx.Tr("gitxt_git.repo_corrupt_or_empty"))
ctx.Handle(500, "GitxtView", err)
return
}
@@ -280,6 +284,8 @@ func View(ctx *context.Context) {
repoTreeEntries, err := gite.GetWalkTreeWithContent(repo, "/")
if err != nil {
log.Warn("Cannot get repository tree entries %s: %s", ctx.Gitxt.Gitxt.Hash, err)
ctx.Flash.Error(ctx.Tr("gitxt_git.cannot_get_tree_entries"))
ctx.Handle(500, "GitxtView", err)
return
}
@@ -401,6 +407,7 @@ func ListUploads(ctx *context.Context) {
listOfGitxts, gitxtsCount, err := models.GetGitxts(opts)
if err != nil {
log.Warn("Cannot get Gitxts with opts %v, %s", opts, err)
ctx.Flash.Error(ctx.Tr("gitxt_list.error_getting_list"))
ctx.Handle(500, "ListUploads", err)
return
}
@@ -433,6 +440,7 @@ func DeletePost(ctx *context.Context, f form.GitxtDelete) {
err := models.DeleteRepository(ctx.Gitxt.User.ID, ctx.Gitxt.Gitxt.ID)
if err != nil {
ctx.Flash.Error(ctx.Tr("gitxt_delete.error_deleting"))
log.Warn("DeletePost.DeleteRepository: %v", err)
ctx.JSONSuccess(map[string]interface{}{
"error": ctx.Tr("gitxt_delete.error_deleting"),
@@ -481,6 +489,7 @@ func Edit(ctx *context.Context) {
repo, err := git.OpenRepository(repoPath)
if err != nil {
log.Warn("Could not open repository %s: %s", ctx.Gitxt.Gitxt.Hash, err)
ctx.Flash.Error(ctx.Tr("gitxt_git.could_not_open"))
ctx.Handle(500, "GitxtView", err)
return
}
@@ -489,6 +498,7 @@ func Edit(ctx *context.Context) {
isEmpty, err := repo.IsEmpty()
if err != nil || isEmpty {
log.Warn("Empty repository or corrupted %s: %s", ctx.Gitxt.Gitxt.Hash, err)
ctx.Flash.Error(ctx.Tr("gitxt_git.repo_corrupt_or_empty"))
ctx.Handle(500, "GitxtView", err)
return
}
@@ -497,6 +507,7 @@ func Edit(ctx *context.Context) {
repoTreeEntries, err := gite.GetWalkTreeWithContent(repo, "/")
if err != nil {
log.Warn("Cannot get repository tree entries %s: %s", ctx.Gitxt.Gitxt.Hash, err)
ctx.Flash.Error(ctx.Tr("gitxt_git.cannot_get_tree_entries"))
ctx.Handle(500, "GitxtView", err)
return
@@ -584,6 +595,7 @@ func EditPost(ctx *context.Context, f form.GitxtEdit) {
repo, err := git.OpenRepository(repoPath)
if err != nil {
log.Warn("Could not open repository %s: %s", ctx.Gitxt.Gitxt.Hash, err)
ctx.Flash.Error(ctx.Tr("gitxt_git.could_not_open"))
ctx.Handle(500, "GitxtEditPost", err)
return
}
@@ -592,6 +604,7 @@ func EditPost(ctx *context.Context, f form.GitxtEdit) {
isEmpty, err := repo.IsEmpty()
if err != nil || isEmpty {
log.Warn("Empty repository or corrupted %s: %s", ctx.Gitxt.Gitxt.Hash, err)
ctx.Flash.Error(ctx.Tr("gitxt_git.repo_corrupt_or_empty"))
ctx.Handle(500, "GitxtEditPost", err)
return
}

28
routers/repo/archive.go
View File

@@ -5,23 +5,23 @@ import (
"dev.sigpipe.me/dashie/git.txt/stuff/repository"
log "gopkg.in/clog.v1"
"dev.sigpipe.me/dashie/git.txt/stuff/gite"
"dev.sigpipe.me/dashie/git.txt/stuff/tool"
"github.com/Unknwon/com"
"gopkg.in/libgit2/git2go.v25"
"os"
"path"
"strings"
"path"
"github.com/Unknwon/com"
"os"
"dev.sigpipe.me/dashie/git.txt/stuff/tool"
"dev.sigpipe.me/dashie/git.txt/stuff/gite"
)
// DownloadArchive of repository
func DownloadArchive(ctx *context.Context) {
var (
uri = ctx.Params("*")
refName string
ext string
archivePath string
archiveType string
uri = ctx.Params("*")
refName string
ext string
archivePath string
archiveType string
)
pathRepo := repository.RepoPath(ctx.RepoOwnerUsername, ctx.Gitxt.Gitxt.Hash)
@@ -40,7 +40,7 @@ func DownloadArchive(ctx *context.Context) {
ctx.Error(404)
return
}
refName = strings.TrimSuffix(uri, ext)
if refName != "master" {
ctx.Handle(500, "Ref other than master not supported", nil)
@@ -59,14 +59,16 @@ func DownloadArchive(ctx *context.Context) {
repo, err := git.OpenRepository(pathRepo)
if err != nil {
log.Warn("Could not open repository %s: %s", ctx.Gitxt.Gitxt.Hash, err)
ctx.Flash.Error(ctx.Tr("gitxt_git.could_not_open"))
ctx.Handle(500, "GitxtEditPost", err)
return
}
// Test if repository is empty
isEmpty, err := repo.IsEmpty()
isEmpty, err := repo.IsEmpty();
if err != nil || isEmpty {
log.Warn("Empty repository or corrupted %s: %s", ctx.Gitxt.Gitxt.Hash, err)
ctx.Flash.Error(ctx.Tr("gitxt_git.repo_corrupt_or_empty"))
ctx.Handle(500, "GitxtEditPost", err)
return
}
@@ -114,4 +116,4 @@ func DownloadArchive(ctx *context.Context) {
}
ctx.ServeFile(archivePath, ctx.Gitxt.Gitxt.Hash+"-"+refName+ext)
}
}