Refactor extensions.

ext/fileio/fileio.go

@@ -13,13 +13,13 @@ import (
 )
 
 // Register registers SQL functions readfile, writefile, lsmode,
-// and the eponymous virtual table fsdir.
+// and the table-valued function fsdir.
 func Register(db *sqlite3.Conn) {
 	RegisterFS(db, nil)
 }
 
 // Register registers SQL functions readfile, lsmode,
-// and the eponymous virtual table fsdir;
+// and the table-valued function fsdir;
 // fsys will be used to read files and list directories.
 func RegisterFS(db *sqlite3.Conn, fsys fs.FS) {
 	db.CreateFunction("lsmode", 1, 0, lsmode)
@@ -27,8 +27,8 @@ func RegisterFS(db *sqlite3.Conn, fsys fs.FS) {
 	if fsys == nil {
 		db.CreateFunction("writefile", -1, sqlite3.DIRECTONLY, writefile)
 	}
-	sqlite3.CreateModule(db, "fsdir", nil, func(db *sqlite3.Conn, module, schema, table string, arg ...string) (fsdir, error) {
-		err := db.DeclareVtab(`CREATE TABLE x(name,mode,mtime,data,path HIDDEN,dir HIDDEN)`)
+	sqlite3.CreateModule(db, "fsdir", nil, func(db *sqlite3.Conn, _, _, _ string, _ ...string) (fsdir, error) {
+		err := db.DeclareVtab(`CREATE TABLE x(name,mode,mtime TIMESTAMP,data,path HIDDEN,dir HIDDEN)`)
 		db.VtabConfig(sqlite3.VTAB_DIRECTONLY)
 		return fsdir{fsys}, err
 	})

ext/fileio/fsdir.go

@@ -48,11 +48,11 @@ func (d fsdir) BestIndex(idx *sqlite3.IndexInfo) error {
 }
 
 func (d fsdir) Open() (sqlite3.VTabCursor, error) {
-	return &cursor{fsys: d.fsys}, nil
+	return &cursor{fsdir: d}, nil
 }
 
 type cursor struct {
-	fsys  fs.FS
+	fsdir
 	curr  entry
 	next  chan entry
 	done  chan struct{}

ext/fileio/write.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/ncruces/go-sqlite3"
 	"github.com/ncruces/go-sqlite3/internal/util"
+	"github.com/ncruces/go-sqlite3/util/fsutil"
 )
 
 func writefile(ctx sqlite3.Context, arg ...sqlite3.Value) {
@@ -22,7 +23,7 @@ func writefile(ctx sqlite3.Context, arg ...sqlite3.Value) {
 
 	var mode fs.FileMode
 	if len(arg) > 2 {
-		mode = fixMode(fs.FileMode(arg[2].Int()))
+		mode = fsutil.FileModeFromValue(arg[2])
 	}
 
 	n, err := createFileAndDir(file, mode, arg[1])
@@ -88,40 +89,6 @@ func createFile(path string, mode fs.FileMode, data sqlite3.Value) (int, error)
 	return 0, fmt.Errorf("invalid mode: %v", mode)
 }
 
-func fixMode(mode fs.FileMode) fs.FileMode {
-	const (
-		S_IFMT   fs.FileMode = 0170000
-		S_IFIFO  fs.FileMode = 0010000
-		S_IFCHR  fs.FileMode = 0020000
-		S_IFDIR  fs.FileMode = 0040000
-		S_IFBLK  fs.FileMode = 0060000
-		S_IFREG  fs.FileMode = 0100000
-		S_IFLNK  fs.FileMode = 0120000
-		S_IFSOCK fs.FileMode = 0140000
-	)
-
-	switch mode & S_IFMT {
-	case S_IFDIR:
-		mode |= fs.ModeDir
-	case S_IFLNK:
-		mode |= fs.ModeSymlink
-	case S_IFBLK:
-		mode |= fs.ModeDevice
-	case S_IFCHR:
-		mode |= fs.ModeCharDevice | fs.ModeDevice
-	case S_IFIFO:
-		mode |= fs.ModeNamedPipe
-	case S_IFSOCK:
-		mode |= fs.ModeSocket
-	case S_IFREG, 0:
-		//
-	default:
-		mode |= fs.ModeIrregular
-	}
-
-	return mode &^ S_IFMT
-}
-
 func fixPerm(mode fs.FileMode, def fs.FileMode) fs.FileMode {
 	if mode.Perm() == 0 {
 		return def

ext/fileio/write_test.go

@@ -56,7 +56,7 @@ func Test_writefile(t *testing.T) {
 		var mode fs.FileMode
 		var mtime time.Time
 		var data sql.NullString
-		err := rows.Scan(&name, &mode, sqlite3.TimeFormatUnixFrac.Scanner(&mtime), &data)
+		err := rows.Scan(&name, &mode, &mtime, &data)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -90,26 +90,3 @@ func Test_writefile(t *testing.T) {
 		t.Log(err)
 	}
 }
-
-func Test_fixMode(t *testing.T) {
-	tests := []struct {
-		mode fs.FileMode
-		want fs.FileMode
-	}{
-		{0010754, 0754 | fs.ModeNamedPipe},
-		{0020754, 0754 | fs.ModeCharDevice | fs.ModeDevice},
-		{0040754, 0754 | fs.ModeDir},
-		{0060754, 0754 | fs.ModeDevice},
-		{0100754, 0754},
-		{0120754, 0754 | fs.ModeSymlink},
-		{0140754, 0754 | fs.ModeSocket},
-		{0170754, 0754 | fs.ModeIrregular},
-	}
-	for _, tt := range tests {
-		t.Run(tt.mode.String(), func(t *testing.T) {
-			if got := fixMode(tt.mode); got != tt.want {
-				t.Errorf("fixMode() = %o, want %o", got, tt.want)
-			}
-		})
-	}
-}