add friendly filenames aeverywhere (#52)

* add friendly filenames aeverywhere

* a few fixes

Author: davidgraymi

custom/conf/app.ini

@@ -1,4 +1,4 @@
-APP_NAME = PolicyHub: Policies with a cup of tea.
+APP_NAME = Bindersnap: Policies with a cup of tea.
 RUN_USER = davidgray
 WORK_PATH = /Users/davidgray/git/bindersnap
 RUN_MODE = dev

custom/templates/repo/diff/box.tmpl

@@ -58,7 +58,7 @@
 			</div>
 		{{end}}
 		<script id="diff-data-script" type="module">
-			const diffDataFiles = [{{range $i, $file := .Diff.Files}}{Name:"{{$file.Name}}",NameHash:"{{$file.NameHash}}",Type:{{$file.Type}},IsBin:{{$file.IsBin}},Addition:{{$file.Addition}},Deletion:{{$file.Deletion}},IsViewed:{{$file.IsViewed}}},{{end}}];
+			const diffDataFiles = [{{range $i, $file := .Diff.Files}}{Name:"{{FriendlyFilename $file.Name}}",NameHash:"{{$file.NameHash}}",Type:{{$file.Type}},IsBin:{{$file.IsBin}},Addition:{{$file.Addition}},Deletion:{{$file.Deletion}},IsViewed:{{$file.IsViewed}}},{{end}}];
 			const diffData = {
 				isIncomplete: {{.Diff.IsIncomplete}},
 				tooManyFilesMessage: "{{ctx.Locale.Tr "repo.diff.too_many_files"}}",
@@ -126,7 +126,7 @@
 										{{template "repo/diff/stats" dict "file" . "root" $}}
 									{{end}}
 								</div>
-								<span class="file tw-flex tw-items-center tw-font-mono tw-flex-1"><a class="muted file-link" title="{{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}" href="#diff-{{$file.NameHash}}">{{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}</a>
+								<span class="file tw-flex tw-items-center tw-font-mono tw-flex-1"><a class="muted file-link" title="{{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}" href="#diff-{{$file.NameHash}}">{{if $file.IsRenamed}}{{FriendlyFilename $file.OldName}} → {{end}}{{FriendlyFilename $file.Name}}</a>
 									{{if .IsLFSFile}} ({{ctx.Locale.Tr "repo.stored_lfs"}}){{end}}
 									<button class="btn interact-fg tw-p-2" data-clipboard-text="{{$file.Name}}" data-tooltip-content="{{ctx.Locale.Tr "copy_path"}}">{{svg "octicon-copy" 14}}</button>
 									{{if $file.IsGenerated}}

custom/templates/repo/home.tmpl

@@ -75,7 +75,7 @@
 								{{- range $i, $v := .TreeNames -}}
 									<span class="breadcrumb-divider">/</span>
 									{{- if eq $i $treeNameIdxLast -}}
-										<span class="active section" title="{{$v}}">{{$v}}</span>
+										<span class="active section" title="{{$v}}">{{FriendlyFilename $v}}</span>
 										<button class="btn interact-fg tw-mx-1" data-clipboard-text="{{$.TreePath}}" data-tooltip-content="{{ctx.Locale.Tr "copy_path"}}">{{svg "octicon-copy" 14}}</button>
 									{{- else -}}
 										{{$p := index $.Paths $i}}<span class="section"><a href="{{$.BranchLink}}/{{PathEscapeSegments $p}}" title="{{$v}}">{{$v}}</a></span>

custom/templates/repo/hub/search.tmpl

@@ -25,7 +25,7 @@
 
   {{range $result := .SearchResults}}
     {{$repo := or $.Repo (index $.RepoMaps .RepoID)}}
-    <a rel="nofollow" href="{{$repo.Link}}/hub/{{.Filename | PathEscapeSegments}}">{{.Filename}}</a>
+    <a rel="nofollow" href="{{$repo.Link}}/hub/{{.Filename | PathEscapeSegments}}">{{FriendlyFilename .Filename}}</a>
     <div></div>
   {{end}}
 </div>

custom/templates/repo/view_list.tmpl

@@ -39,7 +39,7 @@
 						</a>
 					{{else}}
 						{{svg (printf "octicon-%s" (EntryIcon $entry))}}
-						<a class="muted" href="{{$.TreeLink}}/{{PathEscapeSegments $entry.Name}}" title="{{$entry.Name}}">{{$entry.Name}}</a>
+						<a class="muted" href="{{$.TreeLink}}/{{PathEscapeSegments $entry.Name}}" title="{{$entry.Name}}">{{FriendlyFilename $entry.Name}}</a>
 					{{end}}
 				{{end}}
 			</div>

modules/templates/helper.go

@@ -165,6 +165,7 @@ func NewFuncMap() template.FuncMap {
 		"IsMultilineCommitMessage": isMultilineCommitMessage,
 		"CommentMustAsDiff":        gitdiff.CommentMustAsDiff,
 		"MirrorRemoteAddress":      mirrorRemoteAddress,
+		"FriendlyFilename":         friendlyFilename,
 
 		"FilenameIsImage": filenameIsImage,
 		"TabSizeClass":    tabSizeClass,

modules/templates/util_misc.go

@@ -191,3 +191,7 @@ func tabSizeClass(ec *editorconfig.Editorconfig, filename string) string {
 	}
 	return "tab-size-4"
 }
+
+func friendlyFilename(filename string) string {
+	return strings.TrimSuffix(strings.ReplaceAll(filename, "_", " "), filepath.Ext(filename))
+}

services/gitdiff/gitdiff.go

@@ -36,12 +36,11 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/translation"
 
+	htmldiff "github.com/davidgraymi/html-diff"
 	"github.com/sergi/go-diff/diffmatchpatch"
 	stdcharset "golang.org/x/net/html/charset"
 	"golang.org/x/text/encoding"
 	"golang.org/x/text/transform"
-
-	htmldiff "github.com/davidgraymi/html-diff"
 )
 
 // DiffLineType represents the type of DiffLine.
@@ -439,7 +438,7 @@ outer:
 		skipList = append(skipList, diffLine.Match)
 	}
 
-	var versions = []string{left.String(), right.String()}
+	versions := []string{left.String(), right.String()}
 	res, err := cfg.HTMLdiff(versions)
 	if err != nil {
 		return template.HTML(err.Error())

services/pull/pull_test.go

@@ -48,13 +48,13 @@ func TestPullRequest_GetDefaultMergeMessage_InternalTracker(t *testing.T) {
 
 	mergeMessage, _, err := GetDefaultMergeMessage(db.DefaultContext, gitRepo, pr, "")
 	assert.NoError(t, err)
-	assert.Equal(t, "Merge pull request 'issue3' (#3) from branch2 into master", mergeMessage)
+	assert.Equal(t, "Merge revision 'issue3' (#3) from branch2 into master", mergeMessage)
 
 	pr.BaseRepoID = 1
 	pr.HeadRepoID = 2
 	mergeMessage, _, err = GetDefaultMergeMessage(db.DefaultContext, gitRepo, pr, "")
 	assert.NoError(t, err)
-	assert.Equal(t, "Merge pull request 'issue3' (#3) from user2/repo1:branch2 into master", mergeMessage)
+	assert.Equal(t, "Merge revision 'issue3' (#3) from user2/repo1:branch2 into master", mergeMessage)
 }
 
 func TestPullRequest_GetDefaultMergeMessage_ExternalTracker(t *testing.T) {
@@ -79,7 +79,7 @@ func TestPullRequest_GetDefaultMergeMessage_ExternalTracker(t *testing.T) {
 	mergeMessage, _, err := GetDefaultMergeMessage(db.DefaultContext, gitRepo, pr, "")
 	assert.NoError(t, err)
 
-	assert.Equal(t, "Merge pull request 'issue3' (!3) from branch2 into master", mergeMessage)
+	assert.Equal(t, "Merge revision 'issue3' (!3) from branch2 into master", mergeMessage)
 
 	pr.BaseRepoID = 1
 	pr.HeadRepoID = 2
@@ -88,5 +88,5 @@ func TestPullRequest_GetDefaultMergeMessage_ExternalTracker(t *testing.T) {
 	mergeMessage, _, err = GetDefaultMergeMessage(db.DefaultContext, gitRepo, pr, "")
 	assert.NoError(t, err)
 
-	assert.Equal(t, "Merge pull request 'issue3' (#3) from user2/repo2:branch2 into master", mergeMessage)
+	assert.Equal(t, "Merge revision 'issue3' (#3) from user2/repo2:branch2 into master", mergeMessage)
 }