aclindsa/go-asink
1
0
Fork 0
Code Releases Activity

Automatically create/delete directories around file creation/removal

Browse Source
This commit is contained in:
Aaron Lindsay 2013-08-14 22:59:40 -04:00
parent ccb35fc7a6
commit 6f72225b5b
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/asink.go
View File

@ -236,6 +236,13 @@ func ProcessRemoteEvent(globals AsinkGlobals, event *asink.Event) {
if err != nil { if err != nil {
panic(err) panic(err)
} }
//make sure containing directory exists
err = util.EnsureDirExists(path.Dir(absolutePath))
if err != nil {
panic(err)
}
err = os.Rename(tmpfilename, absolutePath) err = os.Rename(tmpfilename, absolutePath)
if err != nil { if err != nil {
err2 := os.Remove(tmpfilename) err2 := os.Remove(tmpfilename)
@ -254,7 +261,8 @@ func ProcessRemoteEvent(globals AsinkGlobals, event *asink.Event) {
} else { } else {
//intentionally ignore errors in case this file has been deleted out from under us //intentionally ignore errors in case this file has been deleted out from under us
os.Remove(absolutePath) os.Remove(absolutePath)
//TODO delete file hierarchy beneath this file if its the last one in its directory? //delete the directory previously containing this file if its the last file
util.RecursiveRemoveEmptyDirs(path.Dir(absolutePath))
} }
//TODO make sure file being overwritten is either unchanged or already copied off and hashed //TODO make sure file being overwritten is either unchanged or already copied off and hashed

19
util/util.go
View File

@ -11,11 +11,16 @@ import (
func EnsureDirExists(dir string) error { func EnsureDirExists(dir string) error {
_, err := os.Lstat(dir) _, err := os.Lstat(dir)
if err != nil { if err != nil {
fi, err := os.Lstat(path.Dir(dir)) var fi os.FileInfo
curDir := dir
for dir != "" && err != nil {
curDir = path.Dir(curDir)
fi, err = os.Lstat(curDir)
}
if err != nil { if err != nil {
return err return err
} }
err = os.Mkdir(dir, fi.Mode().Perm()) err = os.MkdirAll(dir, fi.Mode().Perm())
if err != nil { if err != nil {
return err return err
} }
@ -23,6 +28,16 @@ func EnsureDirExists(dir string) error {
return nil return nil
} }
//TODO maybe this shouldn't fail silently?
func RecursiveRemoveEmptyDirs(dir string) {
var err error = nil
curDir := dir
for err == nil {
err = os.Remove(curDir)
curDir = path.Dir(curDir)
}
}
func CopyToTmp(src string, tmpdir string) (string, error) { func CopyToTmp(src string, tmpdir string) (string, error) {
infile, err := os.Open(src) infile, err := os.Open(src)
if err != nil { if err != nil {