Fixes #4: If a symlink points to a dir, skip it instead of listing it…

… as a sequence result

Signed-off-by: Justin Israel <[email protected]>

fileseq.go

@@ -27,7 +27,7 @@ import (
 	"strings"
 )
 
-const Version = "2.0.0"
+const Version = "2.0.1"
 
 var (
 	padding       map[string]int

fileseq_test.go

@@ -515,3 +515,21 @@ func TestFindSequenceOnDisk(t *testing.T) {
 		}
 	}
 }
+
+func TestHandleSymlinksOnDisk(t *testing.T) {
+	seqs, err := FindSequencesOnDisk("testdata/versions")
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	if len(seqs) != 1 {
+		t.Fatalf("Expected 1 result ; got %d : %v", len(seqs), seqs)
+	}
+
+	actual := seqs[0].String()
+	expected := "testdata/versions/seq.1-10#.ext"
+
+	if actual != expected {
+		t.Fatalf("Expected to find seq %q ; got %q", expected, actual)
+	}
+}

sequence.go

@@ -536,6 +536,21 @@ func findSequencesOnDisk(path string, opts ...FileOption) (FileSequences, error)
 			continue
 		}
 
+		// Also skip symlinks that point to directories
+		if (info.Mode() & os.ModeSymlink) != 0 {
+			buf.WriteString(info.Name())
+			syminfo, err := os.Stat(buf.String())
+			if err != nil {
+				return nil, fmt.Errorf("Error reading symlink %q: %s", buf.Bytes(), err)
+			}
+
+			buf.Truncate(size)
+
+			if syminfo.IsDir() {
+				continue
+			}
+		}
+
 		name := info.Name()
 
 		if !hiddenFiles && strings.HasPrefix(name, ".") {

testdata/versions/v3

@@ -0,0 +1 @@
+_dir

testdata/versions/v4

@@ -0,0 +1 @@
+_dir

testdata/versions/v5

@@ -0,0 +1 @@
+_dir