Merge pull request #22 from justinfx/21_FindSequencesInList

Prevent omission of frame range on ambiguous single item frame range

fileseq_test.go

@@ -821,6 +821,7 @@ func TestFindSequencesInList(t *testing.T) {
 		{
 			Name: "ambiguous single files",
 			Paths: []string{
+				"/path/to/complex_name_15-14-56-14.ext",
 				"/path/to/single/123",
 				"/path/to/single/123.ext",
 				"/path/to/single/file0001.ext",
@@ -829,6 +830,7 @@ func TestFindSequencesInList(t *testing.T) {
 			},
 			Opts: []FileOption{SingleFiles},
 			Expect: []string{
+				"/path/to/complex_name_15-14-56-14@@@.ext",
 				"/path/to/single/123@@@",
 				"/path/to/single/123@@@.ext",
 				"/path/to/single/file1#.ext",
@@ -839,13 +841,15 @@ func TestFindSequencesInList(t *testing.T) {
 		{
 			Name: "ambiguous single files disabled",
 			Paths: []string{
+				"/path/to/complex_name_15-14-56-14.ext",
 				"/path/to/single/123",
 				"/path/to/single/123.ext",
 				"/path/to/single/file0001.ext",
 				"/path/to/single/file.ext12345",
 				"/path/to/single/file.ext12345z",
 			},
 			Expect: []string{
+				"/path/to/complex_name_15-14-56-14@@@.ext",
 				"/path/to/single/123@@@.ext",
 				"/path/to/single/file1#.ext",
 			},

sequence.go

@@ -800,9 +800,17 @@ func findSequencesInList(paths []*fileItem, opts ...FileOption) (FileSequences,
 		if err != nil {
 			return err
 		}
-		if pad == "" {
+
+		// Always use the previously parsed basename, range, and ext
+		fs.basename = baseName
+		fs.ext = ext
+		if frange == "" {
 			fs.SetFrameSet(nil)
+			fs.SetPadding("")
+		} else {
+			fs.SetFrameRange(frange)
 		}
+
 		fseqs = append(fseqs, fs)
 
 		buf.Reset()