More flexible interfaces

files.go

@@ -1,72 +1,16 @@
 package sectorbuilder
 
 import (
-	"context"
 	"io"
-	"io/ioutil"
 	"os"
-	"path/filepath"
-	"strings"
 	"sync"
 
 	"github.com/filecoin-project/specs-actors/actors/abi"
 	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/go-sectorbuilder/fs"
 )
 
-func (sb *SectorBuilder) SectorName(sectorNum abi.SectorNumber) string {
-	return fs.SectorName(sb.Miner, sectorNum)
-}
-
-func (sb *SectorBuilder) SectorPath(typ fs.DataType, sectorNum abi.SectorNumber) (fs.SectorPath, error) {
-	return sb.filesystem.FindSector(typ, sb.Miner, sectorNum)
-}
-
-func (sb *SectorBuilder) AllocSectorPath(typ fs.DataType, sectorNum abi.SectorNumber, cache bool) (fs.SectorPath, error) {
-	return sb.filesystem.AllocSector(typ, sb.Miner, sb.ssize, cache, sectorNum)
-}
-
-func (sb *SectorBuilder) ReleaseSector(typ fs.DataType, path fs.SectorPath) {
-	sb.filesystem.Release(path, sb.ssize)
-}
-
-func (sb *SectorBuilder) TrimCache(ctx context.Context, sectorNum abi.SectorNumber) error {
-	dir, err := sb.filesystem.FindSector(fs.DataCache, sb.Miner, sectorNum)
-	if err != nil {
-		return xerrors.Errorf("getting cache dir: %w", err)
-	}
-	if err := sb.filesystem.Lock(ctx, dir); err != nil {
-		return xerrors.Errorf("acquiring sector lock: %w", err)
-	}
-	defer sb.filesystem.Unlock(dir)
-
-	files, err := ioutil.ReadDir(string(dir))
-	if err != nil {
-		return xerrors.Errorf("readdir: %w", err)
-	}
-
-	for _, file := range files {
-		if !strings.HasSuffix(file.Name(), ".dat") { // _aux probably
-			continue
-		}
-		if strings.HasSuffix(file.Name(), "-data-tree-r-last.dat") { // Want to keep
-			continue
-		}
-		if strings.HasSuffix(file.Name(), "-data-tree-d.dat") { // Want to keep
-			continue
-		}
-
-		if err := os.Remove(filepath.Join(string(dir), file.Name())); err != nil {
-			return xerrors.Errorf("rm %s: %w", file.Name(), err)
-		}
-	}
-
-	return nil
-}
-
 func (sb *SectorBuilder) CanCommit(sectorNum abi.SectorNumber) (bool, error) {
-	dir, err := sb.SectorPath(fs.DataCache, sectorNum)
+	/*dir, err := sb.SectorPath(fs.DataCache, sectorNum)
 	if err != nil {
 		return false, xerrors.Errorf("getting cache dir: %w", err)
 	}
@@ -78,6 +22,10 @@ func (sb *SectorBuilder) CanCommit(sectorNum abi.SectorNumber) (bool, error) {
 
 	// TODO: slightly more sophisticated check
 	return len(ents) == 10, nil
+	*/
+
+	log.Warnf("stub CanCommit")
+	return true, nil
 }
 
 func toReadableFile(r io.Reader, n int64) (*os.File, func() error, error) {

fs/basic.go

@@ -0,0 +1,41 @@
+package fs
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/specs-actors/actors/abi"
+
+	"github.com/filecoin-project/go-sectorbuilder"
+)
+
+type Basic struct {
+	Miner address.Address
+	Root  string
+}
+
+func (b *Basic) AcquireSector(ctx context.Context, id abi.SectorNumber, existing sectorbuilder.SectorFileType, allocate sectorbuilder.SectorFileType, sealing bool) (sectorbuilder.SectorPaths, func(), error) {
+	mid, err := address.IDFromAddress(b.Miner)
+	if err != nil {
+		return sectorbuilder.SectorPaths{}, nil, err
+	}
+
+	os.Mkdir(filepath.Join(b.Root, sectorbuilder.FTUnsealed.String()), 0755)
+	os.Mkdir(filepath.Join(b.Root, sectorbuilder.FTSealed.String()), 0755)
+	os.Mkdir(filepath.Join(b.Root, sectorbuilder.FTCache.String()), 0755)
+
+	return sectorbuilder.SectorPaths{
+		Id: abi.SectorID{
+			Miner:  abi.ActorID(mid),
+			Number: id,
+		},
+		Unsealed: filepath.Join(b.Root, sectorbuilder.FTUnsealed.String(), fmt.Sprintf("s-%s-%d", b.Miner.String(), id)),
+		Sealed:   filepath.Join(b.Root, sectorbuilder.FTSealed.String(), fmt.Sprintf("s-%s-%d", b.Miner.String(), id)),
+		Cache:    filepath.Join(b.Root, sectorbuilder.FTCache.String(), fmt.Sprintf("s-%s-%d", b.Miner.String(), id)),
+	}, func() {}, nil
+}
+
+var _ sectorbuilder.SectorProvider = &Basic{}