Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 04:44:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix check version (#1103)

Browse Source
This commit is contained in:
bnkai
2021-02-09 12:00:27 +02:00
committed by GitHub
parent 984a0c9247
commit bcbbd1474c
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/api/check_version.go
View File

@@ -18,6 +18,7 @@ const apiReleases string = "https://api.github.com/repos/stashapp/stash/releases
const apiTags string = "https://api.github.com/repos/stashapp/stash/tags" const apiTags string = "https://api.github.com/repos/stashapp/stash/tags"
const apiAcceptHeader string = "application/vnd.github.v3+json" const apiAcceptHeader string = "application/vnd.github.v3+json"
const developmentTag string = "latest_develop" const developmentTag string = "latest_develop"
const defaultSHLength int = 7 // default length of SHA short hash returned by <git rev-parse --short HEAD>
// ErrNoVersion indicates that no version information has been embedded in the // ErrNoVersion indicates that no version information has been embedded in the
// stash binary // stash binary
@@ -191,14 +192,20 @@ func GetLatestVersion(shortHash bool) (latestVersion string, latestRelease strin
} }
func getReleaseHash(release githubReleasesResponse, shortHash bool, usePreRelease bool) string { func getReleaseHash(release githubReleasesResponse, shortHash bool, usePreRelease bool) string {
shaLength := len(release.Target_commitish)
// the /latest API call doesn't return the hash in target_commitish // the /latest API call doesn't return the hash in target_commitish
// also add sanity check in case Target_commitish is not 40 characters // also add sanity check in case Target_commitish is not 40 characters
if !usePreRelease || len(release.Target_commitish) != 40 { if !usePreRelease || shaLength != 40 {
return getShaFromTags(shortHash, release.Tag_name) return getShaFromTags(shortHash, release.Tag_name)
} }
if shortHash { if shortHash {
return release.Target_commitish[0:7] //shorthash is first 7 digits of git commit hash last := defaultSHLength // default length of git short hash
_, gitShort, _ := GetVersion() // retrieve it to check actual length
if len(gitShort) > last && len(gitShort) < shaLength { // sometimes short hash is longer
last = len(gitShort)
}
return release.Target_commitish[0:last]
} }
return release.Target_commitish return release.Target_commitish
@@ -229,14 +236,20 @@ func getShaFromTags(shortHash bool, name string) string {
logger.Errorf("Github Tags Api %v", err) logger.Errorf("Github Tags Api %v", err)
return "" return ""
} }
_, gitShort, _ := GetVersion() // retrieve short hash to check actual length
for _, tag := range tags { for _, tag := range tags {
if tag.Name == name { if tag.Name == name {
if len(tag.Commit.Sha) != 40 { shaLength := len(tag.Commit.Sha)
if shaLength != 40 {
return "" return ""
} }
if shortHash { if shortHash {
return tag.Commit.Sha[0:7] //shorthash is first 7 digits of git commit hash last := defaultSHLength // default length of git short hash
if len(gitShort) > last && len(gitShort) < shaLength { // sometimes short hash is longer
last = len(gitShort)
}
return tag.Commit.Sha[0:last]
} }
return tag.Commit.Sha return tag.Commit.Sha

1
ui/v2.5/src/components/Changelog/versions/v050.md
View File

@@ -29,6 +29,7 @@
* Support configurable number of threads for scanning and generation. * Support configurable number of threads for scanning and generation.
### 🐛 Bug fixes ### 🐛 Bug fixes
* Fix version check sometimes giving incorrect results.
* Fixed stash potentially deleting `downloads` directory when first run. * Fixed stash potentially deleting `downloads` directory when first run.
* Fix sprite generation when generated path has special characters. * Fix sprite generation when generated path has special characters.
* Prevent studio from being set as its own parent * Prevent studio from being set as its own parent