+
+
+
+
+
Supported patterns:
+
+ * - Single-level wildcard (matches anything within a single directory)
+ ** - Multi-level wildcard (matches anything within all directories at any depth)
+ ! - Inversion of the given condition, which excludes the given pattern from any previous matches
+ #include - Including ignores from another file
+ // - Comment
+
+
+
+
diff --git a/gui/lang/lang-en.json b/gui/lang/lang-en.json
index 4bdd19649..72520a7c5 100644
--- a/gui/lang/lang-en.json
+++ b/gui/lang/lang-en.json
@@ -11,6 +11,7 @@
"Bugs": "Bugs",
"CPU Utilization": "CPU Utilization",
"Close": "Close",
+ "Comment": "Comment",
"Connection Error": "Connection Error",
"Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg and the following Contributors:",
"Delete": "Delete",
@@ -20,6 +21,7 @@
"Edit": "Edit",
"Edit Node": "Edit Node",
"Edit Repository": "Edit Repository",
+ "Edit ignored files and directories": "Edit ignored files and directories",
"Enable UPnP": "Enable UPnP",
"Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.",
"Error": "Error",
@@ -37,7 +39,11 @@
"Global Repository": "Global Repository",
"Idle": "Idle",
"Ignore Permissions": "Ignore Permissions",
+ "Ignore file location": "Ignore file location",
+ "Ignored files and directories": "Ignored files and directories",
+ "Including ignores from another file": "Including ignores from another file",
"Incoming Rate Limit (KiB/s)": "Incoming Rate Limit (KiB/s)",
+ "Inversion of the given condition, which excludes the given pattern from any previous matches": "Inversion of the given condition, which excludes the given pattern from any previous matches",
"Keep Versions": "Keep Versions",
"Last seen": "Last seen",
"Latest Release": "Latest Release",
@@ -48,6 +54,7 @@
"Max File Change Rate (KiB/s)": "Max File Change Rate (KiB/s)",
"Max Outstanding Requests": "Max Outstanding Requests",
"Maximum Age": "Maximum Age",
+ "Multi-level wildcard (matches anything within all directories at any depth)": "Multi-level wildcard (matches anything within all directories at any depth)",
"Never": "Never",
"No": "No",
"No File Versioning": "No File Versioning",
@@ -90,11 +97,13 @@
"Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.",
"Shutdown": "Shutdown",
"Simple File Versioning": "Simple File Versioning",
+ "Single-level wildcard (matches anything within a single directory)": "Single-level wildcard (matches anything within a single directory)",
"Source Code": "Source Code",
"Staggered File Versioning": "Staggered File Versioning",
"Start Browser": "Start Browser",
"Stopped": "Stopped",
"Support / Forum": "Support / Forum",
+ "Supported patterns:": "Supported patterns:",
"Sync Protocol Listen Addresses": "Sync Protocol Listen Addresses",
"Synchronization": "Synchronization",
"Syncing": "Syncing",
@@ -116,6 +125,7 @@
"The number of old versions to keep, per file.": "The number of old versions to keep, per file.",
"The number of versions must be a number and cannot be blank.": "The number of versions must be a number and cannot be blank.",
"The repository ID cannot be blank.": "The repository ID cannot be blank.",
+ "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
"The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.",
"The repository ID must be unique.": "The repository ID must be unique.",
"The repository path cannot be blank.": "The repository path cannot be blank.",
diff --git a/ignore/ignore.go b/ignore/ignore.go
index f2809e807..86c2ebf6e 100644
--- a/ignore/ignore.go
+++ b/ignore/ignore.go
@@ -122,6 +122,8 @@ func parseIgnoreFile(fd io.Reader, currentFile string, seen map[string]bool) (Pa
switch {
case line == "":
continue
+ case strings.HasPrefix(line, "//"):
+ continue
case strings.HasPrefix(line, "#"):
err = addPattern(line)
case strings.HasSuffix(line, "/**"):
diff --git a/ignore/ignore_test.go b/ignore/ignore_test.go
index 9a7a68426..678588bfa 100644
--- a/ignore/ignore_test.go
+++ b/ignore/ignore_test.go
@@ -133,3 +133,21 @@ func TestCaseSensitivity(t *testing.T) {
}
}
}
+
+func TestCommentsAndBlankLines(t *testing.T) {
+ stignore := `
+ // foo
+ //bar
+
+ //!baz
+ //#dex
+
+ // ips
+
+
+ `
+ pats, _ := ignore.Parse(bytes.NewBufferString(stignore), ".stignore")
+ if len(pats) > 0 {
+ t.Errorf("Expected no patterns")
+ }
+}
diff --git a/model/model.go b/model/model.go
index 16c84963c..a03395126 100644
--- a/model/model.go
+++ b/model/model.go
@@ -5,10 +5,12 @@
package model
import (
+ "bufio"
"crypto/tls"
"errors"
"fmt"
"io"
+ "io/ioutil"
"net"
"os"
"path/filepath"
@@ -22,6 +24,7 @@ import (
"github.com/syncthing/syncthing/files"
"github.com/syncthing/syncthing/ignore"
"github.com/syncthing/syncthing/lamport"
+ "github.com/syncthing/syncthing/osutil"
"github.com/syncthing/syncthing/protocol"
"github.com/syncthing/syncthing/scanner"
"github.com/syncthing/syncthing/stats"
@@ -579,6 +582,78 @@ func (m *Model) ConnectedTo(nodeID protocol.NodeID) bool {
return ok
}
+func (m *Model) GetIgnores(repo string) ([]string, error) {
+ var lines []string
+
+ cfg, ok := m.repoCfgs[repo]
+ if !ok {
+ return lines, fmt.Errorf("Repo %s does not exist", repo)
+ }
+
+ m.rmut.Lock()
+ defer m.rmut.Unlock()
+
+ fd, err := os.Open(filepath.Join(cfg.Directory, ".stignore"))
+ if err != nil {
+ if os.IsNotExist(err) {
+ return lines, nil
+ }
+ l.Warnln("Loading .stignore:", err)
+ return lines, err
+ }
+ defer fd.Close()
+
+ scanner := bufio.NewScanner(fd)
+ for scanner.Scan() {
+ lines = append(lines, strings.TrimSpace(scanner.Text()))
+ }
+
+ return lines, nil
+}
+
+func (m *Model) SetIgnores(repo string, content []string) error {
+ cfg, ok := m.repoCfgs[repo]
+ if !ok {
+ return fmt.Errorf("Repo %s does not exist", repo)
+ }
+
+ fd, err := ioutil.TempFile("", "stignore-"+repo)
+ if err != nil {
+ l.Warnln("Saving .stignore:", err)
+ return err
+ }
+
+ writer := bufio.NewWriter(fd)
+ for _, line := range content {
+ fmt.Fprintln(writer, line)
+ }
+
+ err = writer.Flush()
+ if err != nil {
+ l.Warnln("Saving .stignore:", err)
+ fd.Close()
+ return err
+ }
+
+ err = fd.Close()
+ if err != nil {
+ l.Warnln("Saving .stignore:", err)
+ return err
+ }
+
+ file := filepath.Join(cfg.Directory, ".stignore")
+ m.rmut.Lock()
+ os.Remove(file)
+ err = osutil.Rename(fd.Name(), file)
+ m.rmut.Unlock()
+ if err != nil {
+ l.Warnln("Saving .stignore:", err)
+ return err
+ }
+
+ return m.ScanRepo(repo)
+}
+
// AddConnection adds a new peer connection to the model. An initial index will
// be sent to the connected peer, thereafter index updates whenever the local
// repository changes.
diff --git a/model/model_test.go b/model/model_test.go
index 864ccc1c4..943843a8a 100644
--- a/model/model_test.go
+++ b/model/model_test.go
@@ -369,3 +369,89 @@ func TestClusterConfig(t *testing.T) {
t.Errorf("Incorrect node ID %x != %x", id, node2)
}
}
+
+func TestIgnores(t *testing.T) {
+ arrEqual := func(a, b []string) bool {
+ if len(a) != len(b) {
+ return false
+ }
+
+ for i := range a {
+ if a[i] != b[i] {
+ return false
+ }
+ }
+ return true
+ }
+
+ db, _ := leveldb.Open(storage.NewMemStorage(), nil)
+ m := NewModel("/tmp", nil, "node", "syncthing", "dev", db)
+ m.AddRepo(config.RepositoryConfiguration{ID: "default", Directory: "testdata"})
+
+ expected := []string{
+ ".*",
+ "quux",
+ }
+
+ ignores, err := m.GetIgnores("default")
+ if err != nil {
+ t.Error(err)
+ }
+
+ if !arrEqual(ignores, expected) {
+ t.Errorf("Incorrect ignores: %v != %v", ignores, expected)
+ }
+
+ ignores = append(ignores, "pox")
+
+ err = m.SetIgnores("default", ignores)
+ if err != nil {
+ t.Error(err)
+ }
+
+ ignores2, err := m.GetIgnores("default")
+ if err != nil {
+ t.Error(err)
+ }
+
+ if arrEqual(expected, ignores2) {
+ t.Errorf("Incorrect ignores: %v == %v", ignores2, expected)
+ }
+
+ if !arrEqual(ignores, ignores2) {
+ t.Errorf("Incorrect ignores: %v != %v", ignores2, ignores)
+ }
+
+ err = m.SetIgnores("default", expected)
+ if err != nil {
+ t.Error(err)
+ }
+
+ ignores, err = m.GetIgnores("default")
+ if err != nil {
+ t.Error(err)
+ }
+
+ if !arrEqual(ignores, expected) {
+ t.Errorf("Incorrect ignores: %v != %v", ignores, expected)
+ }
+
+ ignores, err = m.GetIgnores("doesnotexist")
+ if err == nil {
+ t.Error("No error")
+ }
+
+ err = m.SetIgnores("doesnotexist", expected)
+ if err == nil {
+ t.Error("No error")
+ }
+
+ m.AddRepo(config.RepositoryConfiguration{ID: "fresh", Directory: "XXX"})
+ ignores, err = m.GetIgnores("fresh")
+ if err != nil {
+ t.Error(err)
+ }
+ if len(ignores) > 0 {
+ t.Errorf("Expected no ignores, got: %v", ignores)
+ }
+}