{"action":"created","comment":{"url":"https://api.github.com/repos/syncthing/syncthing/pulls/comments/69381883","id":69381883,"diff_hunk":"@@ -81,11 +82,15 @@ func ReadXML(r io.Reader, myID protocol.DeviceID) (Configuration, error) {\n \tutil.SetDefaults(&cfg.Options)\n \tutil.SetDefaults(&cfg.GUI)\n \n-\terr := xml.NewDecoder(r).Decode(&cfg)\n+\tif err := xml.NewDecoder(r).Decode(&cfg); err != nil {\n+\t\treturn Configuration{}, err\n+\t}\n \tcfg.OriginalVersion = cfg.Version\n \n-\tcfg.prepare(myID)\n-\treturn cfg, err\n+\tif err := cfg.prepare(myID); err != nil {\n+\t\treturn Configuration{}, err\n+\t}\n+\treturn cfg, nil","path":"lib/config/config.go","position":23,"original_position":23,"commit_id":"c2bd0bf1e97ac34b62972fff3b7597fb70e5e988","original_commit_id":"50c00cbe40259363c476cc10a8585af92c608dc2","user":{"login":"calmh","id":125426,"avatar_url":"https://avatars.githubusercontent.com/u/125426?v=3","gravatar_id":"","url":"https://api.github.com/users/calmh","html_url":"https://github.com/calmh","followers_url":"https://api.github.com/users/calmh/followers","following_url":"https://api.github.com/users/calmh/following{/other_user}","gists_url":"https://api.github.com/users/calmh/gists{/gist_id}","starred_url":"https://api.github.com/users/calmh/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/calmh/subscriptions","organizations_url":"https://api.github.com/users/calmh/orgs","repos_url":"https://api.github.com/users/calmh/repos","events_url":"https://api.github.com/users/calmh/events{/privacy}","received_events_url":"https://api.github.com/users/calmh/received_events","type":"User","site_admin":false},"body":"No, I change my mind. Doing that means that prepare() is a method that takes a *Configuration that it modifies, and then it returns the dereferenced `*cfg, nil` - that's ugly and pointless. Better to duplicate the `if`s above. The alternative would be to have it be a `func prepare(cfg Configuration) (Configuration, error)` which is clean but then we should break out the `FolderConfiguration.prepare()` and so on as well, and it's kind of clean that `prepare()` calls `prepare()` on it's children.","created_at":"2016-07-02T19:36:52Z","updated_at":"2016-07-02T19:36:52Z","html_url":"https://github.com/syncthing/syncthing/pull/3370#discussion_r69381883","pull_request_url":"https://api.github.com/repos/syncthing/syncthing/pulls/3370","_links":{"self":{"href":"https://api.github.com/repos/syncthing/syncthing/pulls/comments/69381883"},"html":{"href":"https://github.com/syncthing/syncthing/pull/3370#discussion_r69381883"},"pull_request":{"href":"https://api.github.com/repos/syncthing/syncthing/pulls/3370"}}},"pull_request":{"url":"https://api.github.com/repos/syncthing/syncthing/pulls/3370","id":75971378,"html_url":"https://github.com/syncthing/syncthing/pull/3370","diff_url":"https://github.com/syncthing/syncthing/pull/3370.diff","patch_url":"https://github.com/syncthing/syncthing/pull/3370.patch","issue_url":"https://api.github.com/repos/syncthing/syncthing/issues/3370","number":3370,"state":"open","locked":false,"title":"lib/config: Remove \"Invalid\" attribute (fixes #2471)","user":{"login":"calmh","id":125426,"avatar_url":"https://avatars.githubusercontent.com/u/125426?v=3","gravatar_id":"","url":"https://api.github.com/users/calmh","html_url":"https://github.com/calmh","followers_url":"https://api.github.com/users/calmh/followers","following_url":"https://api.github.com/users/calmh/following{/other_user}","gists_url":"https://api.github.com/users/calmh/gists{/gist_id}","starred_url":"https://api.github.com/users/calmh/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/calmh/subscriptions","organizations_url":"https://api.github.com/users/calmh/orgs","repos_url":"https://api.github.com/users/calmh/repos","events_url":"https://api.github.com/users/calmh/events{/privacy}","received_events_url":"https://api.github.com/users/calmh/received_events","type":"User","site_admin":false},"body":"### Purpose\r\n\r\n - Duplicate folder IDs is now fatal during startup\r\n\r\n - Invalid folder flags in the ClusterConfig is fatal for the connection (this will go away soon with the proto changes, as we won't have any unknown flags any more then)\r\n\r\n - Empty path is a folder error reported at runtime by the regular health check things\r\n\r\n### Testing\r\n\r\nThere are a couple of new unit tests.","created_at":"2016-07-01T12:17:53Z","updated_at":"2016-07-02T19:36:52Z","closed_at":null,"merged_at":null,"merge_commit_sha":"480bd661264bff8484d2d6b8deb6e5a28d20c09a","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/syncthing/syncthing/pulls/3370/commits","review_comments_url":"https://api.github.com/repos/syncthing/syncthing/pulls/3370/comments","review_comment_url":"https://api.github.com/repos/syncthing/syncthing/pulls/comments{/number}","comments_url":"https://api.github.com/repos/syncthing/syncthing/issues/3370/comments","statuses_url":"https://api.github.com/repos/syncthing/syncthing/statuses/c2bd0bf1e97ac34b62972fff3b7597fb70e5e988","head":{"label":"calmh:invfix","ref":"invfix","sha":"c2bd0bf1e97ac34b62972fff3b7597fb70e5e988","user":{"login":"calmh","id":125426,"avatar_url":"https://avatars.githubusercontent.com/u/125426?v=3","gravatar_id":"","url":"https://api.github.com/users/calmh","html_url":"https://github.com/calmh","followers_url":"https://api.github.com/users/calmh/followers","following_url":"https://api.github.com/users/calmh/following{/other_user}","gists_url":"https://api.github.com/users/calmh/gists{/gist_id}","starred_url":"https://api.github.com/users/calmh/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/calmh/subscriptions","organizations_url":"https://api.github.com/users/calmh/orgs","repos_url":"https://api.github.com/users/calmh/repos","events_url":"https://api.github.com/users/calmh/events{/privacy}","received_events_url":"https://api.github.com/users/calmh/received_events","type":"User","site_admin":false},"repo":{"id":29292392,"name":"syncthing","full_name":"calmh/syncthing","owner":{"login":"calmh","id":125426,"avatar_url":"https://avatars.githubusercontent.com/u/125426?v=3","gravatar_id":"","url":"https://api.github.com/users/calmh","html_url":"https://github.com/calmh","followers_url":"https://api.github.com/users/calmh/followers","following_url":"https://api.github.com/users/calmh/following{/other_user}","gists_url":"https://api.github.com/users/calmh/gists{/gist_id}","starred_url":"https://api.github.com/users/calmh/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/calmh/subscriptions","organizations_url":"https://api.github.com/users/calmh/orgs","repos_url":"https://api.github.com/users/calmh/repos","events_url":"https://api.github.com/users/calmh/events{/privacy}","received_events_url":"https://api.github.com/users/calmh/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/calmh/syncthing","description":"This is my personal fork of the repo, not the official one! It may be outdated, broken, rebased upon and generally screwed around with. Don't watch it, star it, or fork from it! :)","fork":true,"url":"https://api.github.com/repos/calmh/syncthing","forks_url":"https://api.github.com/repos/calmh/syncthing/forks","keys_url":"https://api.github.com/repos/calmh/syncthing/keys{/key_id}","collaborators_url":"https://api.github.com/repos/calmh/syncthing/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/calmh/syncthing/teams","hooks_url":"https://api.github.com/repos/calmh/syncthing/hooks","issue_events_url":"https://api.github.com/repos/calmh/syncthing/issues/events{/number}","events_url":"https://api.github.com/repos/calmh/syncthing/events","assignees_url":"https://api.github.com/repos/calmh/syncthing/assignees{/user}","branches_url":"https://api.github.com/repos/calmh/syncthing/branches{/branch}","tags_url":"https://api.github.com/repos/calmh/syncthing/tags","blobs_url":"https://api.github.com/repos/calmh/syncthing/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/calmh/syncthing/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/calmh/syncthing/git/refs{/sha}","trees_url":"https://api.github.com/repos/calmh/syncthing/git/trees{/sha}","statuses_url":"https://api.github.com/repos/calmh/syncthing/statuses/{sha}","languages_url":"https://api.github.com/repos/calmh/syncthing/languages","stargazers_url":"https://api.github.com/repos/calmh/syncthing/stargazers","contributors_url":"https://api.github.com/repos/calmh/syncthing/contributors","subscribers_url":"https://api.github.com/repos/calmh/syncthing/subscribers","subscription_url":"https://api.github.com/repos/calmh/syncthing/subscription","commits_url":"https://api.github.com/repos/calmh/syncthing/commits{/sha}","git_commits_url":"https://api.github.com/repos/calmh/syncthing/git/commits{/sha}","comments_url":"https://api.github.com/repos/calmh/syncthing/comments{/number}","issue_comment_url":"https://api.github.com/repos/calmh/syncthing/issues/comments{/number}","contents_url":"https://api.github.com/repos/calmh/syncthing/contents/{+path}","compare_url":"https://api.github.com/repos/calmh/syncthing/compare/{base}...{head}","merges_url":"https://api.github.com/repos/calmh/syncthing/merges","archive_url":"https://api.github.com/repos/calmh/syncthing/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/calmh/syncthing/downloads","issues_url":"https://api.github.com/repos/calmh/syncthing/issues{/number}","pulls_url":"https://api.github.com/repos/calmh/syncthing/pulls{/number}","milestones_url":"https://api.github.com/repos/calmh/syncthing/milestones{/number}","notifications_url":"https://api.github.com/repos/calmh/syncthing/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/calmh/syncthing/labels{/name}","releases_url":"https://api.github.com/repos/calmh/syncthing/releases{/id}","deployments_url":"https://api.github.com/repos/calmh/syncthing/deployments","created_at":"2015-01-15T10:31:42Z","updated_at":"2016-06-06T12:53:17Z","pushed_at":"2016-07-02T19:28:17Z","git_url":"git://github.com/calmh/syncthing.git","ssh_url":"git@github.com:calmh/syncthing.git","clone_url":"https://github.com/calmh/syncthing.git","svn_url":"https://github.com/calmh/syncthing","homepage":"https://github.com/syncthing/syncthing","size":77029,"stargazers_count":33,"watchers_count":33,"language":"Go","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":10,"mirror_url":null,"open_issues_count":0,"forks":10,"open_issues":0,"watchers":33,"default_branch":"master"}},"base":{"label":"syncthing:master","ref":"master","sha":"8e39e2889d58401b136e13cb6db9dedc2cf04b4e","user":{"login":"syncthing","id":7628018,"avatar_url":"https://avatars.githubusercontent.com/u/7628018?v=3","gravatar_id":"","url":"https://api.github.com/users/syncthing","html_url":"https://github.com/syncthing","followers_url":"https://api.github.com/users/syncthing/followers","following_url":"https://api.github.com/users/syncthing/following{/other_user}","gists_url":"https://api.github.com/users/syncthing/gists{/gist_id}","starred_url":"https://api.github.com/users/syncthing/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/syncthing/subscriptions","organizations_url":"https://api.github.com/users/syncthing/orgs","repos_url":"https://api.github.com/users/syncthing/repos","events_url":"https://api.github.com/users/syncthing/events{/privacy}","received_events_url":"https://api.github.com/users/syncthing/received_events","type":"Organization","site_admin":false},"repo":{"id":14712850,"name":"syncthing","full_name":"syncthing/syncthing","owner":{"login":"syncthing","id":7628018,"avatar_url":"https://avatars.githubusercontent.com/u/7628018?v=3","gravatar_id":"","url":"https://api.github.com/users/syncthing","html_url":"https://github.com/syncthing","followers_url":"https://api.github.com/users/syncthing/followers","following_url":"https://api.github.com/users/syncthing/following{/other_user}","gists_url":"https://api.github.com/users/syncthing/gists{/gist_id}","starred_url":"https://api.github.com/users/syncthing/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/syncthing/subscriptions","organizations_url":"https://api.github.com/users/syncthing/orgs","repos_url":"https://api.github.com/users/syncthing/repos","events_url":"https://api.github.com/users/syncthing/events{/privacy}","received_events_url":"https://api.github.com/users/syncthing/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/syncthing/syncthing","description":"Open Source Continuous File Synchronization","fork":false,"url":"https://api.github.com/repos/syncthing/syncthing","forks_url":"https://api.github.com/repos/syncthing/syncthing/forks","keys_url":"https://api.github.com/repos/syncthing/syncthing/keys{/key_id}","collaborators_url":"https://api.github.com/repos/syncthing/syncthing/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/syncthing/syncthing/teams","hooks_url":"https://api.github.com/repos/syncthing/syncthing/hooks","issue_events_url":"https://api.github.com/repos/syncthing/syncthing/issues/events{/number}","events_url":"https://api.github.com/repos/syncthing/syncthing/events","assignees_url":"https://api.github.com/repos/syncthing/syncthing/assignees{/user}","branches_url":"https://api.github.com/repos/syncthing/syncthing/branches{/branch}","tags_url":"https://api.github.com/repos/syncthing/syncthing/tags","blobs_url":"https://api.github.com/repos/syncthing/syncthing/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/syncthing/syncthing/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/syncthing/syncthing/git/refs{/sha}","trees_url":"https://api.github.com/repos/syncthing/syncthing/git/trees{/sha}","statuses_url":"https://api.github.com/repos/syncthing/syncthing/statuses/{sha}","languages_url":"https://api.github.com/repos/syncthing/syncthing/languages","stargazers_url":"https://api.github.com/repos/syncthing/syncthing/stargazers","contributors_url":"https://api.github.com/repos/syncthing/syncthing/contributors","subscribers_url":"https://api.github.com/repos/syncthing/syncthing/subscribers","subscription_url":"https://api.github.com/repos/syncthing/syncthing/subscription","commits_url":"https://api.github.com/repos/syncthing/syncthing/commits{/sha}","git_commits_url":"https://api.github.com/repos/syncthing/syncthing/git/commits{/sha}","comments_url":"https://api.github.com/repos/syncthing/syncthing/comments{/number}","issue_comment_url":"https://api.github.com/repos/syncthing/syncthing/issues/comments{/number}","contents_url":"https://api.github.com/repos/syncthing/syncthing/contents/{+path}","compare_url":"https://api.github.com/repos/syncthing/syncthing/compare/{base}...{head}","merges_url":"https://api.github.com/repos/syncthing/syncthing/merges","archive_url":"https://api.github.com/repos/syncthing/syncthing/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/syncthing/syncthing/downloads","issues_url":"https://api.github.com/repos/syncthing/syncthing/issues{/number}","pulls_url":"https://api.github.com/repos/syncthing/syncthing/pulls{/number}","milestones_url":"https://api.github.com/repos/syncthing/syncthing/milestones{/number}","notifications_url":"https://api.github.com/repos/syncthing/syncthing/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/syncthing/syncthing/labels{/name}","releases_url":"https://api.github.com/repos/syncthing/syncthing/releases{/id}","deployments_url":"https://api.github.com/repos/syncthing/syncthing/deployments","created_at":"2013-11-26T09:48:21Z","updated_at":"2016-07-02T19:34:39Z","pushed_at":"2016-07-02T19:30:11Z","git_url":"git://github.com/syncthing/syncthing.git","ssh_url":"git@github.com:syncthing/syncthing.git","clone_url":"https://github.com/syncthing/syncthing.git","svn_url":"https://github.com/syncthing/syncthing","homepage":"http://forum.syncthing.net/","size":112161,"stargazers_count":12668,"watchers_count":12668,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":985,"mirror_url":null,"open_issues_count":199,"forks":985,"open_issues":199,"watchers":12668,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/syncthing/syncthing/pulls/3370"},"html":{"href":"https://github.com/syncthing/syncthing/pull/3370"},"issue":{"href":"https://api.github.com/repos/syncthing/syncthing/issues/3370"},"comments":{"href":"https://api.github.com/repos/syncthing/syncthing/issues/3370/comments"},"review_comments":{"href":"https://api.github.com/repos/syncthing/syncthing/pulls/3370/comments"},"review_comment":{"href":"https://api.github.com/repos/syncthing/syncthing/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/syncthing/syncthing/pulls/3370/commits"},"statuses":{"href":"https://api.github.com/repos/syncthing/syncthing/statuses/c2bd0bf1e97ac34b62972fff3b7597fb70e5e988"}}}}
{"actor":{"display_login":"calmh"}}