Skip to content

Commit 2c209d7

Browse files
committed
check if release has suggestions if unknown before downloading, so provided suggestions can be used safely
1 parent e3bfbd3 commit 2c209d7

3 files changed

Lines changed: 55 additions & 7 deletions

File tree

.idea/workspace.xml

Lines changed: 33 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/api/Globals.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package api
22

3-
const Version = "1.1.2"
3+
const Version = "1.1.3"
44
const KeychainService = "grifpkg"
55
const KeychainHash = "session"

src/elements/project/Release.go

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,31 @@ func (release Release) ListSuggestions() (suggestions []urlSuggestion.UrlSuggest
6363
return suggestions, err
6464
}
6565

66+
func (_ Release) Get(id string) (release Release, err error){
67+
request, err := api.Request("resource/release/get/", map[string]interface{}{
68+
"release": id,
69+
}, nil)
70+
if err != nil {
71+
return Release{}, err
72+
}
73+
err = json.NewDecoder(request).Decode(&release)
74+
if err != nil {
75+
return Release{}, err
76+
}
77+
return release, nil
78+
}
79+
6680
func (release Release) GetDownloadable(suggestionIdFallback interface{}) (downloadableRelease DownloadableRelease, err error) {
6781
api.LogOne(api.Progress, "requesting downloadable release")
6882
downloadableRelease = DownloadableRelease{}
83+
if release.HasSuggestions==nil {
84+
updatedRelease, err := release.Get(release.Id)
85+
if err != nil {
86+
return DownloadableRelease{}, err
87+
}
88+
release.HasSuggestions=updatedRelease.HasSuggestions
89+
}
6990
if release.HasSuggestions!=nil {
70-
7191
if release.HasSuggestions == true {
7292
suggestionList, err := release.ListSuggestions()
7393
if err!=nil {

0 commit comments

Comments
 (0)