Skip to content

Commit f1eccad

Browse files
committed
make messenger an interface
Signed-off-by: Andrew Thornton <[email protected]>
1 parent ca66087 commit f1eccad

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

modules/migrations/base/messenger.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright 2021 The Gitea Authors. All rights reserved.
2+
// Use of this source code is governed by a MIT-style
3+
// license that can be found in the LICENSE file.
4+
5+
package base
6+
7+
// Messenger is a formatting function similar to i18n.Tr
8+
type Messenger func(key string, args ...interface{})
9+
10+
// NilMessenger represents an empty formatting function
11+
func NilMessenger(string, ...interface{}) {}

modules/migrations/migrate.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func IsMigrateURLAllowed(remoteURL string, doer *models.User) error {
9999
}
100100

101101
// MigrateRepository migrate repository according MigrateOptions
102-
func MigrateRepository(ctx context.Context, doer *models.User, ownerName string, opts base.MigrateOptions, messenger func(string, ...interface{})) (*models.Repository, error) {
102+
func MigrateRepository(ctx context.Context, doer *models.User, ownerName string, opts base.MigrateOptions, messenger base.Messenger) (*models.Repository, error) {
103103
err := IsMigrateURLAllowed(opts.CloneAddr, doer)
104104
if err != nil {
105105
return nil, err
@@ -167,9 +167,9 @@ func newDownloader(ctx context.Context, ownerName string, opts base.MigrateOptio
167167
// migrateRepository will download information and then upload it to Uploader, this is a simple
168168
// process for small repository. For a big repository, save all the data to disk
169169
// before upload is better
170-
func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts base.MigrateOptions, messenger func(string, ...interface{})) error {
170+
func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts base.MigrateOptions, messenger base.Messenger) error {
171171
if messenger == nil {
172-
messenger = func(string, ...interface{}) {}
172+
messenger = base.NilMessenger
173173
}
174174

175175
repo, err := downloader.GetRepoInfo()

0 commit comments

Comments
 (0)