Correctly set and clear errors for missing folders (fixes #1937)

gui/index.html

@@ -287,7 +287,7 @@
               <div class="panel-footer">
                 <button class="btn btn-sm btn-danger pull-left" ng-if="folderStatus(folder) == 'idle' && folder.readOnly && model[folder.id].needFiles > 0" ng-click="override(folder.id)" href=""><span class="glyphicon glyphicon-upload"></span>&nbsp;<span translate>Override Changes</span></button>
                 <span class="pull-right">
-                  <button class="btn btn-sm btn-default" href="" ng-show="folderStatus(folder) == 'idle'" ng-click="rescanFolder(folder.id)"><span class="glyphicon glyphicon-refresh"></span>&nbsp;<span translate>Rescan</span></button>
+                  <button class="btn btn-sm btn-default" href="" ng-show="['idle', 'stopped'].indexOf(folderStatus(folder)) > -1" ng-click="rescanFolder(folder.id)"><span class="glyphicon glyphicon-refresh"></span>&nbsp;<span translate>Rescan</span></button>
                   <button class="btn btn-sm btn-default" href="" ng-click="editFolder(folder)"><span class="glyphicon glyphicon-pencil"></span>&nbsp;<span translate>Edit</span></button>
                 </span>
                 <div class="clearfix"></div>

gui/scripts/syncthing/core/controllers/syncthingController.js

@@ -140,6 +140,7 @@ angular.module('syncthing.core')
             var data = arg.data;
             if ($scope.model[data.folder]) {
                 $scope.model[data.folder].state = data.to;
+                $scope.model[data.folder].error = data.error;
             }
         });
 

internal/auto/gui.files.go

