mirrors
/
goop
mirror of https://github.com/nyancrimew/goop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

factor out some more code into separate functions

This commit is contained in:
maia tillie arson crimew 2021-10-21 16:30:11 +02:00
parent 3399f2ad56
commit 769869480c
1 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
pkg/goop/clone.go
View File

@ -367,53 +367,12 @@ func FetchGit(baseUrl, baseDir string) error {
}
jt.StartAndWait()
// exit early if we haven't managed to dump anything
if !utils.Exists(baseDir) {
return nil
}
// Iterate over index to find missing files
if utils.Exists(indexPath) {
log.Info().Str("base", baseUrl).Str("dir", baseDir).Msg("attempting to fetch potentially missing files")
var missingFiles []string
var idx index.Index
f, err := os.Open(indexPath)
if err != nil {
return err
}
defer f.Close()
decoder := index.NewDecoder(f)
if err := decoder.Decode(&idx); err != nil {
log.Error().Str("dir", baseDir).Err(err).Msg("couldn't decode git index")
//return err
} else {
jt = jobtracker.NewJobTracker()
for _, entry := range idx.Entries {
if !strings.HasSuffix(entry.Name, ".php") && !utils.Exists(utils.Url(baseDir, fmt.Sprintf(".git/objects/%s/%s", entry.Hash.String()[:2], entry.Hash.String()[2:]))) {
missingFiles = append(missingFiles, entry.Name)
jt.AddJob(entry.Name)
}
}
concurrency = utils.MinInt(maxConcurrency, int(jt.QueuedJobs()))
for w := 1; w <= concurrency; w++ {
go workers.DownloadWorker(c, baseUrl, baseDir, jt, true, true)
}
jt.StartAndWait()
//
jt = jobtracker.NewJobTracker()
for _, f := range missingFiles {
if utils.Exists(utils.Url(baseDir, f)) {
jt.AddJob(f)
}
}
concurrency = utils.MinInt(maxConcurrency, int(jt.QueuedJobs()))
for w := 1; w <= concurrency; w++ {
go workers.CreateObjectWorker(baseDir, jt, objStorage, &idx)
}
jt.StartAndWait()
}
}
fetchMissing(baseDir, baseUrl, objStorage)
if err := checkout(baseDir); err != nil {
log.Error().Str("dir", baseDir).Err(err).Msg("failed to checkout")
@ -433,6 +392,53 @@ func checkout(baseDir string) error {
return cmd.Run()
}
// Iterate over index to find missing files
func fetchMissing(baseDir, baseUrl string, objStorage *filesystem.ObjectStorage) {
indexPath := utils.Url(baseDir, ".git/index")
if utils.Exists(indexPath) {
log.Info().Str("base", baseUrl).Str("dir", baseDir).Msg("attempting to fetch potentially missing files")
var missingFiles []string
var idx index.Index
f, err := os.Open(indexPath)
if err != nil {
log.Error().Str("dir", baseDir).Err(err).Msg("couldn't read git index")
return
}
defer f.Close()
decoder := index.NewDecoder(f)
if err := decoder.Decode(&idx); err != nil {
log.Error().Str("dir", baseDir).Err(err).Msg("couldn't decode git index")
return
} else {
jt := jobtracker.NewJobTracker()
for _, entry := range idx.Entries {
if !strings.HasSuffix(entry.Name, ".php") && !utils.Exists(utils.Url(baseDir, fmt.Sprintf(".git/objects/%s/%s", entry.Hash.String()[:2], entry.Hash.String()[2:]))) {
missingFiles = append(missingFiles, entry.Name)
jt.AddJob(entry.Name)
}
}
concurrency := utils.MinInt(maxConcurrency, int(jt.QueuedJobs()))
for w := 1; w <= concurrency; w++ {
go workers.DownloadWorker(c, baseUrl, baseDir, jt, true, true)
}
jt.StartAndWait()
jt = jobtracker.NewJobTracker()
for _, f := range missingFiles {
if utils.Exists(utils.Url(baseDir, f)) {
jt.AddJob(f)
}
}
concurrency = utils.MinInt(maxConcurrency, int(jt.QueuedJobs()))
for w := 1; w <= concurrency; w++ {
go workers.CreateObjectWorker(baseDir, jt, objStorage, &idx)
}
jt.StartAndWait()
}
}
}
func fetchIgnored(baseDir, baseUrl string) error {
ignorePath := utils.Url(baseDir, ".gitignore")
if utils.Exists(ignorePath) {