Skip to content

Commit 6793234

Browse files
wxiaoguangwxiaoguang
committed
markup.ComposeSimpleDocumentMetas
1 parent 0ec5c4a commit 6793234

File tree

8 files changed

+42
-41
lines changed

8 files changed

+42
-41
lines changed

‎models/repo/repo_test.go‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
// Copyright 2017 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package repo_test
4+
package repo
55

66
import (
77
"testing"
88

99
"code.gitea.io/gitea/models/db"
10-
repo_model "code.gitea.io/gitea/models/repo"
1110
"code.gitea.io/gitea/models/unit"
1211
"code.gitea.io/gitea/models/unittest"
1312
user_model "code.gitea.io/gitea/models/user"
@@ -20,18 +19,18 @@ import (
2019
)
2120

2221
var (
23-
countRepospts = repo_model.CountRepositoryOptions{OwnerID: 10}
24-
countReposptsPublic = repo_model.CountRepositoryOptions{OwnerID: 10, Private: optional.Some(false)}
25-
countReposptsPrivate = repo_model.CountRepositoryOptions{OwnerID: 10, Private: optional.Some(true)}
22+
countRepospts = CountRepositoryOptions{OwnerID: 10}
23+
countReposptsPublic = CountRepositoryOptions{OwnerID: 10, Private: optional.Some(false)}
24+
countReposptsPrivate = CountRepositoryOptions{OwnerID: 10, Private: optional.Some(true)}
2625
)
2726

2827
func TestGetRepositoryCount(t *testing.T) {
2928
assert.NoError(t, unittest.PrepareTestDatabase())
3029

3130
ctx := db.DefaultContext
32-
count, err1 := repo_model.CountRepositories(ctx, countRepospts)
33-
privateCount, err2 := repo_model.CountRepositories(ctx, countReposptsPrivate)
34-
publicCount, err3 := repo_model.CountRepositories(ctx, countReposptsPublic)
31+
count, err1 := CountRepositories(ctx, countRepospts)
32+
privateCount, err2 := CountRepositories(ctx, countReposptsPrivate)
33+
publicCount, err3 := CountRepositories(ctx, countReposptsPublic)
3534
assert.NoError(t, err1)
3635
assert.NoError(t, err2)
3736
assert.NoError(t, err3)
@@ -42,45 +41,45 @@ func TestGetRepositoryCount(t *testing.T) {
4241
func TestGetPublicRepositoryCount(t *testing.T) {
4342
assert.NoError(t, unittest.PrepareTestDatabase())
4443

45-
count, err := repo_model.CountRepositories(db.DefaultContext, countReposptsPublic)
44+
count, err := CountRepositories(db.DefaultContext, countReposptsPublic)
4645
assert.NoError(t, err)
4746
assert.Equal(t, int64(1), count)
4847
}
4948

5049
func TestGetPrivateRepositoryCount(t *testing.T) {
5150
assert.NoError(t, unittest.PrepareTestDatabase())
5251

53-
count, err := repo_model.CountRepositories(db.DefaultContext, countReposptsPrivate)
52+
count, err := CountRepositories(db.DefaultContext, countReposptsPrivate)
5453
assert.NoError(t, err)
5554
assert.Equal(t, int64(2), count)
5655
}
5756

5857
func TestRepoAPIURL(t *testing.T) {
5958
assert.NoError(t, unittest.PrepareTestDatabase())
60-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 10})
59+
repo := unittest.AssertExistsAndLoadBean(t, &Repository{ID: 10})
6160

6261
assert.Equal(t, "https://try.gitea.io/api/v1/repos/user12/repo10", repo.APIURL())
6362
}
6463

6564
func TestWatchRepo(t *testing.T) {
6665
assert.NoError(t, unittest.PrepareTestDatabase())
6766

68-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3})
67+
repo := unittest.AssertExistsAndLoadBean(t, &Repository{ID: 3})
6968
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
7069

71-
assert.NoError(t, repo_model.WatchRepo(db.DefaultContext, user, repo, true))
72-
unittest.AssertExistsAndLoadBean(t, &repo_model.Watch{RepoID: repo.ID, UserID: user.ID})
73-
unittest.CheckConsistencyFor(t, &repo_model.Repository{ID: repo.ID})
70+
assert.NoError(t, WatchRepo(db.DefaultContext, user, repo, true))
71+
unittest.AssertExistsAndLoadBean(t, &Watch{RepoID: repo.ID, UserID: user.ID})
72+
unittest.CheckConsistencyFor(t, &Repository{ID: repo.ID})
7473

75-
assert.NoError(t, repo_model.WatchRepo(db.DefaultContext, user, repo, false))
76-
unittest.AssertNotExistsBean(t, &repo_model.Watch{RepoID: repo.ID, UserID: user.ID})
77-
unittest.CheckConsistencyFor(t, &repo_model.Repository{ID: repo.ID})
74+
assert.NoError(t, WatchRepo(db.DefaultContext, user, repo, false))
75+
unittest.AssertNotExistsBean(t, &Watch{RepoID: repo.ID, UserID: user.ID})
76+
unittest.CheckConsistencyFor(t, &Repository{ID: repo.ID})
7877
}
7978

