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

Handle non-word characters in repo name (fixes #152)

Browse Source
This commit is contained in:
Jakob Borg 2014-04-23 10:04:07 +02:00
parent 71684bfa45
commit 3e4d628f54
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto/gui.files.go
View File

File diff suppressed because one or more lines are too long

19
cmd/syncthing/gui.go
View File

@ -35,11 +35,10 @@ func startGUI(cfg GUIConfiguration, m *Model) {
router := martini.NewRouter() router := martini.NewRouter()
router.Get("/", getRoot) router.Get("/", getRoot)
router.Get("/rest/version", restGetVersion) router.Get("/rest/version", restGetVersion)
router.Get("/rest/model/:repo", restGetModel) router.Get("/rest/model", restGetModel)
router.Get("/rest/connections", restGetConnections) router.Get("/rest/connections", restGetConnections)
router.Get("/rest/config", restGetConfig) router.Get("/rest/config", restGetConfig)
router.Get("/rest/config/sync", restGetConfigInSync) router.Get("/rest/config/sync", restGetConfigInSync)
router.Get("/rest/need/:repo", restGetNeed)
router.Get("/rest/system", restGetSystem) router.Get("/rest/system", restGetSystem)
router.Get("/rest/errors", restGetErrors) router.Get("/rest/errors", restGetErrors)
@ -80,8 +79,9 @@ func restGetVersion() string {
return Version return Version
} }
func restGetModel(m *Model, w http.ResponseWriter, params martini.Params) { func restGetModel(m *Model, w http.ResponseWriter, r *http.Request) {
var repo = params["repo"] var qs = r.URL.Query()
var repo = qs.Get("repo")
var res = make(map[string]interface{}) var res = make(map[string]interface{})
globalFiles, globalDeleted, globalBytes := m.GlobalSize(repo) globalFiles, globalDeleted, globalBytes := m.GlobalSize(repo)
@ -168,17 +168,6 @@ func (f guiFile) MarshalJSON() ([]byte, error) {
}) })
} }
func restGetNeed(m *Model, w http.ResponseWriter, params martini.Params) {
repo := params["repo"]
files := m.NeedFilesRepo(repo)
gfs := make([]guiFile, len(files))
for i, f := range files {
gfs[i] = guiFile(f)
}
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(gfs)
}
var cpuUsagePercent [10]float64 // The last ten seconds var cpuUsagePercent [10]float64 // The last ten seconds
var cpuUsageLock sync.RWMutex var cpuUsageLock sync.RWMutex

2
gui/app.js
View File

@ -82,7 +82,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
getFailed(); getFailed();
}); });
$scope.repos.forEach(function (repo) { $scope.repos.forEach(function (repo) {
$http.get('/rest/model/' + repo.ID).success(function (data) { $http.get('/rest/model?repo=' + encodeURIComponent(repo.ID)).success(function (data) {
$scope.model[repo.ID] = data; $scope.model[repo.ID] = data;
}); });
}); });