perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow configuration of releases URL

Browse Source
This commit is contained in:
Jakob Borg
2015-09-10 14:16:44 +02:00
parent 46364a38c6
commit 9dae87c80c
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/config/config.go
View File

@@ -248,6 +248,7 @@ type OptionsConfiguration struct {
PingTimeoutS int `xml:"pingTimeoutS" json:"pingTimeoutS" default:"30"`
PingIdleTimeS int `xml:"pingIdleTimeS" json:"pingIdleTimeS" default:"60"`
MinHomeDiskFreePct float64 `xml:"minHomeDiskFreePct" json:"minHomeDiskFreePct" default:"1"`
ReleasesURL string `xml:"releasesURL" json:"releasesURL" default:"https://api.github.com/repos/syncthing/syncthing/releases?per_page=30"`
}
func (orig OptionsConfiguration) Copy() OptionsConfiguration {

2
lib/config/config_test.go
View File

@@ -63,6 +63,7 @@ func TestDefaultValues(t *testing.T) {
URURL: "https://data.syncthing.net/newdata",
URInitialDelayS: 1800,
URPostInsecurely: false,
ReleasesURL: "https://api.github.com/repos/syncthing/syncthing/releases?per_page=30",
}
cfg := New(device1)
@@ -181,6 +182,7 @@ func TestOverriddenValues(t *testing.T) {
URURL: "https://localhost/newdata",
URInitialDelayS: 800,
URPostInsecurely: true,
ReleasesURL: "https://localhost/releases",
}
cfg, err := Load("testdata/overridenvalues.xml", device1)

1
lib/config/testdata/overridenvalues.xml vendored
View File

@@ -35,5 +35,6 @@
<urURL>https://localhost/newdata</urURL>
<urInitialDelayS>800</urInitialDelayS>
<urPostInsecurely>true</urPostInsecurely>
<releasesURL>https://localhost/releases</releasesURL>
</options>
</configuration>

8
lib/upgrade/upgrade_supported.go
View File

@@ -46,8 +46,8 @@ var insecureHTTP = &http.Client{
// LatestGithubReleases returns the latest releases, including prereleases or
// not depending on the argument
func LatestGithubReleases(version string) ([]Release, error) {
resp, err := insecureHTTP.Get("https://api.github.com/repos/syncthing/syncthing/releases?per_page=30")
func LatestGithubReleases(releasesURL, version string) ([]Release, error) {
resp, err := insecureHTTP.Get(releasesURL)
if err != nil {
return nil, err
}
@@ -74,8 +74,8 @@ func (s SortByRelease) Less(i, j int) bool {
return CompareVersions(s[i].Tag, s[j].Tag) > 0
}
func LatestRelease(version string) (Release, error) {
rels, _ := LatestGithubReleases(version)
func LatestRelease(releasesURL, version string) (Release, error) {
rels, _ := LatestGithubReleases(releasesURL, version)
return SelectLatestRelease(version, rels)
}