8079
func TestMetas(t *testing.T) {
8180
assert.NoError(t, unittest.PrepareTestDatabase())
8281

83-
repo := &repo_model.Repository{Name: "testRepo"}
82+
repo := &Repository{Name: "testRepo"}
8483
repo.Owner = &user_model.User{Name: "testOwner"}
8584
repo.OwnerName = repo.Owner.Name
8685

@@ -90,15 +89,15 @@ func TestMetas(t *testing.T) {
9089
assert.Equal(t, "testRepo", metas["repo"])
9190
assert.Equal(t, "testOwner", metas["user"])
9291

93-
externalTracker := repo_model.RepoUnit{
92+
externalTracker := RepoUnit{
9493
Type: unit.TypeExternalTracker,
95-
Config: &repo_model.ExternalTrackerConfig{
94+
Config: &ExternalTrackerConfig{
9695
ExternalTrackerFormat: "https://someurl.com/{user}/{repo}/{issue}",
9796
},
9897
}
9998

10099
testSuccess := func(expectedStyle string) {
101-
repo.Units = []*repo_model.RepoUnit{&externalTracker}
100+
repo.Units = []*RepoUnit{&externalTracker}
102101
repo.commonRenderingMetas = nil
103102
metas := repo.ComposeMetas(db.DefaultContext)
104103
assert.Equal(t, expectedStyle, metas["style"])
@@ -118,7 +117,7 @@ func TestMetas(t *testing.T) {
118117
externalTracker.ExternalTrackerConfig().ExternalTrackerStyle = markup.IssueNameStyleRegexp
119118
testSuccess(markup.IssueNameStyleRegexp)
120119

121-
repo, err := repo_model.GetRepositoryByID(db.DefaultContext, 3)
120+
repo, err := GetRepositoryByID(db.DefaultContext, 3)
122121
assert.NoError(t, err)
123122

124123
metas = repo.ComposeMetas(db.DefaultContext)
@@ -132,15 +131,15 @@ func TestGetRepositoryByURL(t *testing.T) {
132131
assert.NoError(t, unittest.PrepareTestDatabase())
133132

134133
t.Run("InvalidPath", func(t *testing.T) {
135-
repo, err := repo_model.GetRepositoryByURL(db.DefaultContext, "something")
134+
repo, err := GetRepositoryByURL(db.DefaultContext, "something")
136135

137136
assert.Nil(t, repo)
138137
assert.Error(t, err)
139138
})
140139

141140
t.Run("ValidHttpURL", func(t *testing.T) {
142141
test := func(t *testing.T, url string) {
143-
repo, err := repo_model.GetRepositoryByURL(db.DefaultContext, url)
142+
repo, err := GetRepositoryByURL(db.DefaultContext, url)
144143

145144
assert.NotNil(t, repo)
146145
assert.NoError(t, err)
@@ -155,7 +154,7 @@ func TestGetRepositoryByURL(t *testing.T) {
155154

156155
t.Run("ValidGitSshURL", func(t *testing.T) {
157156
test := func(t *testing.T, url string) {
158-
repo, err := repo_model.GetRepositoryByURL(db.DefaultContext, url)
157+
repo, err := GetRepositoryByURL(db.DefaultContext, url)
159158

160159
assert.NotNil(t, repo)
161160
assert.NoError(t, err)
@@ -173,7 +172,7 @@ func TestGetRepositoryByURL(t *testing.T) {
173172

174173
t.Run("ValidImplicitSshURL", func(t *testing.T) {
175174
test := func(t *testing.T, url string) {
176-
repo, err := repo_model.GetRepositoryByURL(db.DefaultContext, url)
175+
repo, err := GetRepositoryByURL(db.DefaultContext, url)
177176

178177
assert.NotNil(t, repo)
179178
assert.NoError(t, err)
@@ -200,21 +199,21 @@ func TestComposeSSHCloneURL(t *testing.T) {
200199
setting.SSH.Domain = "domain"
201200
setting.SSH.Port = 22
202201
setting.Repository.UseCompatSSHURI = false
203-
assert.Equal(t, "git@domain:user/repo.git", repo_model.ComposeSSHCloneURL("user", "repo"))
202+
assert.Equal(t, "git@domain:user/repo.git", ComposeSSHCloneURL("user", "repo"))
204203
setting.Repository.UseCompatSSHURI = true
205-
assert.Equal(t, "ssh://git@domain/user/repo.git", repo_model.ComposeSSHCloneURL("user", "repo"))
204+
assert.Equal(t, "ssh://git@domain/user/repo.git", ComposeSSHCloneURL("user", "repo"))
206205
// test SSH_DOMAIN while use non-standard SSH port
207206
setting.SSH.Port = 123
208207
setting.Repository.UseCompatSSHURI = false
209-
assert.Equal(t, "ssh://git@domain:123/user/repo.git", repo_model.ComposeSSHCloneURL("user", "repo"))
208+
assert.Equal(t, "ssh://git@domain:123/user/repo.git", ComposeSSHCloneURL("user", "repo"))
210209
setting.Repository.UseCompatSSHURI = true
211-
assert.Equal(t, "ssh://git@domain:123/user/repo.git", repo_model.ComposeSSHCloneURL("user", "repo"))
210+
assert.Equal(t, "ssh://git@domain:123/user/repo.git", ComposeSSHCloneURL("user", "repo"))
212211

213212
// test IPv6 SSH_DOMAIN
214213
setting.Repository.UseCompatSSHURI = false
215214
setting.SSH.Domain = "::1"
216215
setting.SSH.Port = 22
217-
assert.Equal(t, "git@[::1]:user/repo.git", repo_model.ComposeSSHCloneURL("user", "repo"))
216+
assert.Equal(t, "git@[::1]:user/repo.git", ComposeSSHCloneURL("user", "repo"))
218217
setting.SSH.Port = 123
219-
assert.Equal(t, "ssh://git@[::1]:123/user/repo.git", repo_model.ComposeSSHCloneURL("user", "repo"))
218+
assert.Equal(t, "ssh://git@[::1]:123/user/repo.git", ComposeSSHCloneURL("user", "repo"))
220219
}

‎modules/markup/render.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ func (ctx *RenderContext) AddCancel(fn func()) {
9393
fn()
9494
}
9595
}
96+
9697
func (ctx *RenderContext) IsContentModeWiki() bool {
9798
return ctx.Metas != nil && ctx.Metas["renderContentMode"] == "wiki"
9899
}
@@ -227,3 +228,7 @@ func Init(ph *ProcessorHelper) {
227228
}
228229
}
229230
}
231+
232+
func ComposeSimpleDocumentMetas() map[string]string {
233+
return map[string]string{"markdownLineBreakStyle": "document"}
234+
}

‎modules/templates/util_render.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func reactionToEmoji(reaction string) template.HTML {
210210
func (ut *RenderUtils) MarkdownToHtml(input string) template.HTML { //nolint:revive
211211
output, err := markdown.RenderString(&markup.RenderContext{
212212
Ctx: ut.ctx,
213-
Metas: map[string]string{"mode": "document"},
213+
Metas: markup.ComposeSimpleDocumentMetas(),
214214
}, input)
215215
if err != nil {
216216
log.Error("RenderString: %v", err)

‎modules/templates/util_render_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ var testMetas = map[string]string{
5050
"user": "user13",
5151
"repo": "repo11",
5252
"repoPath": "../../tests/gitea-repositories-meta/user13/repo11.git/",
53-
"mode": "comment",
5453
}
5554

5655
func TestMain(m *testing.M) {

‎routers/web/feed/convert.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func renderMarkdown(ctx *context.Context, act *activities_model.Action, content
5656
Links: markup.Links{
5757
Base: act.GetRepoLink(ctx),
5858
},
59-
Metas: map[string]string{
59+
Metas: map[string]string{ // FIXME: not right here, it should use issue to compose the metas
6060
"user": act.GetRepoUserName(ctx),
6161
"repo": act.GetRepoName(ctx),
6262
},

‎routers/web/feed/profile.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ func showUserFeed(ctx *context.Context, formatType string) {
4646
Links: markup.Links{
4747
Base: ctx.ContextUser.HTMLURL(),
4848
},
49-
Metas: map[string]string{
50-
"user": ctx.ContextUser.GetDisplayName(),
51-
},
49+
Metas: markup.ComposeSimpleDocumentMetas(),
5250
}, ctx.ContextUser.Description)
5351
if err != nil {
5452
ctx.ServerError("RenderString", err)

‎routers/web/org/home.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func prepareOrgProfileReadme(ctx *context.Context, viewRepositories bool) bool {
189189
Base: profileDbRepo.Link(),
190190
BranchPath: path.Join("branch", util.PathEscapeSegments(profileDbRepo.DefaultBranch)),
191191
},
192-
Metas: map[string]string{"mode": "document"},
192+
Metas: markup.ComposeSimpleDocumentMetas(),
193193
}, bytes); err != nil {
194194
log.Error("failed to RenderString: %v", err)
195195
} else {

‎routers/web/shared/user/header.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func PrepareContextForProfileBigAvatar(ctx *context.Context) {
5050
ctx.Data["OpenIDs"] = openIDs
5151
if len(ctx.ContextUser.Description) != 0 {
5252
content, err := markdown.RenderString(&markup.RenderContext{
53-
Metas: map[string]string{"mode": "document"},
53+
Metas: markup.ComposeSimpleDocumentMetas(),
5454
Ctx: ctx,
5555
}, ctx.ContextUser.Description)
5656
if err != nil {

0 commit comments

Comments
 (0)