code.ivysaur.me/teafolio
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

sync: idx values from reposAlphabeticalOrder do not match reposCache indexes

Browse Source
This commit is contained in:
mappu 2022-12-31 14:55:00 +13:00
parent 8321129ac8
commit b84b7bdb4e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main.go
View File

@ -36,6 +36,7 @@ type Application struct {
reposMut sync.RWMutex reposMut sync.RWMutex
reposCache []gitea.Repo // Sorted by recently-created-first reposCache []gitea.Repo // Sorted by recently-created-first
reposCacheByName map[string]int
reposAlphabeticalOrder map[string]int reposAlphabeticalOrder map[string]int
} }

8
sync.go
View File

@ -94,7 +94,7 @@ func (this *Application) sync(ctx context.Context) (bool, error) {
} }
for i, rr := range repos { for i, rr := range repos {
if idx, ok := this.reposAlphabeticalOrder[rr.Name]; ok && this.reposCache[idx].GiteaUpdated == rr.GiteaUpdated { if idx, ok := this.reposCacheByName[rr.Name]; ok && this.reposCache[idx].GiteaUpdated == rr.GiteaUpdated {
// Already exists in cache with same Gitea update time // Already exists in cache with same Gitea update time
// Copy timestamps // Copy timestamps
repos[i] = this.reposCache[idx] repos[i] = this.reposCache[idx]
@ -156,9 +156,15 @@ func (this *Application) sync(ctx context.Context) (bool, error) {
repos = reordered repos = reordered
} }
reposCacheByName := make(map[string]int, len(repos))
for idx, repo := range repos {
reposCacheByName[repo.Name] = idx
}
// Commit our changes for the other threads to look at // Commit our changes for the other threads to look at
this.reposMut.Lock() this.reposMut.Lock()
this.reposCache = repos this.reposCache = repos
this.reposCacheByName = reposCacheByName
this.reposAlphabeticalOrder = alphabeticalOrderIndexes this.reposAlphabeticalOrder = alphabeticalOrderIndexes
this.reposMut.Unlock() this.reposMut.Unlock()