From 9d88c7c467f8d93af4aab9ba0b6d6c01c2ffc546 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 20 八月 2020 20:35:30 +0800
Subject: [PATCH] add get buckets contrl
---
service/SdkDownLoad.go | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/service/SdkDownLoad.go b/service/SdkDownLoad.go
index 1363024..db15569 100644
--- a/service/SdkDownLoad.go
+++ b/service/SdkDownLoad.go
@@ -133,7 +133,8 @@
}
}
-func GetSdkList(sdkName string) []SdkInsOrUpgrade {
+//installedFlag 濡傛灉鏄痶rue,琛ㄧず鍙煡鏈湴鐨勶紝涓嶉渶瑕佹瘮瀵规煡鐪嬫湭瀹夎鐨勭畻娉�
+func GetSdkList(sdkName string, installedFlag bool) []SdkInsOrUpgrade {
var api dbapi.SdkApi
localSdks := api.FindAll(sdkName) //鏈湴宸插畨瑁呮墍鏈夌畻娉�,甯﹂『搴�
if localSdks == nil {
@@ -175,34 +176,36 @@
installedSdks[idx] = siou
}
- //杩滅鍙敤鐨勭畻娉�
- remoteSdks := findAllMySdk()
- logger.Debug("remoteSdks:", remoteSdks)
-
nInsSdks := make([]SdkInsOrUpgrade,0)
- for _,sdk := range remoteSdks {
- if v,ok := localSdkM[sdk.Id];ok { //鏈湴宸插畨瑁�
- ls := v
- if shouldVersionBeUpgrade(ls.Version, sdk.Version) { //鍒ゆ柇鐗堟湰鍙锋槸鍚﹂渶瑕佸崌绾�
- ls.Installed = true
- ls.IsUpgrade = true //闇�瑕佸崌绾�
- ls.RemoteVersion = sdk.Version //杩滅鐨勭増鏈彿
- }
- localSdkM[sdk.Id] = ls
- for index,es := range installedSdks {
- if es.Id == sdk.Id {
- installedSdks[index] = ls
- break
+ if !installedFlag {
+ //杩滅鍙敤鐨勭畻娉�
+ remoteSdks := findAllMySdk()
+ //logger.Debug("remoteSdks:", remoteSdks)
+
+ for _,sdk := range remoteSdks {
+ if v,ok := localSdkM[sdk.Id];ok { //鏈湴宸插畨瑁�
+ ls := v
+ if shouldVersionBeUpgrade(ls.Version, sdk.Version) { //鍒ゆ柇鐗堟湰鍙锋槸鍚﹂渶瑕佸崌绾�
+ ls.Installed = true
+ ls.IsUpgrade = true //闇�瑕佸崌绾�
+ ls.RemoteVersion = sdk.Version //杩滅鐨勭増鏈彿
}
+ localSdkM[sdk.Id] = ls
+ for index,es := range installedSdks {
+ if es.Id == sdk.Id {
+ installedSdks[index] = ls
+ break
+ }
+ }
+ } else { //鏈湴鏈畨瑁咃紝闇�瑕佸畨瑁�
+ bIns := SdkInsOrUpgrade{
+ RemoteVersion: sdk.Version,
+ IsUpgrade: false,
+ Installed: false,
+ }
+ bIns.Sdk = sdk
+ nInsSdks = append(nInsSdks, bIns)
}
- } else { //鏈湴鏈畨瑁咃紝闇�瑕佸畨瑁�
- bIns := SdkInsOrUpgrade{
- RemoteVersion: sdk.Version,
- IsUpgrade: false,
- Installed: false,
- }
- bIns.Sdk = sdk
- nInsSdks = append(nInsSdks, bIns)
}
}
@@ -383,6 +386,9 @@
logger.Debug("DownloadFile err:", err)
return false, err
}
+ if unPackB,unPackErr := unPackPatchPackage(resp.Md5, ext); !unPackB { //瑙ｅ帇澶辫触
+ return false, unPackErr
+ }
b, err := installSdk(resp.Md5, ext)
if b {
return true, nil
--
Gitblit v1.8.0