Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 解决应用同步可能出现的多个同名应用的问题 #1827

Merged
merged 1 commit into from
Aug 3, 2023
Merged

fix: 解决应用同步可能出现的多个同名应用的问题 #1827

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 37 additions & 30 deletions backend/app/service/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,7 @@ func (a AppService) GetAppUpdate() (*response.AppUpdateRes, error) {
return nil, err
}
appStoreLastModified, _ := strconv.Atoi(setting.AppStoreLastModified)
res.AppStoreLastModified = appStoreLastModified
if setting.AppStoreLastModified == "" || lastModified != appStoreLastModified {
res.CanUpdate = true
return res, err
Expand All @@ -687,13 +688,13 @@ func getAppFromRepo(downloadPath string) error {
return nil
}

func (a AppService) SyncAppListFromRemote() error {
func (a AppService) SyncAppListFromRemote() (err error) {
updateRes, err := a.GetAppUpdate()
if err != nil {
return err
}
if !updateRes.CanUpdate {
return nil
return
}
if err = getAppFromRepo(fmt.Sprintf("%s/%s/1panel.json.zip", global.CONF.System.AppRepo, global.CONF.System.Mode)); err != nil {
return err
Expand All @@ -704,10 +705,19 @@ func (a AppService) SyncAppListFromRemote() error {
return err
}
list := &dto.AppList{}
if err := json.Unmarshal(content, list); err != nil {
if err = json.Unmarshal(content, list); err != nil {
return
}
if err = settingRepo().Update("AppStoreLastModified", strconv.Itoa(list.LastModified)); err != nil {
return err
}

defer func() {
if err != nil {
_ = settingRepo().Update("AppStoreLastModified", strconv.Itoa(updateRes.AppStoreLastModified))
}
}()

var (
tags []*model.Tag
appTags []*model.AppTag
Expand All @@ -721,7 +731,7 @@ func (a AppService) SyncAppListFromRemote() error {
}
oldApps, err := appRepo.GetBy(appRepo.WithResource(constant.AppResourceRemote))
if err != nil {
return err
return
}
for _, old := range oldApps {
oldAppIds = append(oldAppIds, old.ID)
Expand Down Expand Up @@ -810,32 +820,32 @@ func (a AppService) SyncAppListFromRemote() error {
tx, ctx := getTxAndContext()
defer tx.Rollback()
if len(addAppArray) > 0 {
if err := appRepo.BatchCreate(ctx, addAppArray); err != nil {
return err
if err = appRepo.BatchCreate(ctx, addAppArray); err != nil {
return
}
}
if len(deleteAppArray) > 0 {
if err := appRepo.BatchDelete(ctx, deleteAppArray); err != nil {
return err
if err = appRepo.BatchDelete(ctx, deleteAppArray); err != nil {
return
}
if err := appDetailRepo.DeleteByAppIds(ctx, deleteIds); err != nil {
return err
if err = appDetailRepo.DeleteByAppIds(ctx, deleteIds); err != nil {
return
}
}
if err := tagRepo.DeleteAll(ctx); err != nil {
return err
if err = tagRepo.DeleteAll(ctx); err != nil {
return
}
if len(tags) > 0 {
if err := tagRepo.BatchCreate(ctx, tags); err != nil {
return err
if err = tagRepo.BatchCreate(ctx, tags); err != nil {
return
}
for _, t := range tags {
tagMap[t.Key] = t.ID
}
}
for _, update := range updateAppArray {
if err := appRepo.Save(ctx, &update); err != nil {
return err
if err = appRepo.Save(ctx, &update); err != nil {
return
}
}
apps := append(addAppArray, updateAppArray...)
Expand Down Expand Up @@ -879,35 +889,32 @@ func (a AppService) SyncAppListFromRemote() error {
}
}
if len(addDetails) > 0 {
if err := appDetailRepo.BatchCreate(ctx, addDetails); err != nil {
return err
if err = appDetailRepo.BatchCreate(ctx, addDetails); err != nil {
return
}
}
if len(deleteDetails) > 0 {
if err := appDetailRepo.BatchDelete(ctx, deleteDetails); err != nil {
return err
if err = appDetailRepo.BatchDelete(ctx, deleteDetails); err != nil {
return
}
}
for _, u := range updateDetails {
if err := appDetailRepo.Update(ctx, u); err != nil {
return err
if err = appDetailRepo.Update(ctx, u); err != nil {
return
}
}

if len(oldAppIds) > 0 {
if err := appTagRepo.DeleteByAppIds(ctx, oldAppIds); err != nil {
return err
if err = appTagRepo.DeleteByAppIds(ctx, oldAppIds); err != nil {
return
}
}

if len(appTags) > 0 {
if err := appTagRepo.BatchCreate(ctx, appTags); err != nil {
return err
if err = appTagRepo.BatchCreate(ctx, appTags); err != nil {
return
}
}
tx.Commit()
if err := NewISettingService().Update("AppStoreLastModified", strconv.Itoa(list.LastModified)); err != nil {
return err
}
return nil
return
}