From 61d5532e33a65cc96debe56ff06a5486d2e249d9 Mon Sep 17 00:00:00 2001 From: Aaron Lindsay Date: Mon, 11 Feb 2013 23:17:12 -0500 Subject: [PATCH] go fmt --- asink.go | 16 +++++++------- events.go | 6 +++--- hash.go | 12 +++++++---- storage.go | 16 +++++++------- storage_local.go | 54 ++++++++++++++++++++++++++++++++++-------------- watcher.go | 4 +++- 6 files changed, 69 insertions(+), 39 deletions(-) diff --git a/asink.go b/asink.go index 3e7b3e4..bcc38c1 100644 --- a/asink.go +++ b/asink.go @@ -1,11 +1,11 @@ package main import ( - "fmt" - "flag" - "path" - "os/user" "code.google.com/p/goconf/conf" + "flag" + "fmt" + "os/user" + "path" ) var configFileName string @@ -17,7 +17,7 @@ func init() { u, err := user.Current() if err == nil { userHomeDir = u.HomeDir - } + } flag.StringVar(&configFileName, "config", path.Join(userHomeDir, ".asink", "config"), config_usage) flag.StringVar(&configFileName, "c", path.Join(userHomeDir, ".asink", "config"), config_usage+" (shorthand)") @@ -51,7 +51,7 @@ func main() { go StartWatching(syncdir, fileUpdates) for { - event := <- fileUpdates + event := <-fileUpdates ProcessEvent(storage, event) } } @@ -61,6 +61,8 @@ func ProcessEvent(storage Storage, event *Event) { if event.IsUpdate() { err := storage.Put(event.Path, event.Hash) - if err != nil { panic(err) } + if err != nil { + panic(err) + } } } diff --git a/events.go b/events.go index 72b35a7..a39f5d7 100644 --- a/events.go +++ b/events.go @@ -3,7 +3,7 @@ package main type EventType uint32 const ( - UPDATE = 1 << iota + UPDATE = 1 << iota DELETE ) @@ -14,9 +14,9 @@ type Event struct { } func (e Event) IsUpdate() bool { - return e.Type & UPDATE == UPDATE + return e.Type&UPDATE == UPDATE } func (e Event) IsDelete() bool { - return e.Type & DELETE == DELETE + return e.Type&DELETE == DELETE } diff --git a/hash.go b/hash.go index 69047b1..0e1da29 100644 --- a/hash.go +++ b/hash.go @@ -1,21 +1,25 @@ package main import ( + "crypto/sha256" + "fmt" "io" "os" - "fmt" - "crypto/sha256" ) func HashFile(filename string) (string, error) { hashfn := sha256.New() infile, err := os.Open(filename) - if err != nil { return "", err } + if err != nil { + return "", err + } defer infile.Close() _, err = io.Copy(hashfn, infile) - if err != nil { return "", err } + if err != nil { + return "", err + } return fmt.Sprintf("%x", hashfn.Sum(nil)), nil } diff --git a/storage.go b/storage.go index 1cc0d26..1ae4f0a 100644 --- a/storage.go +++ b/storage.go @@ -1,8 +1,8 @@ package main import ( - "errors" "code.google.com/p/goconf/conf" + "errors" ) type Storage interface { @@ -19,13 +19,13 @@ func GetStorage(config *conf.ConfigFile) (Storage, error) { var storage Storage switch storageMethod { - case "local": - storage, err = NewLocalStorage(config) - if err != nil { - return nil, err - } - default: - return nil, errors.New("Error: storage method '" + storageMethod + "' not implemented.") + case "local": + storage, err = NewLocalStorage(config) + if err != nil { + return nil, err + } + default: + return nil, errors.New("Error: storage method '" + storageMethod + "' not implemented.") } return storage, nil diff --git a/storage_local.go b/storage_local.go index fcde275..9187fa7 100644 --- a/storage_local.go +++ b/storage_local.go @@ -1,26 +1,30 @@ package main import ( - "os" + "code.google.com/p/goconf/conf" + "errors" "io" "io/ioutil" + "os" "path" - "errors" - "code.google.com/p/goconf/conf" ) type LocalStorage struct { storageDir string - tmpSubdir string + tmpSubdir string } func ensureDirExists(dir string) error { _, err := os.Lstat(dir) if err != nil { fi, err := os.Lstat(path.Dir(dir)) - if err != nil { return err } + if err != nil { + return err + } err = os.Mkdir(dir, fi.Mode().Perm()) - if err != nil { return err } + if err != nil { + return err + } } return nil } @@ -37,36 +41,50 @@ func NewLocalStorage(config *conf.ConfigFile) (*LocalStorage, error) { //make sure the base directory and tmp subdir exist err = ensureDirExists(ls.storageDir) - if err != nil { return nil, err} + if err != nil { + return nil, err + } err = ensureDirExists(ls.tmpSubdir) - if err != nil { return nil, err} + if err != nil { + return nil, err + } return ls, nil } func (ls *LocalStorage) copyToTmp(src string) (string, error) { infile, err := os.Open(src) - if err != nil { return "", err } + if err != nil { + return "", err + } defer infile.Close() - + outfile, err := ioutil.TempFile(ls.tmpSubdir, "asink") - if err != nil { return "", err } + if err != nil { + return "", err + } defer outfile.Close() _, err = io.Copy(outfile, infile) - if err != nil { return "", err } + if err != nil { + return "", err + } return outfile.Name(), nil } func (ls *LocalStorage) Put(filename string, hash string) (e error) { tmpfile, err := ls.copyToTmp(filename) - if err != nil { return err } + if err != nil { + return err + } err = os.Rename(tmpfile, path.Join(ls.storageDir, hash)) if err != nil { err := os.Remove(tmpfile) - if err != nil { return err } + if err != nil { + return err + } } return nil @@ -74,11 +92,15 @@ func (ls *LocalStorage) Put(filename string, hash string) (e error) { func (ls *LocalStorage) Get(filename string, hash string) error { infile, err := os.Open(path.Join(ls.storageDir, hash)) - if err != nil { return err } + if err != nil { + return err + } defer infile.Close() outfile, err := os.Open(filename) - if err != nil { return err } + if err != nil { + return err + } defer outfile.Close() _, err = io.Copy(outfile, infile) diff --git a/watcher.go b/watcher.go index 488bc77..f459195 100644 --- a/watcher.go +++ b/watcher.go @@ -30,7 +30,9 @@ func StartWatching(watchDir string, fileUpdates chan *Event) { event.Path = ev.Name if event.IsUpdate() { event.Hash, err = HashFile(ev.Name) - if err != nil { continue } + if err != nil { + continue + } } else { event.Hash = "" }