Skip to content

Commit

Permalink
check if release has suggestions if unknown before downloading, so pr…
Browse files Browse the repository at this point in the history
…ovided suggestions can be used safely
  • Loading branch information
quiquelhappy committed Nov 20, 2021
1 parent e3bfbd3 commit 2c209d7
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 7 deletions.
38 changes: 33 additions & 5 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/api/Globals.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package api

const Version = "1.1.2"
const Version = "1.1.3"
const KeychainService = "grifpkg"
const KeychainHash = "session"
22 changes: 21 additions & 1 deletion src/elements/project/Release.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,31 @@ func (release Release) ListSuggestions() (suggestions []urlSuggestion.UrlSuggest
return suggestions, err
}

func (_ Release) Get(id string) (release Release, err error){
request, err := api.Request("resource/release/get/", map[string]interface{}{
"release": id,
}, nil)
if err != nil {
return Release{}, err
}
err = json.NewDecoder(request).Decode(&release)
if err != nil {
return Release{}, err
}
return release, nil
}

func (release Release) GetDownloadable(suggestionIdFallback interface{}) (downloadableRelease DownloadableRelease, err error) {
api.LogOne(api.Progress, "requesting downloadable release")
downloadableRelease = DownloadableRelease{}
if release.HasSuggestions==nil {
updatedRelease, err := release.Get(release.Id)
if err != nil {
return DownloadableRelease{}, err
}
release.HasSuggestions=updatedRelease.HasSuggestions
}
if release.HasSuggestions!=nil {

if release.HasSuggestions == true {
suggestionList, err := release.ListSuggestions()
if err!=nil {
Expand Down

0 comments on commit 2c209d7

Please sign in to comment.