@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	AssetsBuildDate = "Fri, 12 Jun 2015 11:24:48 GMT"
+	AssetsBuildDate = "Sat, 13 Jun 2015 18:00:43 GMT"
 )
 
 func Assets() map[string][]byte {
@@ -85,7 +85,7 @@ func Assets() map[string][]byte {
 
 	assets["assets/lang/valid-langs.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/yTMsQrCMBSF4d2nCJm9jyBIRRwUlVhwEIe0jW1oSEuSZvDpe0+6fH8ugZN1EFk7292076M4iI9sermXrS4c+c/41pYrMp1hjAO+QJcKjQU6v7g/CwIzLIxNzDjRVXEdDt8AjHiMzHjNiSq19Vlzw0TqgWIiZiZhcRmZ/0Cn+9b6Lb+7FQAA//8BAAD//9+xfOrFAAAA")
 
-	assets["index.html"], _ = base64.StdEncoding.DecodeString("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 truncated
+	assets["index.html"], _ = base64.StdEncoding.DecodeString("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 truncated
 
 	assets["modal.html"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/3yTUW+bMBDH3/cpbjwsrVRCW/UpSzptkSZN6qRK7csejX2AV2Mj+0jHEN99h2EsrdI9JDbmfnf3/5/ZKn0AaUQIu6R2ShgohMIESOTaKvy1S9KrBGyZCiKfKkEizYV8Ut41u6TvGXUB4ROQbxE2sAokSMsVDMMr6gm73AmvIvXFOYPCnkX6fAy+fQewfZ+mvGQZ7F3TeV1WBGf7c7i+vLqBxwrhobOSKm1L+NxS5XxYx/CJeax0gAfXeonMK4SvztfAZ6HNf6IkIAfESQh9HcAV8eG7+62NEXDf5kbLKdGdlmgDXsBhDdfryzV8K0CA5JYW6v4OnkUA6wiUDuR13hIqeNZUcQDXLLTBiyndD9eCFBZcTkLzYhEEQUXUbLKsnuqvnS8zzppxvWwUlabRkNfDSZUWxpXR2vm8X01vTLnagBG+xMnMU7R0ltDS/P5URIU8fQ/CoKfpP+37caZtGIaFY7K6eQmSJoNHARwSGlbNjepil2gunfwlStM11XgCy46rjMtYY5uN4HGmvo/Zh+Ff+ay6WURkrOJtRblTXfSLvLBBmlbh2+TcbbyWycs8hXN8c44t4JkTa6CuwV0yPSxMThb4lyosRGso7kOdQPwU+MrUesnMiqNT/zHHY+0OuFjzAevQfJyoqMoIwtv92PQcsc2mfk4oXbbzZl7+AAAA//8BAAD//53P618IBAAA")
 
@@ -93,7 +93,7 @@ func Assets() map[string][]byte {
 
 	assets["scripts/syncthing/core/controllers/eventController.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/7RUQW/bPAy951fwKwrYwee56YCdgm6HrQV62mEddhh2UGzaFiBLgSg1CIb891Gy4zqOgw7Dpkscinx8fHrSs7BQ4sbX98+oHcEdVEIRrhcLoWuvhM1bU3qFaUJ7XbhG6jovjMVkuQBe/K2dNUqhTZMI8XEIJBlUnmuk0ZBeU2G2mMF149x2CT9jdViJJwRyVhYu4a7HcJefK0EuwjIx7ZVaDwmBeNh9/MRbq1Fl2CBfFEj0oMM8A4dSODFuHdbNDXxrUMOX43RgkZywLMWukQrBNQjKcHzLQ4V9nlhjhygJpJ7Cba2pGYNi5caaHaEFTibTImyVcJWxLXEb560mEPB2tYKUpC5isylcg6JES9AIgg0y00p5arCEnXRN7NEhMa8SA9Yy67a0gTBwPgV8apj2RpAshFJ7aFHowFW4CDaabujI06DLQOiyS+G6KeiOc7VxIArnI2x/ApVXpwRkBel/cwcRFlpr7IPuDmp9tt0Neho/LE7+9ra5xla6NPn6+FnzmbFZ14szFr153sNqjkqUjk/qXhRN+mIhDF6cyz+iju7SpbSwWGYyiv1t6vQqgl5lEH9zWR6/3D7cmO77giSdBHPREyXO8GagDsvfUXZ8IQOn71Eohbpmy72B2x+nIMMNnZbzmJMzYY89yRaNdyO95zSMT0heo0u9VWxkhP8huYlj0Yd4j+4SDnWtl7Pi5L090+GhuJAXHZn2vpwKlME7vm4vwcPkFerLXn2DzkxbVbOu/TsKKclt7m6Tf6vM7eqiNH/A7jVWs2yCoX8BAAD//wEAAP//TiJq898GAAA=")
 
-	assets["scripts/syncthing/core/controllers/syncthingController.js"], _ = base64.StdEncoding.DecodeString("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 truncated
+	assets["scripts/syncthing/core/controllers/syncthingController.js"], _ = base64.StdEncoding.DecodeString("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 truncated
 
 	assets["scripts/syncthing/core/directives/identiconDirective.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/5xVTVPbMBC951dsZwp2GkcOdHpJ6s4wDMxwgENz6IEyHVdWYk0VKSPLcSnkv3clJ8F2FL50wUj79r2V3m5SOS9FqslCZaVgYVDcS2pyLueEKs2Cfg9wkYxrRg1fYQDPmDScKhlEcBt8rLjMVIXfsxKBXEkIN3t9eHBgu1aphmI1v5lCAkFuzHIcx1VVkeozUXoen45GoxjPg0lvB9nlu9oShqtUlCyCgv9jzeQNAkyfKVouEEGoZqlhF4LZ/26moeOPILA8/ck+OlelyC65EN+x1DODqZ5K0qqKgCrRpbVLM1NqCR+2dZNlqgt2JU2tl9A81ecqY2fGpoGBzQOf6ioiOBn14QhOO4LWh/Rdc62Vfq9Cy2nZ4PjYqUiSBBY8ywQ7R+RLChaOGyMvlW5xP0/rSIeObwgnL9Y5e/sLWJj152te38bZ5/eopYYUDHmN5r9Lg1b/i7YO69eyp1PnuwEER13/HMDfW7x983fiK56ZHHNswW/B5ozPc+MD76Hxaki6XDKZnedcZKFFvOxHG+XZVdX+Jl6hz00b3/lTW8kdrVZnu0gq0qLAGhtDqSPcmS+p/zw+wpf26e5uEuzDEcQurh2yk4kx16nJCWVc1I0UY9vWlm4h+AzqzvdbFQ8wVT0ajJpiLXIe9olmS5FSFsa3P3/8uos5FuV9rBn2nvNUAqOJvW74WquGwUC3h+4ezLV84+JdT36D4ckEhsMDvdWsqjsin5ryOaSj92A8xfkJmzPv9ZQ+2uYEc1PL00vNtT546j/Z323vrHsd+9UDcjV/ktEI2Rw/dDAFWoaaMQQXQdT2OlVLNj5kOgQkQVtNGy64/DNuTFyXLgJWj9AI0m3fFb6r34RtBkkoWdX44XapSN0U3cnSa3+t7zDgPwAAAP//AQAA//9afsjulQgAAA==")
 

internal/model/folderstate.go

@@ -71,7 +71,6 @@ func (s *stateTracker) setState(newState folderState) {
 		}
 
 		s.current = newState
-		s.err = nil
 		s.changed = time.Now()
 
 		events.Default.Log(events.StateChanged, eventData)
@@ -111,3 +110,26 @@ func (s *stateTracker) setError(err error) {
 	}
 	s.mut.Unlock()
 }
+
+// clearError sets the folder state to FolderIdle and clears the error
+func (s *stateTracker) clearError() {
+	s.mut.Lock()
+	if s.current == FolderError {
+		eventData := map[string]interface{}{
+			"folder": s.folder,
+			"to":     FolderIdle.String(),
+			"from":   s.current.String(),
+		}
+
+		if !s.changed.IsZero() {
+			eventData["duration"] = time.Since(s.changed).Seconds()
+		}
+
+		s.current = FolderIdle
+		s.err = nil
+		s.changed = time.Now()
+
+		events.Default.Log(events.StateChanged, eventData)
+	}
+	s.mut.Unlock()
+}

internal/model/model.go

@@ -58,6 +58,7 @@ type service interface {
 
 	setState(state folderState)
 	setError(err error)
+	clearError()
 	getState() (folderState, time.Time, error)
 }
 
@@ -1287,6 +1288,12 @@ nextSub:
 
 	fchan, err := w.Walk()
 	if err != nil {
+		// The error we get here is likely an OS level error, which might not be
+		// as readable as our health check errors. Check if we can get a health
+		// check error first, and use that if it's available.
+		if ferr := m.CheckFolderHealth(folder); ferr != nil {
+			err = ferr
+		}
 		runner.setError(err)
 		return err
 	}
@@ -1714,7 +1721,7 @@ func (m *Model) CheckFolderHealth(id string) error {
 	} else if oldErr != nil {
 		l.Infof("Folder %q error is cleared, restarting", folder.ID)
 		if runnerExists {
-			runner.setState(FolderIdle)
+			runner.clearError()
 		}
 	}