refactor: Move File and FileInfo to pkg

pkg/fs/filesystem.go

@@ -14,7 +14,6 @@ import (
 	"sync"
 	"time"
 
-	ifs "github.com/pojntfx/stfs/internal/fs"
 	"github.com/pojntfx/stfs/internal/pathext"
 	"github.com/pojntfx/stfs/pkg/cache"
 	"github.com/pojntfx/stfs/pkg/config"
@@ -393,7 +392,7 @@ func (f *STFS) OpenFile(name string, flag int, perm os.FileMode) (afero.File, er
 	f.ioLock.Lock()
 	defer f.ioLock.Unlock()
 
-	flags := &ifs.FileFlags{}
+	flags := &FileFlags{}
 	if f.readOnly {
 		if (flag&O_ACCMODE) == os.O_RDONLY || (flag&O_ACCMODE) == os.O_RDWR {
 			flags.Read = true
@@ -475,7 +474,7 @@ func (f *STFS) OpenFile(name string, flag int, perm os.FileMode) (afero.File, er
 		return nil, config.ErrIsDirectory
 	}
 
-	return ifs.NewFile(
+	return NewFile(
 		f.readOps,
 		f.writeOps,
 
@@ -490,7 +489,7 @@ func (f *STFS) OpenFile(name string, flag int, perm os.FileMode) (afero.File, er
 		&f.ioLock,
 
 		path.Base(hdr.Name),
-		ifs.NewFileInfoFromTarHeader(hdr, f.log),
+		NewFileInfoFromTarHeader(hdr, f.log),
 
 		f.onHeader,
 		f.log,
@@ -690,7 +689,7 @@ func (f *STFS) Stat(name string) (os.FileInfo, error) {
 		return nil, err
 	}
 
-	return ifs.NewFileInfoFromTarHeader(hdr, f.log), nil
+	return NewFileInfoFromTarHeader(hdr, f.log), nil
 }
 
 func (f *STFS) updateMetadata(hdr *tar.Header) error {
@@ -868,7 +867,7 @@ func (f *STFS) lstatIfPossibleWithoutLocking(name string) (info os.FileInfo, lin
 		return nil, "", true, err
 	}
 
-	return ifs.NewFileInfoFromTarHeader(hdr, f.log), path.Base(hdr.Linkname), true, nil
+	return NewFileInfoFromTarHeader(hdr, f.log), path.Base(hdr.Linkname), true, nil
 }
 
 func (f *STFS) LstatIfPossible(name string) (os.FileInfo, bool, error) {

pkg/fs/filesystem_test.go

@@ -17,7 +17,6 @@ import (
 	"time"
 
 	"github.com/pojntfx/stfs/examples"
-	ifs "github.com/pojntfx/stfs/internal/fs"
 	"github.com/pojntfx/stfs/pkg/cache"
 	"github.com/pojntfx/stfs/pkg/config"
 	"github.com/pojntfx/stfs/pkg/keys"
@@ -2537,7 +2536,7 @@ var chownTests = []struct {
 			wantGID := 11
 			wantUID := 11
 
-			gotSys, ok := f.Sys().(*ifs.Stat)
+			gotSys, ok := f.Sys().(*Stat)
 			if !ok {
 				return errors.New("could not get fs.Stat from FileInfo.Sys()")
 			}
@@ -2584,7 +2583,7 @@ var chownTests = []struct {
 			wantGID := 11
 			wantUID := 11
 
-			gotSys, ok := f.Sys().(*ifs.Stat)
+			gotSys, ok := f.Sys().(*Stat)
 			if !ok {
 				return errors.New("could not get fs.Stat from FileInfo.Sys()")
 			}
@@ -2627,7 +2626,7 @@ var chownTests = []struct {
 			wantGID := 11
 			wantUID := 11
 
-			gotSys, ok := f.Sys().(*ifs.Stat)
+			gotSys, ok := f.Sys().(*Stat)
 			if !ok {
 				return errors.New("could not get fs.Stat from FileInfo.Sys()")
 			}
@@ -2738,7 +2737,7 @@ var chtimesTests = []struct {
 			wantAtime := time.Date(2021, 12, 23, 0, 0, 0, 0, time.UTC)
 			wantMtime := time.Date(2022, 01, 14, 0, 0, 0, 0, time.UTC)
 
-			gotSys, ok := f.Sys().(*ifs.Stat)
+			gotSys, ok := f.Sys().(*Stat)
 			if !ok {
 				return errors.New("could not get fs.Stat from FileInfo.Sys()")
 			}
@@ -2785,7 +2784,7 @@ var chtimesTests = []struct {
 			wantAtime := time.Date(2021, 12, 23, 0, 0, 0, 0, time.UTC)
 			wantMtime := time.Date(2022, 01, 14, 0, 0, 0, 0, time.UTC)
 
-			gotSys, ok := f.Sys().(*ifs.Stat)
+			gotSys, ok := f.Sys().(*Stat)
 			if !ok {
 				return errors.New("could not get fs.Stat from FileInfo.Sys()")
 			}
@@ -2828,7 +2827,7 @@ var chtimesTests = []struct {
 			wantAtime := time.Date(2021, 12, 23, 0, 0, 0, 0, time.UTC)
 			wantMtime := time.Date(2022, 01, 14, 0, 0, 0, 0, time.UTC)
 
-			gotSys, ok := f.Sys().(*ifs.Stat)
+			gotSys, ok := f.Sys().(*Stat)
 			if !ok {
 				return errors.New("could not get fs.Stat from FileInfo.Sys()")
 			}