add error ErrMirrorLFSServerNotValid

Author: bl00mber

models/error.go

@@ -56,18 +56,18 @@ func (err ErrNamePatternNotAllowed) Error() string {
 	return fmt.Sprintf("name pattern is not allowed [pattern: %s]", err.Pattern)
 }
 
-// ErrLFSNotInstalled represents an "git-lfs not found" error.
-type ErrLFSNotInstalled struct {
+// ErrMirrorLFSServerNotValid represents an "LFS Server not valid" error.
+type ErrMirrorLFSServerNotValid struct {
 }
 
-// IsLFSNotInstalled checks if an error is an ErrLFSNotInstalled.
-func IsLFSNotInstalled(err error) bool {
-	_, ok := err.(ErrLFSNotInstalled)
+// IsMirrorLFSServerValid checks if an error is an ErrMirrorLFSServerNotValid.
+func IsMirrorLFSServerValid(err error) bool {
+	_, ok := err.(ErrMirrorLFSServerNotValid)
 	return ok
 }
 
-func (err ErrLFSNotInstalled) Error() string {
-	return "git-lfs not found"
+func (err ErrMirrorLFSServerNotValid) Error() string {
+	return "LFS Server not valid"
 }
 
 // ErrNameCharsNotAllowed represents a "character not allowed in name" error.

models/repo.go

@@ -18,7 +18,6 @@ import (
 	"net"
 	"net/url"
 	"os"
-	"os/exec"
 	"path"
 	"path/filepath"
 	"sort"
@@ -938,7 +937,7 @@ func (repo *Repository) CloneLink() (cl *CloneLink) {
 }
 
 // CheckCreateRepository check if could created a repository
-func CheckCreateRepository(doer, u *User, name string, lfs bool, overwriteOrAdopt bool) error {
+func CheckCreateRepository(doer, u *User, name string, lfs bool, lfsServer string, overwriteOrAdopt bool) error {
 	if !doer.CanCreateRepo() {
 		return ErrReachLimitOfRepo{u.MaxRepoCreation}
 	}
@@ -964,8 +963,9 @@ func CheckCreateRepository(doer, u *User, name string, lfs bool, overwriteOrAdop
 	}
 
 	if lfs {
-		if _, err := exec.LookPath("git-lfs"); err != nil {
-			return ErrLFSNotInstalled{}
+		u, err := url.ParseRequestURI(lfsServer)
+		if err != nil {
+			 return ErrMirrorLFSServerNotValid{}
 		}
 	}
 	return nil

options/locale/locale_en-US.ini

@@ -392,7 +392,7 @@ user_not_exist = The user does not exist.
 team_not_exist = The team does not exist.
 last_org_owner = You cannot remove the last user from the 'owners' team. There must be at least one owner for an organization.
 cannot_add_org_to_team = An organization cannot be added as a team member.
-lfs_not_installed = Please <a rel="noreferrer" href="https://git-lfs.github.com">install</a> git-lfs.
+lfs_server_not_valid = LFS Server not valid.
 
 invalid_ssh_key = Can not verify your SSH key: %s
 invalid_gpg_key = Can not verify your GPG key: %s

routers/repo/migrate.go

@@ -102,9 +102,9 @@ func handleMigrateError(ctx *context.Context, owner *models.User, err error, nam
 	case models.IsErrNamePatternNotAllowed(err):
 		ctx.Data["Err_RepoName"] = true
 		ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), tpl, form)
-	case models.IsLFSNotInstalled(err):
-		ctx.Data["Err_LFSNotInstalled"] = true
-		ctx.RenderWithErr(ctx.Tr("form.lfs_not_installed"), tpl, form)
+	case models.IsMirrorLFSServerValid(err):
+		ctx.Data["Err_LFSServerNotValid"] = true
+		ctx.RenderWithErr(ctx.Tr("form.lfs_server_not_valid"), tpl, form)
 	default:
 		remoteAddr, _ := auth.ParseRemoteAddr(form.CloneAddr, form.AuthUsername, form.AuthPassword, owner)
 		err = util.URLSanitizedError(err, remoteAddr)
@@ -200,7 +200,7 @@ func MigratePost(ctx *context.Context) {
 		opts.Releases = false
 	}
 
-	err = models.CheckCreateRepository(ctx.User, ctxUser, opts.RepoName, opts.LFS, false)
+	err = models.CheckCreateRepository(ctx.User, ctxUser, opts.RepoName, opts.LFS, opts.LFSServer, false)
 	if err != nil {
 		handleMigrateError(ctx, ctxUser, err, "MigratePost", tpl, form)
 		return