fetch LFS on mirror update

Author: bl00mber

models/repo.go

@@ -219,6 +219,8 @@ type Repository struct {
 	IsEmpty    bool `xorm:"INDEX"`
 	IsArchived bool `xorm:"INDEX"`
 	IsMirror   bool `xorm:"INDEX"`
+	LFS        bool `yaml:"lfs"`
+	LFSServer  string `yaml:"lfs_server"`
 	*Mirror    `xorm:"-"`
 	Status     RepositoryStatus `xorm:"NOT NULL DEFAULT 0"`
 

modules/migrations/base/repo.go

@@ -9,8 +9,10 @@ package base
 type Repository struct {
 	Name          string
 	Owner         string
-	IsPrivate     bool `yaml:"is_private"`
-	IsMirror      bool `yaml:"is_mirror"`
+	IsPrivate     bool   `yaml:"is_private"`
+	IsMirror      bool   `yaml:"is_mirror"`
+	LFS           bool   `yaml:"lfs"`
+	LFSServer     string `yaml:"lfs_server"`
 	Description   string
 	CloneURL      string `yaml:"clone_url"`
 	OriginalURL   string `yaml:"original_url"`

modules/migrations/migrate.go

@@ -140,6 +140,8 @@ func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts
 	}
 	repo.IsPrivate = opts.Private
 	repo.IsMirror = opts.Mirror
+	repo.LFS = opts.LFS
+	repo.LFSServer = opts.LFSServer
 	if opts.Description != "" {
 		repo.Description = opts.Description
 	}

services/mirror/mirror.go

@@ -206,7 +206,7 @@ func parseRemoteUpdateOutput(output string) []*mirrorSyncResult {
 }
 
 // runSync returns true if sync finished without error.
-func runSync(m *models.Mirror) ([]*mirrorSyncResult, bool) {
+func runSync(ctx context.Context, m *models.Mirror) ([]*mirrorSyncResult, bool) {
 	repoPath := m.Repo.RepoPath()
 	wikiPath := m.Repo.UncycloPath()
 	timeout := time.Duration(setting.Git.Timeout.Mirror) * time.Second
@@ -253,13 +253,20 @@ func runSync(m *models.Mirror) ([]*mirrorSyncResult, bool) {
 		log.Error("OpenRepository: %v", err)
 		return nil, false
 	}
+	defer gitRepo.Close()
+
+	if m.Repo.LFS {
+		log.Trace("SyncMirrors [repo: %-v]: fetching LFS files...", m.Repo)
+		err := repo_module.FetchMissingLFSFilesToContentStore(ctx, m.Repo, Username(m), gitRepo, m.Repo.LFSServer, false)
+		if err != nil {
+			log.Error("Failed to fetch LFS files %v:\nErr: %v", m.Repo, err)
+		}
+	}
 
 	log.Trace("SyncMirrors [repo: %-v]: syncing releases with tags...", m.Repo)
 	if err = repo_module.SyncReleasesWithTags(m.Repo, gitRepo); err != nil {
-		gitRepo.Close()
 		log.Error("Failed to synchronize tags to releases for repository: %v", err)
 	}
-	gitRepo.Close()
 
 	log.Trace("SyncMirrors [repo: %-v]: updating size of repository", m.Repo)
 	if err := m.Repo.UpdateSize(models.DefaultDBContext()); err != nil {
@@ -378,12 +385,12 @@ func SyncMirrors(ctx context.Context) {
 			mirrorQueue.Close()
 			return
 		case repoID := <-mirrorQueue.Queue():
-			syncMirror(repoID)
+			syncMirror(ctx, repoID)
 		}
 	}
 }
 
-func syncMirror(repoID string) {
+func syncMirror(ctx context.Context, repoID string) {
 	log.Trace("SyncMirrors [repo_id: %v]", repoID)
 	defer func() {
 		err := recover()
@@ -403,7 +410,7 @@ func syncMirror(repoID string) {
 	}
 
 	log.Trace("SyncMirrors [repo: %-v]: Running Sync", m.Repo)
-	results, ok := runSync(m)
+	results, ok := runSync(ctx, m)
 	if !ok {
 		return
 	}