[{"name":"gui/default/syncthing","type":"module","parent":null,"displayName":"gui/default/syncthing"},{"name":"lib","type":"module","parent":null,"displayName":"lib"},{"name":"cmd/syncthing/cli","type":"module","parent":null,"displayName":"cmd/syncthing/cli"},{"name":"gui/default/syncthing/core","type":"folder","parent":"gui/default/syncthing","displayName":"core"},{"name":"gui/default/syncthing/device","type":"folder","parent":"gui/default/syncthing","displayName":"device"},{"name":"gui/default/syncthing/folder","type":"folder","parent":"gui/default/syncthing","displayName":"folder"},{"name":"lib/api","type":"folder","parent":"lib","displayName":"api"},{"name":"lib/config","type":"folder","parent":"lib","displayName":"config"},{"name":"lib/config/mocks","type":"folder","parent":"lib/config","displayName":"mocks"},{"name":"lib/fs","type":"folder","parent":"lib","displayName":"fs"},{"name":"lib/model","type":"folder","parent":"lib","displayName":"model"},{"name":"proto/lib/config","type":"module","parent":null,"displayName":"proto/lib/config"},{"name":"cmd/syncthing/cli/client.go","status":"modified","patch":"@@ -10,8 +10,10 @@ import (\n \t\"bytes\"\n \t\"context\"\n \t\"crypto/tls\"\n+\t\"encoding/json\"\n \t\"errors\"\n \t\"fmt\"\n+\t\"io\"\n \t\"net\"\n \t\"net/http\"\n \t\"strings\"\n@@ -25,6 +27,7 @@ import (\n type APIClient interface {\n \tGet(url string) (*http.Response, error)\n \tPost(url, body string) (*http.Response, error)\n+\tPutJSON(url string, o interface{}) (*http.Response, error)\n }\n \n type apiClient struct {\n@@ -118,20 +121,36 @@ func (c *apiClient) Do(req *http.Request) (*http.Response, error) {\n \treturn resp, checkResponse(resp)\n }\n \n-func (c *apiClient) Get(url string) (*http.Response, error) {\n-\trequest, err := http.NewRequest(\"GET\", c.Endpoint()+\"rest/\"+url, nil)\n+func (c *apiClient) Request(url, method string, r io.Reader) (*http.Response, error) {\n+\trequest, err := http.NewRequest(method, c.Endpoint()+\"rest/\"+url, r)\n \tif err != nil {\n \t\treturn nil, err\n \t}\n \treturn c.Do(request)\n }\n \n-func (c *apiClient) Post(url, body string) (*http.Response, error) {\n-\trequest, err := http.NewRequest(\"POST\", c.Endpoint()+\"rest/\"+url, bytes.NewBufferString(body))\n+func (c *apiClient) RequestString(url, method, data string) (*http.Response, error) {\n+\treturn c.Request(url, method, bytes.NewBufferString(data))\n+}\n+\n+func (c *apiClient) RequestJSON(url, method string, o interface{}) (*http.Response, error) {\n+\tdata, err := json.Marshal(o)\n \tif err != nil {\n \t\treturn nil, err\n \t}\n-\treturn c.Do(request)\n+\treturn c.Request(url, method, bytes.NewBuffer(data))\n+}\n+\n+func (c *apiClient) Get(url string) (*http.Response, error) {\n+\treturn c.RequestString(url, \"GET\", \"\")\n+}\n+\n+func (c *apiClient) Post(url, body string) (*http.Response, error) {\n+\treturn c.RequestString(url, \"POST\", body)\n+}\n+\n+func (c *apiClient) PutJSON(url string, o interface{}) (*http.Response, error) {\n+\treturn c.RequestJSON(url, \"PUT\", o)\n }\n \n var errNotFound = errors.New(\"invalid endpoint or API call\")","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-8771b61617d96c35c7c3660c976cde9a5f98c81c3e18ea29f8508f262dcc98dd","dependencies":[{"status":"no_change","name":"lib/config/wrapper.go"}],"parent":"cmd/syncthing/cli","displayName":"client.go"},{"name":"cmd/syncthing/cli/operations.go","status":"modified","patch":"@@ -8,7 +8,10 @@ package cli\n \n import (\n \t\"fmt\"\n+\t\"path/filepath\"\n \n+\t\"github.com/syncthing/syncthing/lib/config\"\n+\t\"github.com/syncthing/syncthing/lib/fs\"\n \t\"github.com/urfave/cli\"\n )\n \n@@ -38,6 +41,12 @@ var operationCommand = cli.Command{\n \t\t\tArgsUsage: \"[folder id]\",\n \t\t\tAction: expects(1, foldersOverride),\n \t\t},\n+\t\t{\n+\t\t\tName: \"default-ignores\",\n+\t\t\tUsage: \"Set the default ignores (config) from a file\",\n+\t\t\tArgsUsage: \"path\",\n+\t\t\tAction: expects(1, setDefaultIgnores),\n+\t\t},\n \t},\n }\n \n@@ -74,3 +83,18 @@ func foldersOverride(c *cli.Context) error {\n \t}\n \treturn fmt.Errorf(\"Folder \" + rid + \" not found\")\n }\n+\n+func setDefaultIgnores(c *cli.Context) error {\n+\tclient, err := getClientFactory(c).getClient()\n+\tif err != nil {\n+\t\treturn err\n+\t}\n+\tdir, file := filepath.Split(c.Args()[0])\n+\tfilesystem := fs.NewFilesystem(fs.FilesystemTypeBasic, dir)\n+\tlines, err := fs.ReadLines(filesystem, file)\n+\tif err != nil {\n+\t\treturn err\n+\t}\n+\t_, err = client.PutJSON(\"config/defaults/ignores\", config.Ignores{Lines: lines})\n+\treturn err\n+}","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-0203e15bce4af57317372534813a153d0f3febe7933a70f86489911625130f28","dependencies":[{"status":"added","name":"lib/fs/filesystem.go"},{"status":"added","name":"lib/fs/util.go"}],"parent":"cmd/syncthing/cli","displayName":"operations.go"},{"name":"gui/default/syncthing/core/syncthingController.js","status":"modified","patch":"@@ -406,8 +406,16 @@ angular.module('syncthing.core')\n console.log(\"FolderScanProgress\", data);\n });\n \n+ // May be called through .error with the presented arguments, or through\n+ // .catch with the http response object containing the same arguments.\n $scope.emitHTTPError = function (data, status, headers, config) {\n- $scope.$emit('HTTPError', { data: data, status: status, headers: headers, config: config });\n+ var out;\n+ if (out && out.data) {\n+ out = data;\n+ } else {\n+ out = { data: data, status: status, headers: headers, config: config };\n+ }\n+ $scope.$emit('HTTPError', out);\n };\n \n var debouncedFuncs = {};\n@@ -735,7 +743,7 @@ angular.module('syncthing.core')\n }\n \n function shouldSetDefaultFolderPath() {\n- return $scope.config.defaults.folder.path && !$scope.editingExisting && $scope.folderEditor.folderPath.$pristine && !$scope.editingDefaults;\n+ return $scope.config.defaults.folder.path && $scope.folderEditor.folderPath.$pristine && $scope.currentFolder._editing == \"add\";\n }\n \n function resetRemoteNeed() {\n@@ -744,7 +752,6 @@ angular.module('syncthing.core')\n $scope.remoteNeedDevice = undefined;\n }\n \n-\n function setDefaultTheme() {\n if (!document.getElementById(\"fallback-theme-css\")) {\n \n@@ -762,7 +769,7 @@ angular.module('syncthing.core')\n }\n \n function saveIgnores(ignores, cb) {\n- $http.post(urlbase + '/db/ignores?folder=' + encodeURIComponent($scope.currentFolder.id), {\n+ return $http.post(urlbase + '/db/ignores?folder=' + encodeURIComponent($scope.currentFolder.id), {\n ignore: ignores\n }).success(function () {\n if (cb) {\n@@ -1413,7 +1420,7 @@ angular.module('syncthing.core')\n 'Content-Type': 'application/json'\n }\n };\n- $http.put(urlbase + '/config', cfg, opts).success(function () {\n+ return $http.put(urlbase + '/config', cfg, opts).success(function () {\n refreshConfig();\n \n if (callback) {\n@@ -1568,14 +1575,16 @@ angular.module('syncthing.core')\n }\n \n $scope.editDeviceModalTitle = function() {\n- if ($scope.editingDefaults) {\n- return $translate.instant(\"Edit Device Defaults\");\n- }\n var title = '';\n- if ($scope.editingExisting) {\n+ switch ($scope.currentFolder._editing) {\n+ case \"existing\":\n title += $translate.instant(\"Edit Device\");\n- } else {\n+ break;\n+ case \"add\":\n title += $translate.instant(\"Add Device\");\n+ break;\n+ case \"defaults\":\n+ return $translate.instant(\"Edit Device Defaults\");\n }\n var name = $scope.deviceName($scope.currentDevice);\n if (name !== '') {\n@@ -1585,16 +1594,15 @@ angular.module('syncthing.core')\n };\n \n $scope.editDeviceModalIcon = function() {\n- if ($scope.editingDefaults || $scope.editingExisting) {\n+ if ($scope.has([\"existing\", \"defaults\"], $scope.currentDevice._editing)) {\n return 'fas fa-pencil-alt';\n }\n return 'fas fa-desktop';\n };\n \n $scope.editDeviceExisting = function (deviceCfg) {\n $scope.currentDevice = $.extend({}, deviceCfg);\n- $scope.editingExisting = true;\n- $scope.editingDefaults = false;\n+ $scope.currentDevice._editing = \"existing\";\n $scope.willBeReintroducedBy = undefined;\n if (deviceCfg.introducedBy) {\n var introducerDevice = $scope.devices[deviceCfg.introducedBy];\n@@ -1623,7 +1631,7 @@ angular.module('syncthing.core')\n $scope.editDeviceDefaults = function () {\n $http.get(urlbase + '/config/defaults/device').then(function (p) {\n $scope.currentDevice = p.data;\n- $scope.editingDefaults = true;\n+ $scope.currentDevice._editing = \"defaults\";\n editDeviceModal();\n }, $scope.emitHTTPError);\n };\n@@ -1661,8 +1669,7 @@ angular.module('syncthing.core')\n $scope.currentDevice = p.data;\n $scope.currentDevice.name = name;\n $scope.currentDevice.deviceID = deviceID;\n- $scope.editingExisting = false;\n- $scope.editingDefaults = false;\n+ $scope.currentDevice._editing = \"add\";\n initShareEditing('device');\n $scope.currentSharing.unrelated = $scope.folderList();\n editDeviceModal();\n@@ -1672,7 +1679,7 @@ angular.module('syncthing.core')\n \n $scope.deleteDevice = function () {\n $('#editDevice').modal('hide');\n- if (!$scope.editingExisting) {\n+ if ($scope.currentDevice._editing != \"existing\") {\n return;\n }\n \n@@ -1695,7 +1702,7 @@ angular.module('syncthing.core')\n return x.trim();\n });\n delete $scope.currentDevice._addressesStr;\n- if ($scope.editingDefaults) {\n+ if ($scope.currentFolder._editing == \"defaults\") {\n $scope.config.defaults.device = $scope.currentDevice;\n } else {\n setDeviceConfig();\n@@ -1944,18 +1951,25 @@ angular.module('syncthing.core')\n $('.nav-tabs a[href=\"#folder-general\"]').tab('show');\n window.location.hash = \"\";\n $scope.currentFolder = {};\n+ $scope.ignores = {};\n });\n };\n \n $scope.editFolderModalTitle = function() {\n- if ($scope.editingDefaults) {\n- return $translate.instant(\"Edit Folder Defaults\");\n- }\n var title = '';\n- if ($scope.editingExisting) {\n+ switch ($scope.currentFolder._editing) {\n+ case \"existing\":\n title += $translate.instant(\"Edit Folder\");\n- } else {\n+ break;\n+ case \"add\":\n title += $translate.instant(\"Add Folder\");\n+ break;\n+ case \"add-ignores\":\n+ title += $translate.instant(\"Set Ignores on Added Folder\");\n+ break;\n+ case \"defaults\":\n+ return $translate.instant(\"Edit Folder Defaults\");\n+ break;\n }\n if ($scope.currentFolder.id !== '') {\n title += ' (' + $scope.folderLabel($scope.currentFolder.id) + ')';\n@@ -1964,7 +1978,7 @@ angular.module('syncthing.core')\n };\n \n $scope.editFolderModalIcon = function() {\n- if ($scope.editingDefaults || $scope.editingExisting) {\n+ if ($scope.has([\"existing\", \"defaults\"], $scope.currentFolder._editing)) {\n return 'fas fa-pencil-alt';\n }\n return 'fas fa-folder';\n@@ -2020,38 +2034,51 @@ angular.module('syncthing.core')\n };\n \n $scope.editFolderExisting = function(folderCfg) {\n- $scope.editingExisting = true;\n- $scope.editingDefaults = false;\n $scope.currentFolder = angular.copy(folderCfg);\n+ $scope.currentFolder._editing = \"existing\";\n+ editFolderLoadIgnores();\n+ editFolder();\n+ };\n \n+ function editFolderLoadIgnores() {\n $scope.ignores.text = 'Loading...';\n $scope.ignores.error = null;\n $scope.ignores.disabled = true;\n- $http.get(urlbase + '/db/ignores?folder=' + encodeURIComponent($scope.currentFolder.id))\n- .success(function (data) {\n- $scope.currentFolder.ignores = data.ignore || [];\n- $scope.ignores.text = $scope.currentFolder.ignores.join('\\n');\n- $scope.ignores.error = data.error;\n- $scope.ignores.disabled = false;\n+ return $http.get(urlbase + '/db/ignores?folder=' + encodeURIComponent($scope.currentFolder.id))\n+ .then(function(r) {\n+ editFolderInitIgnores(r.data.ignore);\n+ $scope.ignores.error = r.data.error;\n })\n- .error(function (err) {\n+ .catch(function (response) {\n $scope.ignores.text = $translate.instant(\"Failed to load ignore patterns.\");\n- $scope.emitHTTPError(err);\n+ $scope.emitHTTPError(response);\n });\n-\n- editFolder();\n- };\n+ }\n \n $scope.editFolderDefaults = function() {\n- $http.get(urlbase + '/config/defaults/folder')\n- .success(function (data) {\n- $scope.currentFolder = data;\n- $scope.editingExisting = false;\n- $scope.editingDefaults = true;\n- editFolder();\n- })\n- .error($scope.emitHTTPError);\n- };\n+ $q.all([\n+ $http.get(urlbase + '/config/defaults/folder').then(function (response) {\n+ $scope.currentFolder = response.data;\n+ }),\n+ editFolderInitIgnoresDefault(),\n+ ]).then(function() {\n+ $scope.currentFolder._editing = \"defaults\";\n+ editFolder();\n+ }).catch($scope.emitHTTPError);\n+ };\n+\n+ function editFolderInitIgnoresDefault() {\n+ return $http.get(urlbase + '/config/defaults/ignores').then(function (r) {\n+ editFolderInitIgnores(r.data.lines);\n+ });\n+ }\n+\n+ function editFolderInitIgnores(lines) {\n+ $scope.ignores.originalLines = lines || [];\n+ $scope.ignores.text = $scope.ignores.originalLines.join('\\n');\n+ $scope.ignores.error = undefined;\n+ $scope.ignores.disabled = false;\n+ }\n \n $scope.selectAllSharedDevices = function (state) {\n var devices = $scope.currentSharing.shared;\n@@ -2080,9 +2107,6 @@ angular.module('syncthing.core')\n \n $scope.addFolderAndShare = function (folderID, pendingFolder, device) {\n addFolderInit(folderID).then(function() {\n- $scope.currentFolder.viewFlags = {\n- importFromOtherDevice: true\n- };\n $scope.currentSharing.selected[device] = true;\n $scope.currentFolder.label = pendingFolder.offeredBy[device].label;\n for (var k in pendingFolder.offeredBy) {\n@@ -2097,19 +2121,13 @@ angular.module('syncthing.core')\n };\n \n function addFolderInit(folderID) {\n- $scope.editingExisting = false;\n- $scope.editingDefaults = false;\n- return $http.get(urlbase + '/config/defaults/folder').then(function(p) {\n- $scope.currentFolder = p.data;\n+ return $http.get(urlbase + '/config/defaults/folder').then(function (response) {\n+ $scope.currentFolder = response.data;\n+ $scope.currentFolder._editing = \"add\";\n $scope.currentFolder.id = folderID;\n-\n initShareEditing('folder');\n $scope.currentSharing.unrelated = $scope.currentSharing.unrelated.concat($scope.currentSharing.shared);\n $scope.currentSharing.shared = [];\n-\n- $scope.ignores.text = '';\n- $scope.ignores.error = null;\n- $scope.ignores.disabled = false;\n }, $scope.emitHTTPError);\n }\n \n@@ -2122,8 +2140,12 @@ angular.module('syncthing.core')\n };\n \n $scope.saveFolder = function () {\n- $('#editFolder').modal('hide');\n var folderCfg = angular.copy($scope.currentFolder);\n+ if ($scope.currentFolder._editing == \"add-ignores\") {\n+ saveFolderAddIgnores(folderCfg.id);\n+ return;\n+ }\n+\n $scope.currentSharing.selected[$scope.myID] = true;\n var newDevices = [];\n folderCfg.devices.forEach(function (dev) {\n@@ -2171,45 +2193,71 @@ angular.module('syncthing.core')\n }\n delete folderCfg._guiVersioning;\n \n- if ($scope.editingDefaults) {\n+ var done = true;\n+ var promises = [];\n+ if ($scope.currentFolder._editing == \"defaults\") {\n+ $scope.config.defaults.ignores.lines = ignoresArray();\n $scope.config.defaults.folder = folderCfg;\n- $scope.saveConfig();\n } else {\n- saveFolderExisting(folderCfg);\n- }\n- };\n+ $scope.folders[folderCfg.id] = folderCfg;\n+ $scope.config.folders = folderList($scope.folders);\n \n- function saveFolderExisting(folderCfg) {\n- var ignoresLoaded = !$scope.ignores.disabled;\n- var ignores = $scope.ignores.text.split('\\n');\n- // Split always returns a minimum 1-length array even for no patterns\n- if (ignores.length === 1 && ignores[0] === \"\") {\n- ignores = [];\n+ if ($scope.currentFolder._editing == \"existing\") {\n+ promises.push($q.when(saveFolderIgnoresExisting(folderCfg)));\n+ }\n }\n- if (!$scope.editingExisting && ignores.length) {\n- folderCfg.paused = true;\n+\n+ if ($scope.currentFolder._addIgnores) {\n+ // Set ignores after adding the folder\n+ promises.push($scope.saveConfig().then(editFolderLoadIgnores).then(function() {\n+ if (!$scope.ignores.error && !$scope.ignores.text) {\n+ editFolderInitIgnoresDefault();\n+ };\n+ }));\n+ $scope.currentFolder._editing = \"add-ignores\";\n+ $('.nav-tabs a[href=\"#folder-ignores\"]').tab('show');\n+ done = false;\n+ } else {\n+ promises.push($scope.saveConfig());\n };\n \n- $scope.folders[folderCfg.id] = folderCfg;\n- $scope.config.folders = folderList($scope.folders);\n+ $q.all(promises).then(function() {\n+ if (done) {\n+ $('#editFolder').modal('hide');\n+ }\n+ });\n+ };\n \n- function arrayEquals(a, b) {\n- return a.length === b.length && a.every(function(v, i) { return v === b[i] });\n+ function saveFolderIgnoresExisting(folderCfg) {\n+ if ($scope.ignores.disabled) {\n+ return;\n }\n+ var ignores = ignoresArray();\n \n- if (ignoresLoaded && $scope.editingExisting && !arrayEquals(ignores, folderCfg.ignores)) {\n- saveIgnores(ignores);\n+ function arrayDiffers(a, b) {\n+ return !a !== !b || a.length !== b.length || a.some(function(v, i) { return v !== b[i]; });\n+ }\n+ if (arrayDiffers(ignores, $scope.ignores.originalLines)) {\n+ return saveIgnores(ignores);\n };\n+ }\n \n- $scope.saveConfig(function () {\n- if (!$scope.editingExisting && ignores.length) {\n- saveIgnores(ignores, function () {\n- $scope.setFolderPause(folderCfg.id, false);\n- });\n- }\n+ function saveFolderAddIgnores(folderID) {\n+ saveIgnores(ignoresArray(), function () {\n+ $scope.setFolderPause(folderID, false);\n+ $('#editFolder').modal('hide');\n });\n };\n \n+ function ignoresArray() {\n+ var ignores = $scope.ignores.text.split('\\n');\n+ // Split always returns a minimum 1-length array even for no patterns\n+ if (ignores.length === 1 && ignores[0] === \"\") {\n+ ignores = [];\n+ }\n+ return ignores;\n+ }\n+\n $scope.ignoreFolder = function (device, folderID, offeringDevice) {\n var ignoredFolder = {\n id: folderID,\n@@ -2263,7 +2311,7 @@ angular.module('syncthing.core')\n \n $scope.deleteFolder = function (id) {\n $('#editFolder').modal('hide');\n- if (!$scope.editingExisting) {\n+ if ($scope.currentFolder._editing != \"existing\") {\n return;\n }\n \n@@ -2818,6 +2866,10 @@ angular.module('syncthing.core')\n return Object.keys(dict).length;\n };\n \n+ $scope.has = function (array, element) {\n+ return array.indexOf(element) >= 0;\n+ };\n+\n $scope.dismissNotification = function (id) {\n var idx = $scope.config.options.unackedNotificationIDs.indexOf(id);\n if (idx > -1) {","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-77bf455925e2b856359d0a3f63bd07b75fe2990adf70d4996de0df0a0cfe8b29","dependencies":[],"parent":"gui/default/syncthing/core","displayName":"syncthingController.js"},{"name":"gui/default/syncthing/core/uniqueFolderDirective.js","status":"modified","patch":"@@ -4,7 +4,7 @@ angular.module('syncthing.core')\n require: 'ngModel',\n link: function (scope, elm, attrs, ctrl) {\n ctrl.$parsers.unshift(function (viewValue) {\n- if (scope.editingExisting) {\n+ if (scope.currentFolder._editing != \"add\") {\n // we shouldn't validate\n ctrl.$setValidity('uniqueFolder', true);\n } else if (scope.folders.hasOwnProperty(viewValue)) {","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-453e3cf3dcae5351dbe469387d58fc751be4167c63e0cdbdca2edad02190caf2","dependencies":[],"parent":"gui/default/syncthing/core","displayName":"uniqueFolderDirective.js"},{"name":"gui/default/syncthing/core/validDeviceidDirective.js","status":"modified","patch":"@@ -4,7 +4,7 @@ angular.module('syncthing.core')\n require: 'ngModel',\n link: function (scope, elm, attrs, ctrl) {\n ctrl.$parsers.unshift(function (viewValue) {\n- if (scope.editingExisting) {\n+ if (scope.currentDevice._editing != \"add\") {\n // we shouldn't validate\n ctrl.$setValidity('validDeviceid', true);\n } else {","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-d4a0197f9476feca453a8217e3defeb0fb329190df2a170b98e566f22f6f1e77","dependencies":[],"parent":"gui/default/syncthing/core","displayName":"validDeviceidDirective.js"},{"name":"gui/default/syncthing/device/editDeviceModalView.html","status":"modified","patch":"@@ -3,14 +3,14 @@\n

\n-

\n+

\n Device ID\n-

\n+

\n \n \n

\n-

\n+

\n Device Name\n@@ -38,7 +38,7 @@\n

Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.

\n-

\n+

\n@@ -151,13 +151,13 @@\n \n- \n \n-

\n+

\n ","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-6c8de100a89efb0a1cdfecfc4e3ce5a995fccfb5fbfc7d9b1a249116d3f5f635","dependencies":[],"parent":"gui/default/syncthing/device","displayName":"editDeviceModalView.html"},{"name":"gui/default/syncthing/folder/editFolderModalView.html","status":"modified","patch":"@@ -2,44 +2,44 @@\n

\n \n

\n-

\n+

\n Folder Label\n \n

\n Optional descriptive label for the folder. Can be different on each device.\n

\n-

\n+

\n Folder ID\n- \n+ \n

\n Required identifier for the folder. Must be the same on all cluster devices.\n The folder ID must be unique.\n The folder ID cannot be blank.\n- When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.\n+ When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.\n

\n-

\n+

\n Folder Path\n- \n+ \n \n \n

\n Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for {{system.tilde}}.
\n- The folder path cannot be blank.\n+ The folder path cannot be blank.\n Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".\n Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).\n- \n+ \n Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".\n Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).\n \n@@ -148,33 +148,42 @@\n

\n \n-

\n-

Enter ignore patterns, one per line.

\n-

\n- \n-

\n- {{ignores.error}}\n-

\n+

\n+ \n+ Add ignore patterns\n+ \n+

Ignore patterns can only be added after the folder is created. If checked, an input field to enter ignore patterns will be presented after saving.

\n+

Enter ignore patterns, one per line.

\n+

\n+ \n+

\n+ {{ignores.error}}\n+

\n+

Quick guide to supported patterns (full documentation):

\n+

(?d): Prefix indicating that the file can be deleted if preventing directory removal
(?i): Prefix indicating that the pattern should be matched without case sensitivity
!: Inversion of the given condition (i.e. do not exclude)
*: Single level wildcard (matches within a directory only)
**: Multi level wildcard (matches multiple directory levels)
//: Comment, when used at the start of a line

\n+

\n+ Editing {%path%}.\n+

\n-

Quick guide to supported patterns (full documentation):

\n-

(?d): Prefix indicating that the file can be deleted if preventing directory removal
(?i): Prefix indicating that the pattern should be matched without case sensitivity
!: Inversion of the given condition (i.e. do not exclude)
*: Single level wildcard (matches within a directory only)
**: Multi level wildcard (matches multiple directory levels)
//: Comment, when used at the start of a line

\n-

\n- Editing {%path%}.\n- Creating ignore patterns, overwriting an existing file at {%path%}.\n

\n \n

\n@@ -205,17 +214,17 @@\n

\n Folder Type\n Help\n- \n \n \n \n- \n+ \n \n

Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.

Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.

Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.

\n-

Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.

\n-

Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.

\n+

Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.

\n+

Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.

\n File Pull Order\n@@ -274,7 +283,7 @@\n \n- \n

","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-3139517070183b3b1bca743d8ac119fb3fb28f100a1c8a719b155b7d5e29d6da","dependencies":[],"parent":"gui/default/syncthing/folder","displayName":"editFolderModalView.html"},{"name":"lib/api/api.go","status":"modified","patch":"@@ -312,6 +312,7 @@ func (s *service) Serve(ctx context.Context) error {\n \tconfigBuilder.registerDevice(\"/rest/config/devices/:id\")\n \tconfigBuilder.registerDefaultFolder(\"/rest/config/defaults/folder\")\n \tconfigBuilder.registerDefaultDevice(\"/rest/config/defaults/device\")\n+\tconfigBuilder.registerDefaultIgnores(\"/rest/config/defaults/ignores\")\n \tconfigBuilder.registerOptions(\"/rest/config/options\")\n \tconfigBuilder.registerLDAP(\"/rest/config/ldap\")\n \tconfigBuilder.registerGUI(\"/rest/config/gui\")","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-e2e14f22d818b8e635572ef0ee7718dee875c365e07225d760a6faae8be7772d","dependencies":[{"status":"no_change","name":"lib/config/wrapper.go"},{"status":"no_change","name":"lib/model/model.go"},{"status":"no_change","name":"lib/fs/util.go"},{"status":"no_change","name":"lib/fs/filesystem.go"}],"parent":"lib/api","displayName":"api.go"},{"name":"lib/api/confighandler.go","status":"modified","patch":"@@ -231,6 +231,28 @@ func (c *configMuxBuilder) registerDefaultDevice(path string) {\n \t})\n }\n \n+func (c *configMuxBuilder) registerDefaultIgnores(path string) {\n+\tc.HandlerFunc(http.MethodGet, path, func(w http.ResponseWriter, _ *http.Request) {\n+\t\tsendJSON(w, c.cfg.DefaultIgnores())\n+\t})\n+\n+\tc.HandlerFunc(http.MethodPut, path, func(w http.ResponseWriter, r *http.Request) {\n+\t\tvar ignores config.Ignores\n+\t\tif err := unmarshalTo(r.Body, &ignores); err != nil {\n+\t\t\thttp.Error(w, err.Error(), http.StatusBadRequest)\n+\t\t\treturn\n+\t\t}\n+\t\twaiter, err := c.cfg.Modify(func(cfg *config.Configuration) {\n+\t\t\tcfg.Defaults.Ignores = ignores\n+\t\t})\n+\t\tif err != nil {\n+\t\t\thttp.Error(w, err.Error(), http.StatusInternalServerError)\n+\t\t\treturn\n+\t\t}\n+\t\tc.finish(w, waiter)\n+\t})\n+}\n+\n func (c *configMuxBuilder) registerOptions(path string) {\n \tc.HandlerFunc(http.MethodGet, path, func(w http.ResponseWriter, _ *http.Request) {\n \t\tsendJSON(w, c.cfg.Options())","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-d023a22158c94fbe0f327b4c53e97363cc23528e360471372401507c83635500","dependencies":[{"status":"no_change","name":"lib/config/config.go"},{"status":"no_change","name":"lib/config/wrapper.go"}],"parent":"lib/api","displayName":"confighandler.go"},{"name":"lib/config/config.go","status":"modified","patch":"@@ -628,3 +628,9 @@ func ensureZeroForNodefault(empty interface{}, target interface{}) {\n \t\treturn len(v) > 0\n \t})\n }\n+\n+func (i Ignores) Copy() Ignores {\n+\tout := Ignores{Lines: make([]string, len(i.Lines))}\n+\tcopy(out.Lines, i.Lines)\n+\treturn out\n+}","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-93d8339f7c1b5a7422622e5e8bfda827d4d8f716dd6784553a9f8981433ebd58","dependencies":[{"status":"no_change","name":"lib/config/config.pb.go"},{"status":"no_change","name":"lib/fs/filesystem.go"}],"metadata":[{"name":"lib/config/config_test.go","status":"modified","type":"tests","patch":"@@ -114,6 +114,9 @@ func TestDefaultValues(t *testing.T) {\n \t\t\t\tCompression: protocol.CompressionMetadata,\n \t\t\t\tIgnoredFolders: []ObservedFolder{},\n \t\t\t},\n+\t\t\tIgnores: Ignores{\n+\t\t\t\tLines: []string{},\n+\t\t\t},\n \t\t},\n \t\tIgnoredDevices: []ObservedDevice{},\n \t}","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-84b05753c64da51e2a399c0dd88f23e93e214139b06e3dba177ea7bd3ad8b4e9"}],"parent":"lib/config","displayName":"config.go"},{"name":"lib/config/config.pb.go","status":"modified","patch":"@@ -69,8 +69,9 @@ func (m *Configuration) XXX_DiscardUnknown() {\n var xxx_messageInfo_Configuration proto.InternalMessageInfo\n \n type Defaults struct {\n-\tFolder FolderConfiguration `protobuf:\"bytes,1,opt,name=folder,proto3\" json:\"folder\" xml:\"folder\"`\n-\tDevice DeviceConfiguration `protobuf:\"bytes,2,opt,name=device,proto3\" json:\"device\" xml:\"device\"`\n+\tFolder FolderConfiguration `protobuf:\"bytes,1,opt,name=folder,proto3\" json:\"folder\" xml:\"folder\"`\n+\tDevice DeviceConfiguration `protobuf:\"bytes,2,opt,name=device,proto3\" json:\"device\" xml:\"device\"`\n+\tIgnores Ignores `protobuf:\"bytes,3,opt,name=ignores,proto3\" json:\"ignores\" xml:\"ignores\"`\n }\n \n func (m *Defaults) Reset() { *m = Defaults{} }\n@@ -106,56 +107,98 @@ func (m *Defaults) XXX_DiscardUnknown() {\n \n var xxx_messageInfo_Defaults proto.InternalMessageInfo\n \n+type Ignores struct {\n+\tLines []string `protobuf:\"bytes,1,rep,name=lines,proto3\" json:\"lines\" xml:\"line\"`\n+}\n+\n+func (m *Ignores) Reset() { *m = Ignores{} }\n+func (m *Ignores) String() string { return proto.CompactTextString(m) }\n+func (*Ignores) ProtoMessage() {}\n+func (*Ignores) Descriptor() ([]byte, []int) {\n+\treturn fileDescriptor_baadf209193dc627, []int{2}\n+}\n+func (m *Ignores) XXX_Unmarshal(b []byte) error {\n+\treturn m.Unmarshal(b)\n+}\n+func (m *Ignores) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {\n+\tif deterministic {\n+\t\treturn xxx_messageInfo_Ignores.Marshal(b, m, deterministic)\n+\t} else {\n+\t\tb = b[:cap(b)]\n+\t\tn, err := m.MarshalToSizedBuffer(b)\n+\t\tif err != nil {\n+\t\t\treturn nil, err\n+\t\t}\n+\t\treturn b[:n], nil\n+\t}\n+}\n+func (m *Ignores) XXX_Merge(src proto.Message) {\n+\txxx_messageInfo_Ignores.Merge(m, src)\n+}\n+func (m *Ignores) XXX_Size() int {\n+\treturn m.ProtoSize()\n+}\n+func (m *Ignores) XXX_DiscardUnknown() {\n+\txxx_messageInfo_Ignores.DiscardUnknown(m)\n+}\n+\n+var xxx_messageInfo_Ignores proto.InternalMessageInfo\n+\n func init() {\n \tproto.RegisterType((*Configuration)(nil), \"config.Configuration\")\n \tproto.RegisterType((*Defaults)(nil), \"config.Defaults\")\n+\tproto.RegisterType((*Ignores)(nil), \"config.Ignores\")\n }\n \n func init() { proto.RegisterFile(\"lib/config/config.proto\", fileDescriptor_baadf209193dc627) }\n \n var fileDescriptor_baadf209193dc627 = []byte{\n-\t// 654 bytes of a gzipped FileDescriptorProto\n-\t0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xcd, 0x6e, 0xd3, 0x40,\n-\t0x10, 0xc7, 0xed, 0xa6, 0x4d, 0xda, 0xed, 0x17, 0x32, 0x08, 0x5c, 0x3e, 0xbc, 0x61, 0x15, 0x50,\n-\t0x41, 0xa5, 0x95, 0xca, 0x05, 0x71, 0x23, 0x44, 0x94, 0x0a, 0x24, 0x2a, 0xa3, 0x22, 0xe0, 0x82,\n-\t0x92, 0x78, 0xeb, 0xae, 0x94, 0xd8, 0x96, 0xbd, 0xae, 0xda, 0x47, 0xe0, 0x86, 0x78, 0x02, 0x4e,\n-\t0x48, 0xdc, 0x79, 0x88, 0xdc, 0x92, 0x23, 0xa7, 0x95, 0x9a, 0xdc, 0x7c, 0xf4, 0x91, 0x13, 0xda,\n-\t0x0f, 0xbb, 0xb6, 0x6a, 0xe0, 0x64, 0xcf, 0xfc, 0xff, 0xf3, 0x9b, 0xd5, 0x78, 0xc7, 0xe0, 0xc6,\n-\t0x80, 0xf4, 0x76, 0xfa, 0xbe, 0x77, 0x44, 0x5c, 0xf5, 0xd8, 0x0e, 0x42, 0x9f, 0xfa, 0x46, 0x5d,\n-\t0x46, 0x37, 0x5b, 0x05, 0xc3, 0x91, 0x3f, 0x70, 0x70, 0x28, 0x83, 0x38, 0xec, 0x52, 0xe2, 0x7b,\n-\t0xd2, 0x5d, 0x72, 0x39, 0xf8, 0x84, 0xf4, 0x71, 0x95, 0xeb, 0x6e, 0xc1, 0xe5, 0xc6, 0xa4, 0xca,\n-\t0x82, 0x0a, 0x96, 0x81, 0xd3, 0x0d, 0xaa, 0x3c, 0xf7, 0x0a, 0x1e, 0x3f, 0xe0, 0x42, 0x54, 0x65,\n-\t0xdb, 0x28, 0xda, 0x7a, 0x11, 0x0e, 0x4f, 0xb0, 0xa3, 0xa4, 0x25, 0x7c, 0x4a, 0xe5, 0x2b, 0xfa,\n-\t0xde, 0x00, 0xab, 0xcf, 0x8b, 0xd5, 0x86, 0x0d, 0x1a, 0x27, 0x38, 0x8c, 0x88, 0xef, 0x99, 0x7a,\n-\t0x53, 0xdf, 0x5c, 0x68, 0x3f, 0x49, 0x18, 0xcc, 0x52, 0x29, 0x83, 0xc6, 0xe9, 0x70, 0xf0, 0x14,\n-\t0xa9, 0x78, 0xab, 0x4b, 0x69, 0x88, 0x7e, 0x33, 0x58, 0x23, 0x1e, 0x4d, 0xc6, 0xad, 0x95, 0x62,\n-\t0xde, 0xce, 0xaa, 0x8c, 0x77, 0xa0, 0x21, 0x87, 0x17, 0x99, 0x73, 0xcd, 0xda, 0xe6, 0xf2, 0xee,\n-\t0xad, 0x6d, 0x35, 0xed, 0x17, 0x22, 0x5d, 0x3a, 0x41, 0x1b, 0x8e, 0x18, 0xd4, 0x78, 0x53, 0x55,\n-\t0x93, 0x32, 0xb8, 0x22, 0x9a, 0xca, 0x18, 0xd9, 0x99, 0xc0, 0xb9, 0x72, 0xdc, 0x91, 0x59, 0x2b,\n-\t0x73, 0x3b, 0x22, 0xfd, 0x17, 0xae, 0xaa, 0xc9, 0xb9, 0x32, 0x46, 0x76, 0x26, 0x18, 0x36, 0xa8,\n-\t0xb9, 0x31, 0x31, 0xe7, 0x9b, 0xfa, 0xe6, 0xf2, 0xae, 0x99, 0x31, 0xf7, 0x0e, 0xf7, 0xcb, 0xc0,\n-\t0xfb, 0x1c, 0x38, 0x65, 0xb0, 0xb6, 0x77, 0xb8, 0x9f, 0x30, 0xc8, 0x6b, 0x52, 0x06, 0x97, 0x04,\n-\t0xd3, 0x8d, 0x09, 0xfa, 0x3a, 0x69, 0x71, 0xc9, 0xe6, 0x82, 0xf1, 0x01, 0xcc, 0xf3, 0x2f, 0x6a,\n-\t0x2e, 0x08, 0xe8, 0x46, 0x06, 0x7d, 0xdd, 0x79, 0x76, 0x50, 0xa6, 0x3e, 0x54, 0xd4, 0x79, 0x2e,\n-\t0x25, 0x0c, 0x8a, 0xb2, 0x94, 0x41, 0x20, 0xb8, 0x3c, 0xe0, 0x60, 0xa1, 0xda, 0x42, 0x33, 0xde,\n-\t0x83, 0x86, 0xba, 0x08, 0x66, 0x5d, 0xd0, 0x6f, 0x67, 0xf4, 0x37, 0x32, 0x5d, 0x6e, 0xd0, 0xcc,\n-\t0xe6, 0xa0, 0x8a, 0x52, 0x06, 0x57, 0x05, 0x5b, 0xc5, 0xc8, 0xce, 0x14, 0xe3, 0x87, 0x0e, 0xd6,\n-\t0x89, 0xeb, 0xf9, 0x21, 0x76, 0x3e, 0x65, 0x93, 0x6e, 0x88, 0x49, 0x5f, 0xcf, 0x5b, 0xa8, 0xbb,\n-\t0x25, 0x27, 0xde, 0x3e, 0x56, 0xf0, 0x6b, 0x21, 0x1e, 0xfa, 0x14, 0xef, 0xcb, 0xe2, 0x4e, 0x3e,\n-\t0xf1, 0x0d, 0xd1, 0xa9, 0x42, 0x44, 0xc9, 0xb8, 0x75, 0xb5, 0x22, 0x9f, 0x8e, 0x5b, 0x95, 0x2c,\n-\t0x7b, 0x8d, 0x94, 0x62, 0xe3, 0xb3, 0x0e, 0xd6, 0x03, 0xec, 0x39, 0xc4, 0x73, 0xf3, 0xb3, 0x2e,\n-\t0xfe, 0xf3, 0xac, 0x2f, 0xd5, 0xa4, 0xcd, 0x0e, 0x0e, 0x42, 0xdc, 0xef, 0x52, 0xec, 0x1c, 0x48,\n-\t0x80, 0x62, 0x26, 0x0c, 0xea, 0x8f, 0x52, 0x06, 0xef, 0x88, 0x43, 0x07, 0x45, 0x6d, 0xcb, 0x1f,\n-\t0x12, 0x8a, 0x87, 0x01, 0x3d, 0x43, 0xa6, 0x6e, 0xaf, 0x95, 0xb4, 0xc8, 0x38, 0x00, 0x8b, 0x0e,\n-\t0x3e, 0xea, 0xc6, 0x03, 0x1a, 0x99, 0x4b, 0xe2, 0x93, 0x5c, 0xb9, 0xb8, 0x99, 0x32, 0xdf, 0x46,\n-\t0x6a, 0x52, 0xb9, 0x33, 0x65, 0x70, 0x4d, 0xdd, 0x47, 0x99, 0x40, 0x76, 0xae, 0xa1, 0x9f, 0x3a,\n-\t0x58, 0xcc, 0x4a, 0x8d, 0xb7, 0xa0, 0x2e, 0x57, 0x40, 0xac, 0xe8, 0x7f, 0xd6, 0xc9, 0x52, 0x7d,\n-\t0x54, 0xc9, 0xa5, 0x6d, 0x52, 0x79, 0x0e, 0x95, 0x63, 0x33, 0xe7, 0xca, 0xd0, 0xaa, 0x5d, 0xca,\n-\t0xa1, 0xb2, 0xe4, 0xd2, 0x2a, 0xa9, 0x7c, 0xfb, 0xd5, 0xe8, 0xdc, 0xd2, 0x26, 0xe7, 0x96, 0x36,\n-\t0x9a, 0x5a, 0xfa, 0x64, 0x6a, 0xe9, 0x5f, 0x66, 0x96, 0xf6, 0x6d, 0x66, 0xe9, 0x93, 0x99, 0xa5,\n-\t0xfd, 0x9a, 0x59, 0xda, 0xc7, 0x07, 0x2e, 0xa1, 0xc7, 0x71, 0x6f, 0xbb, 0xef, 0x0f, 0x77, 0xa2,\n-\t0x33, 0xaf, 0x4f, 0x8f, 0x89, 0xe7, 0x16, 0xde, 0x2e, 0x7e, 0x63, 0xbd, 0xba, 0xf8, 0x67, 0x3d,\n-\t0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0x50, 0xe9, 0xd5, 0x50, 0xb6, 0x05, 0x00, 0x00,\n+\t// 709 bytes of a gzipped FileDescriptorProto\n+\t0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0x4b, 0x6f, 0xd3, 0x40,\n+\t0x10, 0xc7, 0xe3, 0xa6, 0x8d, 0x9b, 0xed, 0x0b, 0x19, 0x44, 0x5d, 0x1e, 0xde, 0xb0, 0x0a, 0x28,\n+\t0xa0, 0x3e, 0xa4, 0x72, 0xa9, 0xb8, 0x11, 0x22, 0x4a, 0x55, 0x24, 0x2a, 0xa3, 0x22, 0xe0, 0x82,\n+\t0x92, 0x78, 0xeb, 0xae, 0x94, 0xd8, 0x96, 0xed, 0x54, 0xed, 0x91, 0x23, 0x37, 0xc4, 0x27, 0xe0,\n+\t0x84, 0xc4, 0x37, 0xe9, 0xad, 0x39, 0x72, 0x5a, 0xa9, 0xcd, 0xcd, 0x47, 0x1f, 0x39, 0xa1, 0x7d,\n+\t0x39, 0xb6, 0x6a, 0xe0, 0x94, 0xcc, 0xfc, 0xff, 0xf3, 0xdb, 0xd5, 0xec, 0x8c, 0xc1, 0xea, 0x80,\n+\t0xf4, 0xb6, 0xfa, 0xbe, 0x77, 0x44, 0x5c, 0xf9, 0xb3, 0x19, 0x84, 0x7e, 0xec, 0x1b, 0x35, 0x11,\n+\t0xdd, 0x69, 0xe6, 0x0c, 0x47, 0xfe, 0xc0, 0xc1, 0xa1, 0x08, 0x46, 0x61, 0x37, 0x26, 0xbe, 0x27,\n+\t0xdc, 0x05, 0x97, 0x83, 0x4f, 0x48, 0x1f, 0x97, 0xb9, 0x1e, 0xe4, 0x5c, 0xee, 0x88, 0x94, 0x59,\n+\t0x50, 0xce, 0x32, 0x70, 0xba, 0x41, 0x99, 0xe7, 0x61, 0xce, 0xe3, 0x07, 0x4c, 0x88, 0xca, 0x6c,\n+\t0x6b, 0x79, 0x5b, 0x2f, 0xc2, 0xe1, 0x09, 0x76, 0xa4, 0x54, 0xc7, 0xa7, 0xb1, 0xf8, 0x8b, 0x7e,\n+\t0xe8, 0x60, 0xe9, 0x45, 0xbe, 0xda, 0xb0, 0x81, 0x7e, 0x82, 0xc3, 0x88, 0xf8, 0x9e, 0xa9, 0x35,\n+\t0xb4, 0xd6, 0x5c, 0x7b, 0x27, 0xa1, 0x50, 0xa5, 0x52, 0x0a, 0x8d, 0xd3, 0xe1, 0xe0, 0x19, 0x92,\n+\t0xf1, 0x7a, 0x37, 0x8e, 0x43, 0xf4, 0x9b, 0xc2, 0x2a, 0xf1, 0xe2, 0xe4, 0xa2, 0xb9, 0x98, 0xcf,\n+\t0xdb, 0xaa, 0xca, 0x78, 0x07, 0x74, 0xd1, 0xbc, 0xc8, 0x9c, 0x69, 0x54, 0x5b, 0x0b, 0xdb, 0x77,\n+\t0x37, 0x65, 0xb7, 0x5f, 0xf2, 0x74, 0xe1, 0x06, 0x6d, 0x78, 0x4e, 0x61, 0x85, 0x1d, 0x2a, 0x6b,\n+\t0x52, 0x0a, 0x17, 0xf9, 0xa1, 0x22, 0x46, 0xb6, 0x12, 0x18, 0x57, 0xb4, 0x3b, 0x32, 0xab, 0x45,\n+\t0x6e, 0x87, 0xa7, 0xff, 0xc2, 0x95, 0x35, 0x19, 0x57, 0xc4, 0xc8, 0x56, 0x82, 0x61, 0x83, 0xaa,\n+\t0x3b, 0x22, 0xe6, 0x6c, 0x43, 0x6b, 0x2d, 0x6c, 0x9b, 0x8a, 0xb9, 0x7b, 0xb8, 0x57, 0x04, 0x3e,\n+\t0x62, 0xc0, 0x2b, 0x0a, 0xab, 0xbb, 0x87, 0x7b, 0x09, 0x85, 0xac, 0x26, 0xa5, 0xb0, 0xce, 0x99,\n+\t0xee, 0x88, 0xa0, 0x6f, 0xe3, 0x26, 0x93, 0x6c, 0x26, 0x18, 0x1f, 0xc0, 0x2c, 0x7b, 0x51, 0x73,\n+\t0x8e, 0x43, 0xd7, 0x14, 0xf4, 0x75, 0xe7, 0xf9, 0x41, 0x91, 0xfa, 0x44, 0x52, 0x67, 0x99, 0x94,\n+\t0x50, 0xc8, 0xcb, 0x52, 0x0a, 0x01, 0xe7, 0xb2, 0x80, 0x81, 0xb9, 0x6a, 0x73, 0xcd, 0x78, 0x0f,\n+\t0x74, 0x39, 0x08, 0x66, 0x8d, 0xd3, 0xef, 0x29, 0xfa, 0x1b, 0x91, 0x2e, 0x1e, 0xd0, 0x50, 0x7d,\n+\t0x90, 0x45, 0x29, 0x85, 0x4b, 0x9c, 0x2d, 0x63, 0x64, 0x2b, 0xc5, 0xf8, 0xa9, 0x81, 0x15, 0xe2,\n+\t0x7a, 0x7e, 0x88, 0x9d, 0x4f, 0xaa, 0xd3, 0x3a, 0xef, 0xf4, 0xed, 0xec, 0x08, 0x39, 0x5b, 0xa2,\n+\t0xe3, 0xed, 0x63, 0x09, 0xbf, 0x15, 0xe2, 0xa1, 0x1f, 0xe3, 0x3d, 0x51, 0xdc, 0xc9, 0x3a, 0xbe,\n+\t0xc6, 0x4f, 0x2a, 0x11, 0x51, 0x72, 0xd1, 0xbc, 0x59, 0x92, 0x4f, 0x2f, 0x9a, 0xa5, 0x2c, 0x7b,\n+\t0x99, 0x14, 0x62, 0xe3, 0x8b, 0x06, 0x56, 0x02, 0xec, 0x39, 0xc4, 0x73, 0xb3, 0xbb, 0xce, 0xff,\n+\t0xf3, 0xae, 0xaf, 0x64, 0xa7, 0xcd, 0x0e, 0x0e, 0x42, 0xdc, 0xef, 0xc6, 0xd8, 0x39, 0x10, 0x00,\n+\t0xc9, 0x4c, 0x28, 0xd4, 0x36, 0x52, 0x0a, 0xef, 0xf3, 0x4b, 0x07, 0x79, 0x6d, 0xdd, 0x1f, 0x92,\n+\t0x18, 0x0f, 0x83, 0xf8, 0x0c, 0x99, 0x9a, 0xbd, 0x5c, 0xd0, 0x22, 0xe3, 0x00, 0xcc, 0x3b, 0xf8,\n+\t0xa8, 0x3b, 0x1a, 0xc4, 0x91, 0x59, 0xe7, 0x4f, 0x72, 0x63, 0x3a, 0x99, 0x22, 0xdf, 0x46, 0xb2,\n+\t0x53, 0x99, 0x33, 0xa5, 0x70, 0x59, 0xce, 0xa3, 0x48, 0x20, 0x3b, 0xd3, 0xd0, 0xe7, 0x19, 0x30,\n+\t0xaf, 0x4a, 0x8d, 0xb7, 0xa0, 0x26, 0x56, 0x80, 0xaf, 0xe8, 0x7f, 0xd6, 0xc9, 0x92, 0xe7, 0xc8,\n+\t0x92, 0x6b, 0xdb, 0x24, 0xf3, 0x0c, 0x2a, 0xda, 0x66, 0xce, 0x14, 0xa1, 0x65, 0xbb, 0x94, 0x41,\n+\t0x45, 0xc9, 0xb5, 0x55, 0x92, 0x79, 0x63, 0x1f, 0xe8, 0xe2, 0x99, 0xd8, 0x86, 0x32, 0xea, 0x8a,\n+\t0xa2, 0x8a, 0xd7, 0x8c, 0xa6, 0xd3, 0x28, 0x7d, 0xd9, 0x34, 0xca, 0x18, 0xd9, 0x4a, 0x41, 0x3b,\n+\t0x40, 0x97, 0x55, 0xc6, 0x06, 0x98, 0x1b, 0x10, 0x0f, 0x47, 0xa6, 0xd6, 0xa8, 0xb6, 0xea, 0xed,\n+\t0xd5, 0x84, 0x42, 0x91, 0x98, 0x2e, 0x0a, 0xf1, 0x30, 0xb2, 0x45, 0xb2, 0xbd, 0x7f, 0x7e, 0x69,\n+\t0x55, 0xc6, 0x97, 0x56, 0xe5, 0xfc, 0xca, 0xd2, 0xc6, 0x57, 0x96, 0xf6, 0x75, 0x62, 0x55, 0xbe,\n+\t0x4f, 0x2c, 0x6d, 0x3c, 0xb1, 0x2a, 0xbf, 0x26, 0x56, 0xe5, 0xe3, 0x63, 0x97, 0xc4, 0xc7, 0xa3,\n+\t0xde, 0x66, 0xdf, 0x1f, 0x6e, 0x45, 0x67, 0x5e, 0x3f, 0x3e, 0x26, 0x9e, 0x9b, 0xfb, 0x37, 0xfd,\n+\t0x9a, 0xf6, 0x6a, 0xfc, 0xd3, 0xf9, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x77, 0x7d, 0xcb,\n+\t0x2a, 0x3d, 0x06, 0x00, 0x00,\n }\n \n func (m *Configuration) Marshal() (dAtA []byte, err error) {\n@@ -302,6 +345,16 @@ func (m *Defaults) MarshalToSizedBuffer(dAtA []byte) (int, error) {\n \t_ = i\n \tvar l int\n \t_ = l\n+\t{\n+\t\tsize, err := m.Ignores.MarshalToSizedBuffer(dAtA[:i])\n+\t\tif err != nil {\n+\t\t\treturn 0, err\n+\t\t}\n+\t\ti -= size\n+\t\ti = encodeVarintConfig(dAtA, i, uint64(size))\n+\t}\n+\ti--\n+\tdAtA[i] = 0x1a\n \t{\n \t\tsize, err := m.Device.MarshalToSizedBuffer(dAtA[:i])\n \t\tif err != nil {\n@@ -325,6 +378,38 @@ func (m *Defaults) MarshalToSizedBuffer(dAtA []byte) (int, error) {\n \treturn len(dAtA) - i, nil\n }\n \n+func (m *Ignores) Marshal() (dAtA []byte, err error) {\n+\tsize := m.ProtoSize()\n+\tdAtA = make([]byte, size)\n+\tn, err := m.MarshalToSizedBuffer(dAtA[:size])\n+\tif err != nil {\n+\t\treturn nil, err\n+\t}\n+\treturn dAtA[:n], nil\n+}\n+\n+func (m *Ignores) MarshalTo(dAtA []byte) (int, error) {\n+\tsize := m.ProtoSize()\n+\treturn m.MarshalToSizedBuffer(dAtA[:size])\n+}\n+\n+func (m *Ignores) MarshalToSizedBuffer(dAtA []byte) (int, error) {\n+\ti := len(dAtA)\n+\t_ = i\n+\tvar l int\n+\t_ = l\n+\tif len(m.Lines) > 0 {\n+\t\tfor iNdEx := len(m.Lines) - 1; iNdEx >= 0; iNdEx-- {\n+\t\t\ti -= len(m.Lines[iNdEx])\n+\t\t\tcopy(dAtA[i:], m.Lines[iNdEx])\n+\t\t\ti = encodeVarintConfig(dAtA, i, uint64(len(m.Lines[iNdEx])))\n+\t\t\ti--\n+\t\t\tdAtA[i] = 0xa\n+\t\t}\n+\t}\n+\treturn len(dAtA) - i, nil\n+}\n+\n func encodeVarintConfig(dAtA []byte, offset int, v uint64) int {\n \toffset -= sovConfig(v)\n \tbase := offset\n@@ -390,6 +475,23 @@ func (m *Defaults) ProtoSize() (n int) {\n \tn += 1 + l + sovConfig(uint64(l))\n \tl = m.Device.ProtoSize()\n \tn += 1 + l + sovConfig(uint64(l))\n+\tl = m.Ignores.ProtoSize()\n+\tn += 1 + l + sovConfig(uint64(l))\n+\treturn n\n+}\n+\n+func (m *Ignores) ProtoSize() (n int) {\n+\tif m == nil {\n+\t\treturn 0\n+\t}\n+\tvar l int\n+\t_ = l\n+\tif len(m.Lines) > 0 {\n+\t\tfor _, s := range m.Lines {\n+\t\t\tl = len(s)\n+\t\t\tn += 1 + l + sovConfig(uint64(l))\n+\t\t}\n+\t}\n \treturn n\n }\n \n@@ -831,6 +933,124 @@ func (m *Defaults) Unmarshal(dAtA []byte) error {\n \t\t\t\treturn err\n \t\t\t}\n \t\t\tiNdEx = postIndex\n+\t\tcase 3:\n+\t\t\tif wireType != 2 {\n+\t\t\t\treturn fmt.Errorf(\"proto: wrong wireType = %d for field Ignores\", wireType)\n+\t\t\t}\n+\t\t\tvar msglen int\n+\t\t\tfor shift := uint(0); ; shift += 7 {\n+\t\t\t\tif shift >= 64 {\n+\t\t\t\t\treturn ErrIntOverflowConfig\n+\t\t\t\t}\n+\t\t\t\tif iNdEx >= l {\n+\t\t\t\t\treturn io.ErrUnexpectedEOF\n+\t\t\t\t}\n+\t\t\t\tb := dAtA[iNdEx]\n+\t\t\t\tiNdEx++\n+\t\t\t\tmsglen |= int(b&0x7F) << shift\n+\t\t\t\tif b < 0x80 {\n+\t\t\t\t\tbreak\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tif msglen < 0 {\n+\t\t\t\treturn ErrInvalidLengthConfig\n+\t\t\t}\n+\t\t\tpostIndex := iNdEx + msglen\n+\t\t\tif postIndex < 0 {\n+\t\t\t\treturn ErrInvalidLengthConfig\n+\t\t\t}\n+\t\t\tif postIndex > l {\n+\t\t\t\treturn io.ErrUnexpectedEOF\n+\t\t\t}\n+\t\t\tif err := m.Ignores.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {\n+\t\t\t\treturn err\n+\t\t\t}\n+\t\t\tiNdEx = postIndex\n+\t\tdefault:\n+\t\t\tiNdEx = preIndex\n+\t\t\tskippy, err := skipConfig(dAtA[iNdEx:])\n+\t\t\tif err != nil {\n+\t\t\t\treturn err\n+\t\t\t}\n+\t\t\tif skippy < 0 {\n+\t\t\t\treturn ErrInvalidLengthConfig\n+\t\t\t}\n+\t\t\tif (iNdEx + skippy) < 0 {\n+\t\t\t\treturn ErrInvalidLengthConfig\n+\t\t\t}\n+\t\t\tif (iNdEx + skippy) > l {\n+\t\t\t\treturn io.ErrUnexpectedEOF\n+\t\t\t}\n+\t\t\tiNdEx += skippy\n+\t\t}\n+\t}\n+\n+\tif iNdEx > l {\n+\t\treturn io.ErrUnexpectedEOF\n+\t}\n+\treturn nil\n+}\n+func (m *Ignores) Unmarshal(dAtA []byte) error {\n+\tl := len(dAtA)\n+\tiNdEx := 0\n+\tfor iNdEx < l {\n+\t\tpreIndex := iNdEx\n+\t\tvar wire uint64\n+\t\tfor shift := uint(0); ; shift += 7 {\n+\t\t\tif shift >= 64 {\n+\t\t\t\treturn ErrIntOverflowConfig\n+\t\t\t}\n+\t\t\tif iNdEx >= l {\n+\t\t\t\treturn io.ErrUnexpectedEOF\n+\t\t\t}\n+\t\t\tb := dAtA[iNdEx]\n+\t\t\tiNdEx++\n+\t\t\twire |= uint64(b&0x7F) << shift\n+\t\t\tif b < 0x80 {\n+\t\t\t\tbreak\n+\t\t\t}\n+\t\t}\n+\t\tfieldNum := int32(wire >> 3)\n+\t\twireType := int(wire & 0x7)\n+\t\tif wireType == 4 {\n+\t\t\treturn fmt.Errorf(\"proto: Ignores: wiretype end group for non-group\")\n+\t\t}\n+\t\tif fieldNum <= 0 {\n+\t\t\treturn fmt.Errorf(\"proto: Ignores: illegal tag %d (wire type %d)\", fieldNum, wire)\n+\t\t}\n+\t\tswitch fieldNum {\n+\t\tcase 1:\n+\t\t\tif wireType != 2 {\n+\t\t\t\treturn fmt.Errorf(\"proto: wrong wireType = %d for field Lines\", wireType)\n+\t\t\t}\n+\t\t\tvar stringLen uint64\n+\t\t\tfor shift := uint(0); ; shift += 7 {\n+\t\t\t\tif shift >= 64 {\n+\t\t\t\t\treturn ErrIntOverflowConfig\n+\t\t\t\t}\n+\t\t\t\tif iNdEx >= l {\n+\t\t\t\t\treturn io.ErrUnexpectedEOF\n+\t\t\t\t}\n+\t\t\t\tb := dAtA[iNdEx]\n+\t\t\t\tiNdEx++\n+\t\t\t\tstringLen |= uint64(b&0x7F) << shift\n+\t\t\t\tif b < 0x80 {\n+\t\t\t\t\tbreak\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tintStringLen := int(stringLen)\n+\t\t\tif intStringLen < 0 {\n+\t\t\t\treturn ErrInvalidLengthConfig\n+\t\t\t}\n+\t\t\tpostIndex := iNdEx + intStringLen\n+\t\t\tif postIndex < 0 {\n+\t\t\t\treturn ErrInvalidLengthConfig\n+\t\t\t}\n+\t\t\tif postIndex > l {\n+\t\t\t\treturn io.ErrUnexpectedEOF\n+\t\t\t}\n+\t\t\tm.Lines = append(m.Lines, string(dAtA[iNdEx:postIndex]))\n+\t\t\tiNdEx = postIndex\n \t\tdefault:\n \t\t\tiNdEx = preIndex\n \t\t\tskippy, err := skipConfig(dAtA[iNdEx:])","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-edb540bbce86b111fec8f4491b299f1744ec328144eac57348b7baa9e5d728cd","dependencies":[],"parent":"lib/config","displayName":"config.pb.go"},{"name":"lib/config/mocks/mocked_wrapper.go","status":"modified","patch":"@@ -40,6 +40,16 @@ type Wrapper struct {\n \tdefaultFolderReturnsOnCall map[int]struct {\n \t\tresult1 config.FolderConfiguration\n \t}\n+\tDefaultIgnoresStub func() config.Ignores\n+\tdefaultIgnoresMutex sync.RWMutex\n+\tdefaultIgnoresArgsForCall []struct {\n+\t}\n+\tdefaultIgnoresReturns struct {\n+\t\tresult1 config.Ignores\n+\t}\n+\tdefaultIgnoresReturnsOnCall map[int]struct {\n+\t\tresult1 config.Ignores\n+\t}\n \tDeviceStub func(protocol.DeviceID) (config.DeviceConfiguration, bool)\n \tdeviceMutex sync.RWMutex\n \tdeviceArgsForCall []struct {\n@@ -449,6 +459,59 @@ func (fake *Wrapper) DefaultFolderReturnsOnCall(i int, result1 config.FolderConf\n \t}{result1}\n }\n \n+func (fake *Wrapper) DefaultIgnores() config.Ignores {\n+\tfake.defaultIgnoresMutex.Lock()\n+\tret, specificReturn := fake.defaultIgnoresReturnsOnCall[len(fake.defaultIgnoresArgsForCall)]\n+\tfake.defaultIgnoresArgsForCall = append(fake.defaultIgnoresArgsForCall, struct {\n+\t}{})\n+\tstub := fake.DefaultIgnoresStub\n+\tfakeReturns := fake.defaultIgnoresReturns\n+\tfake.recordInvocation(\"DefaultIgnores\", []interface{}{})\n+\tfake.defaultIgnoresMutex.Unlock()\n+\tif stub != nil {\n+\t\treturn stub()\n+\t}\n+\tif specificReturn {\n+\t\treturn ret.result1\n+\t}\n+\treturn fakeReturns.result1\n+}\n+\n+func (fake *Wrapper) DefaultIgnoresCallCount() int {\n+\tfake.defaultIgnoresMutex.RLock()\n+\tdefer fake.defaultIgnoresMutex.RUnlock()\n+\treturn len(fake.defaultIgnoresArgsForCall)\n+}\n+\n+func (fake *Wrapper) DefaultIgnoresCalls(stub func() config.Ignores) {\n+\tfake.defaultIgnoresMutex.Lock()\n+\tdefer fake.defaultIgnoresMutex.Unlock()\n+\tfake.DefaultIgnoresStub = stub\n+}\n+\n+func (fake *Wrapper) DefaultIgnoresReturns(result1 config.Ignores) {\n+\tfake.defaultIgnoresMutex.Lock()\n+\tdefer fake.defaultIgnoresMutex.Unlock()\n+\tfake.DefaultIgnoresStub = nil\n+\tfake.defaultIgnoresReturns = struct {\n+\t\tresult1 config.Ignores\n+\t}{result1}\n+}\n+\n+func (fake *Wrapper) DefaultIgnoresReturnsOnCall(i int, result1 config.Ignores) {\n+\tfake.defaultIgnoresMutex.Lock()\n+\tdefer fake.defaultIgnoresMutex.Unlock()\n+\tfake.DefaultIgnoresStub = nil\n+\tif fake.defaultIgnoresReturnsOnCall == nil {\n+\t\tfake.defaultIgnoresReturnsOnCall = make(map[int]struct {\n+\t\t\tresult1 config.Ignores\n+\t\t})\n+\t}\n+\tfake.defaultIgnoresReturnsOnCall[i] = struct {\n+\t\tresult1 config.Ignores\n+\t}{result1}\n+}\n+\n func (fake *Wrapper) Device(arg1 protocol.DeviceID) (config.DeviceConfiguration, bool) {\n \tfake.deviceMutex.Lock()\n \tret, specificReturn := fake.deviceReturnsOnCall[len(fake.deviceArgsForCall)]\n@@ -1752,6 +1815,8 @@ func (fake *Wrapper) Invocations() map[string][][]interface{} {\n \tdefer fake.defaultDeviceMutex.RUnlock()\n \tfake.defaultFolderMutex.RLock()\n \tdefer fake.defaultFolderMutex.RUnlock()\n+\tfake.defaultIgnoresMutex.RLock()\n+\tdefer fake.defaultIgnoresMutex.RUnlock()\n \tfake.deviceMutex.RLock()\n \tdefer fake.deviceMutex.RUnlock()\n \tfake.deviceListMutex.RLock()","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-3f14ca395150df7de84a008b5df90be6606863956b94adedf65e7f58d691502b","dependencies":[{"status":"no_change","name":"lib/config/wrapper.go"},{"status":"no_change","name":"lib/config/config.pb.go"}],"parent":"lib/config/mocks","displayName":"mocked_wrapper.go"},{"name":"lib/config/wrapper.go","status":"modified","patch":"@@ -95,6 +95,7 @@ type Wrapper interface {\n \tGUI() GUIConfiguration\n \tLDAP() LDAPConfiguration\n \tOptions() OptionsConfiguration\n+\tDefaultIgnores() Ignores\n \n \tFolder(id string) (FolderConfiguration, bool)\n \tFolders() map[string]FolderConfiguration\n@@ -428,6 +429,13 @@ func (w *wrapper) GUI() GUIConfiguration {\n \treturn w.cfg.GUI.Copy()\n }\n \n+// DefaultIgnores returns the list of ignore patterns to be used by default on folders.\n+func (w *wrapper) DefaultIgnores() Ignores {\n+\tw.mut.Lock()\n+\tdefer w.mut.Unlock()\n+\treturn w.cfg.Defaults.Ignores.Copy()\n+}\n+\n // IgnoredDevice returns whether or not connection attempts from the given\n // device should be silently ignored.\n func (w *wrapper) IgnoredDevice(id protocol.DeviceID) bool {","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-dc09b8a56e8d9df49cee0ae702d1bf5ca3f0c9f38a54ad79e4e008a7a42d4438","dependencies":[{"status":"no_change","name":"lib/config/config.pb.go"},{"status":"no_change","name":"lib/config/config.go"}],"parent":"lib/config","displayName":"wrapper.go"},{"name":"lib/fs/util.go","status":"modified","patch":"@@ -7,6 +7,7 @@\n package fs\n \n import (\n+\t\"bufio\"\n \t\"fmt\"\n \t\"os\"\n \t\"path/filepath\"\n@@ -228,3 +229,22 @@ func isVolumeNameOnly(parts []string) bool {\n \tisUNCVolumeName := len(parts) == 4 && strings.HasSuffix(parts[3], \":\")\n \treturn isNormalVolumeName || isUNCVolumeName\n }\n+\n+// ReadLines is a utility to read a file at path in filesystem and returns\n+// returns its contents as a string-slice of lines.\n+func ReadLines(filesystem Filesystem, path string) ([]string, error) {\n+\tfd, err := filesystem.Open(path)\n+\tif err != nil {\n+\t\treturn nil, err\n+\t}\n+\tdefer fd.Close()\n+\tscanner := bufio.NewScanner(fd)\n+\tvar lines []string\n+\tfor scanner.Scan() {\n+\t\tlines = append(lines, scanner.Text())\n+\t}\n+\tif err := scanner.Err(); err != nil {\n+\t\treturn nil, err\n+\t}\n+\treturn lines, nil\n+}","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-d65aee9fde8fa767469da0726a0dcfbca9d5dab6eb4cc03cfcc06a32c1fb5cf2","dependencies":[{"status":"added","name":"lib/fs/filesystem.go"}],"parent":"lib/fs","displayName":"util.go"},{"name":"lib/model/model.go","status":"modified","patch":"@@ -1655,6 +1655,11 @@ func (m *model) handleAutoAccepts(deviceID protocol.DeviceID, folder protocol.Fo\n \n \t\t\tif len(ccDeviceInfos.remote.EncryptionPasswordToken) > 0 || len(ccDeviceInfos.local.EncryptionPasswordToken) > 0 {\n \t\t\t\tfcfg.Type = config.FolderTypeReceiveEncrypted\n+\t\t\t} else {\n+\t\t\t\tignores := m.cfg.DefaultIgnores()\n+\t\t\t\tif err := m.SetIgnores(fcfg.ID, ignores.Lines); err != nil {\n+\t\t\t\t\tl.Warnf(\"Failed to apply default ignores to auto-accepted folder %s at path %s: %v\", folder.Description(), fcfg.Path, err)\n+\t\t\t\t}\n \t\t\t}\n \n \t\t\tl.Infof(\"Auto-accepted %s folder %s at path %s\", deviceID, folder.Description(), fcfg.Path)","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-e882cd3f44253874ec7412e2e30f7ba0fa7e42e74a964a33e3658bef5ee6f833","dependencies":[{"status":"no_change","name":"lib/config/wrapper.go"},{"status":"no_change","name":"lib/config/config.pb.go"},{"status":"no_change","name":"lib/fs/util.go"},{"status":"no_change","name":"lib/fs/filesystem.go"}],"parent":"lib/model","displayName":"model.go"},{"name":"proto/lib/config/config.proto","status":"modified","patch":"@@ -24,6 +24,11 @@ message Configuration {\n }\n \n message Defaults {\n- FolderConfiguration folder = 1;\n- DeviceConfiguration device = 2;\n+ FolderConfiguration folder = 1;\n+ DeviceConfiguration device = 2;\n+ Ignores ignores = 3;\n+}\n+\n+message Ignores {\n+ repeated string lines = 1;\n }","type":"file","fileChangeUrl":"https://github.com/syncthing/syncthing/pull/7530/files#diff-faf25eb85b21fb1c34bc89d0bbbb7c8a03af28c4509cf4c14b590675620f0de3","dependencies":[],"parent":"proto/lib/config","displayName":"config.proto"},{"name":"lib/fs/filesystem.go","status":"no_change","type":"file","fileChangeUrl":null,"dependencies":[],"parent":"lib/fs","displayName":"filesystem.go"}]