From d7956dd4957fa6eee5971c072fd7181015fa876c Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Thu, 18 Sep 2014 12:52:45 +0200 Subject: [PATCH] /rest/version should return JSON (fixes #694) --- auto/gui.files.go | 2 +- cmd/syncthing/gui.go | 8 +++++++- gui/app.js | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/auto/gui.files.go b/auto/gui.files.go index 5620d8ff3..fecd731c9 100644 --- a/auto/gui.files.go +++ b/auto/gui.files.go @@ -27,7 +27,7 @@ func Assets() map[string][]byte { bs, _ = ioutil.ReadAll(gr) assets["angular/angular.min.js"] = bs - bs, _ = base64.StdEncoding.DecodeString("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") + bs, _ = base64.StdEncoding.DecodeString("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") gr, _ = gzip.NewReader(bytes.NewBuffer(bs)) bs, _ = ioutil.ReadAll(gr) assets["app.js"] = bs diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go index eedfcefce..a80dc9965 100644 --- a/cmd/syncthing/gui.go +++ b/cmd/syncthing/gui.go @@ -200,7 +200,13 @@ func withModel(m *model.Model, h func(m *model.Model, w http.ResponseWriter, r * } func restGetVersion(w http.ResponseWriter, r *http.Request) { - w.Write([]byte(Version)) + w.Header().Set("Content-Type", "application/json; charset=utf-8") + json.NewEncoder(w).Encode(map[string]string{ + "version": Version, + "longVersion": LongVersion, + "os": runtime.GOOS, + "arch": runtime.GOARCH, + }) } func restGetCompletion(m *model.Model, w http.ResponseWriter, r *http.Request) { diff --git a/gui/app.js b/gui/app.js index aeeff02ec..3bb90935f 100644 --- a/gui/app.js +++ b/gui/app.js @@ -390,7 +390,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca refreshNodeStats(); $http.get(urlbase + '/version').success(function (data) { - $scope.version = data; + $scope.version = data.version; }); $http.get(urlbase + '/report').success(function (data) {