feat(nav): implement reworking of universal sampling with controller (#…

…373)
snivilised · Nov 26, 2023 · 67c9883 · 67c9883
1 parent 21c6ded
commit 67c9883
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 23 deletions.
diff --git a/xfs/nav/sampling-adapters.go b/xfs/nav/sampling-adapters.go
@@ -28,8 +28,8 @@ func createSamplingAdapters() samplingAdaptersCollection {
 			)
 		},
 		filterWithIt: func(contents *DirectoryContents, iterator *directoryEntryWhileIt) {
-			contents.Files = iterator.sampleOf(contents.Files)
-			contents.Folders = iterator.sampleOf(contents.Folders)
+			contents.Files = iterator.sample(contents.Files)
+			contents.Folders = iterator.sample(contents.Folders)
 		},
 		isFull: func(fi *filteredInfo, noOf *SampleNoOf) bool {
 			if fi.counts.Files == noOf.Files {
@@ -48,7 +48,7 @@ func createSamplingAdapters() samplingAdaptersCollection {
 			contents.Folders = fn(contents.Folders, int(noOf.Folders))
 		},
 		filterWithIt: func(contents *DirectoryContents, iterator *directoryEntryWhileIt) {
-			contents.Folders = iterator.sampleOf(contents.Folders)
+			contents.Folders = iterator.sample(contents.Folders)
 		},
 		isFull: func(fi *filteredInfo, noOf *SampleNoOf) bool {
 			return fi.counts.Folders == noOf.Folders
@@ -60,7 +60,7 @@ func createSamplingAdapters() samplingAdaptersCollection {
 			contents.Files = fn(contents.Files, int(noOf.Files))
 		},
 		filterWithIt: func(contents *DirectoryContents, iterator *directoryEntryWhileIt) {
-			contents.Files = iterator.sampleOf(contents.Files)
+			contents.Files = iterator.sample(contents.Files)
 		},
 		isFull: func(fi *filteredInfo, noOf *SampleNoOf) bool {
 			return fi.counts.Files == noOf.Files

diff --git a/xfs/nav/sampling-iteration.go → xfs/nav/sampling-while-iterator.go b/xfs/nav/sampling-iteration.go → xfs/nav/sampling-while-iterator.go
@@ -1,7 +1,6 @@
 package nav
 
 import (
-	"fmt"
 	"io/fs"
 	"path/filepath"
 
@@ -108,8 +107,8 @@ func (i *directoryEntryWhileIt) withParams(tp *traverseParams) {
 	i.tp = tp
 }
 
-// sampleOf creates a sample with a new collection of directories entries
-func (i *directoryEntryWhileIt) sampleOf(entries []fs.DirEntry) []fs.DirEntry {
+// sample creates a sample with a new collection of directories entries
+func (i *directoryEntryWhileIt) sample(entries []fs.DirEntry) []fs.DirEntry {
 	if utils.IsNil(i.iterator) {
 		i.iterator = lo.TernaryF(i.forward,
 			func() collections.Iterator[fs.DirEntry] {
@@ -123,17 +122,15 @@ func (i *directoryEntryWhileIt) sampleOf(entries []fs.DirEntry) []fs.DirEntry {
 		i.iterator.Reset(entries)
 	}
 
-	return i.sample()
+	return i.loop()
 }
 
-func (i *directoryEntryWhileIt) sample() []fs.DirEntry {
+func (i *directoryEntryWhileIt) loop() []fs.DirEntry {
 	result := []fs.DirEntry{}
 	parent := i.tp.current
 
 	var fi filteredInfo
 
-	fmt.Println("===")
-
 	for entry := i.iterator.Start(); i.while(i.iterator, &fi); entry = i.iterator.Next() {
 		info, err := entry.Info()
 
@@ -166,12 +163,7 @@ func (i *directoryEntryWhileIt) sample() []fs.DirEntry {
 			},
 		})
 
-		// The filter needs a fix; 'RETRO-WAVE/Chromatics/Night Drive' is designated as Leaf
-		// therefore it is applicable to the filter, but doesn't match it.
-		// We need to have file and directory scopes to solve this.
-		//
 		if i.each(child) {
-			fmt.Printf("🍉🍉🍉 whit: selecting item: '%v'\n", child.Path)
 			result = append(result, entry)
 
 			if info.IsDir() {
@@ -181,8 +173,6 @@ func (i *directoryEntryWhileIt) sample() []fs.DirEntry {
 			}
 
 			child.filtered()
-		} else {
-			fmt.Printf("💥💥💥 whit: skipping item: '%v'\n", child.Path)
 		}
 	}
 

diff --git a/xfs/nav/traverse-navigator-scope_test.go b/xfs/nav/traverse-navigator-scope_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/snivilised/extendio/xfs/nav"
 )
 
-var _ = FDescribe("TraverseNavigatorScope", Ordered, func() {
+var _ = Describe("TraverseNavigatorScope", Ordered, func() {
 	var root string
 
 	BeforeAll(func() {
@@ -137,7 +137,7 @@ var _ = FDescribe("TraverseNavigatorScope", Ordered, func() {
 
 		// === files =========================================================
 
-		FEntry(nil, &scopeTE{
+		Entry(nil, &scopeTE{
 			naviTE: naviTE{
 				message:      "files: Path contains non-leaf files",
 				relative:     "bass",

diff --git a/xfs/nav/traverse-sample_test.go b/xfs/nav/traverse-sample_test.go
@@ -145,7 +145,7 @@ var _ = Describe("Traverse With Sample", Ordered, func() {
 		}),
 
 		// >>> universal filter
-		XEntry(nil, &sampleTE{ // 💥💥💥
+		Entry(nil, &sampleTE{
 			naviTE: naviTE{
 				message:      "universal: first by filter, first single files",
 				should:       "invoke for at most single file per directory",
@@ -155,15 +155,15 @@ var _ = Describe("Traverse With Sample", Ordered, func() {
 			filter: &filterTE{
 				name:    "items with .flac suffix",
 				pattern: "*.flac",
-				scope:   nav.ScopeLeafEn,
+				scope:   nav.ScopeFileEn,
 			},
 			sampleType: nav.SampleTypeFilterEn,
 			noOf: nav.SampleNoOf{
 				Files:   1,
 				Folders: 2,
 			},
 			expectedNoOf: directoryQuantities{
-				files: 4,
+				files: 3,
 			},
 		}),
 		// <<<