alex/vfs
1
Fork 0
Code Releases Activity

Cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2015-05-14 14:12:23 +09:00
parent c244062548
commit a96c0295b9
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
version.go
View File

@ -85,6 +85,18 @@ func newVersion(base string, parent *version) (*version, error) {
} }
func (this *version) scanDir(path string) (map[string]versionedNode, error) { func (this *version) scanDir(path string) (map[string]versionedNode, error) {
var baseNodes map[string]versionedNode
if this.parent != nil {
var err error
baseNodes = make(map[string]versionedNode)
baseNodes, err = this.parent.scanDir(path)
if err != nil {
return nil, err
}
}
ownNodes := make(map[string]versionedNode) ownNodes := make(map[string]versionedNode)
{ {
fullPath := filepath.Join(this.rootPath(), path) fullPath := filepath.Join(this.rootPath(), path)
@ -101,17 +113,12 @@ func (this *version) scanDir(path string) (map[string]versionedNode, error) {
} }
} }
if this.parent == nil { if baseNodes == nil {
return ownNodes, nil return ownNodes, nil
} }
baseNodes, err := this.parent.scanDir(path) for ownName, ownNode := range ownNodes {
if err != nil { baseNodes[ownName] = ownNode
return nil, err
}
for ownName, ownInfo := range ownNodes {
baseNodes[ownName] = ownInfo
} }
return baseNodes, nil return baseNodes, nil
@ -126,10 +133,12 @@ func (this *version) buildDir(path string, dir *versionedDir) error {
for name, node := range nodes { for name, node := range nodes {
if node.info.IsDir() { if node.info.IsDir() {
subDir := versionedDir{node: node, inode: this.allocInode()} subDir := versionedDir{node: node, 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{node: node, inode: this.allocInode()} dir.files[name] = versionedFile{node: node, inode: this.allocInode()}
@ -140,13 +149,13 @@ func (this *version) buildDir(path string, dir *versionedDir) error {
} }
func (this *version) scanFs() error { func (this *version) scanFs() error {
rootNode, err := os.Stat(this.rootPath()) node, err := os.Stat(this.rootPath())
if err != nil { if err != nil {
return err return err
} }
this.root = versionedDir{ this.root = versionedDir{
node: versionedNode{path: this.rootPath(), info: rootNode}, node: versionedNode{path: this.rootPath(), info: node},
inode: this.allocInode()} inode: this.allocInode()}
return this.buildDir(this.rootPath(), &this.root) return this.buildDir(this.rootPath(), &this.root)
@ -184,7 +193,7 @@ func (this *version) metadataPath() string {
} }
func (this *version) rootPath() string { func (this *version) rootPath() string {
return filepath.Join(this.base, "root") return this.root.node.path
} }
func (this *version) allocInode() uint64 { func (this *version) allocInode() uint64 {