alex/vfs
1
Fork 0
Code Releases Activity

Work in progress

Browse Source
This commit is contained in:
Alex Yatskov 2015-05-12 19:48:11 +09:00
parent 115c46142c
commit da6a548629
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
database.go
View File

@ -23,7 +23,6 @@
package main package main
import ( import (
"bazil.org/fuse/fs"
"io/ioutil" "io/ioutil"
"path/filepath" "path/filepath"
) )
@ -42,10 +41,6 @@ func newDatabase(dir string) (*database, error) {
return db, nil return db, nil
} }
func (this *database) Root() (fs.Node, error) {
return this.lastVersion(), nil
}
func (this *database) load(dir string) error { func (this *database) load(dir string) error {
base, err := filepath.Abs(dir) base, err := filepath.Abs(dir)
if err != nil { if err != nil {

43
version.go
View File

@ -23,12 +23,11 @@
package main package main
import ( import (
// "bazil.org/fuse" "bazil.org/fuse"
// "bazil.org/fuse/fs" "bazil.org/fuse/fs"
// "golang.org/x/net/context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"golang.org/x/net/context"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@ -43,20 +42,41 @@ type versionMetadata struct {
type versionedFile struct { type versionedFile struct {
info os.FileInfo info os.FileInfo
inode uint64
} }
type versionedDir struct { type versionedDir struct {
dirs map[string]versionedDir dirs map[string]versionedDir
files map[string]versionedFile files map[string]versionedFile
info os.FileInfo info os.FileInfo
inode uint64
} }
func (this versionedDir) Attr(attr *fuse.Attr) {
attr.Mode = this.info.Mode()
attr.Inode = this.inode
}
func (this versionedDir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
// var entries []fuse.Dirent
// for name, dir := range versionedDir {
// entry := fuse.Dirent{Inode: dir.
// }
return nil, nil
}
// var dirDirs = []fuse.Dirent{
// {Inode: 2, Name: "hello", Type: fuse.DT_File},
// }
type version struct { type version struct {
base string base string
parent *version parent *version
timestamp time.Time timestamp time.Time
meta versionMetadata meta versionMetadata
root versionedDir root versionedDir
inodeCnt uint64
} }
func newVersion(base string, parent *version) (*version, error) { func newVersion(base string, parent *version) (*version, error) {
@ -129,14 +149,14 @@ func (this *version) buildDir(path string, dir *versionedDir) error {
for name, info := range nodes { for name, info := range nodes {
if info.IsDir() { if info.IsDir() {
subDir := versionedDir{info: info} subDir := versionedDir{info: info, inode: this.allocInode()}
subDirPath := filepath.Join(path, name) subDirPath := filepath.Join(path, name)
if err := this.buildDir(subDirPath, &subDir); err != nil { if err := this.buildDir(subDirPath, &subDir); err != nil {
return err return err
} }
dir.dirs[name] = subDir dir.dirs[name] = subDir
} else { } else {
dir.files[name] = versionedFile{info: info} dir.files[name] = versionedFile{info: info, inode: this.allocInode()}
} }
} }
@ -149,7 +169,7 @@ func (this *version) scanFs() error {
return err return err
} }
this.root = versionedDir{info: rootNode} this.root = versionedDir{info: rootNode, inode: this.allocInode()}
return this.buildDir(this.rootPath(), &this.root) return this.buildDir(this.rootPath(), &this.root)
} }
@ -188,6 +208,15 @@ func (this *version) rootPath() string {
return filepath.Join(this.base, "root") return filepath.Join(this.base, "root")
} }
func (this *version) allocInode() uint64 {
this.inodeCnt++
return this.inodeCnt
}
func (this *version) Root() (fs.Node, error) {
return this.root, nil
}
// func (this *version) Attr(a *fuse.Attr) { // func (this *version) Attr(a *fuse.Attr) {
// // type Attr struct { // // type Attr struct {
// // Inode uint64 // inode number // // Inode uint64 // inode number