M core.go => core.go +6 -33
@@ 23,7 23,6 @@
package goldsmith
import (
- "bytes"
"path/filepath"
"sync"
@@ 31,43 30,17 @@ import (
)
type stage struct {
- input chan file
- output chan file
-}
-
-type file struct {
- path string
- meta map[string]interface{}
+ input chan File
+ output chan File
}
type goldsmith struct {
srcPath, dstPath string
stages []stage
- files chan file
+ files chan File
wg sync.WaitGroup
}
-func (f *file) Path() string {
- return f.path
-}
-
-func (f *file) SetPath(path string) {
- f.path = path
-}
-
-func (f *file) Meta(key string) (interface{}, bool) {
- value, ok := f.meta[key]
- return value, ok
-}
-
-func (f *file) SetMeta(key string, value interface{}) {
- f.meta[key] = value
-}
-
-func (f *file) Data() (*bytes.Buffer, error) {
- return nil, nil
-}
-
func NewGoldsmith(srcPath, dstPath string) (Applier, error) {
gs := &goldsmith{srcPath: srcPath, dstPath: dstPath}
if err := gs.scan(); err != nil {
@@ 83,7 56,7 @@ func (gs *goldsmith) scan() error {
return err
}
- gs.files = make(chan file, len(matches))
+ gs.files = make(chan File, len(matches))
for _, match := range matches {
path, err := filepath.Rel(gs.srcPath, match)
@@ 91,14 64,14 @@ func (gs *goldsmith) scan() error {
return err
}
- gs.files <- file{path, make(map[string]interface{})}
+ gs.files <- &file{path, make(map[string]interface{})}
}
return nil
}
func (gs *goldsmith) stage() stage {
- s := stage{output: make(chan file)}
+ s := stage{output: make(chan File)}
if len(gs.stages) == 0 {
s.input = gs.files
} else {
A file.go => file.go +65 -0
@@ 0,0 1,65 @@
+/*
+ * Copyright (c) 2015 Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package goldsmith
+
+import (
+ "bytes"
+ "os"
+)
+
+type file struct {
+ path string
+ meta map[string]interface{}
+}
+
+func (f *file) Path() string {
+ return f.path
+}
+
+func (f *file) SetPath(path string) {
+ f.path = path
+}
+
+func (f *file) Property(key string) (interface{}, bool) {
+ value, ok := f.meta[key]
+ return value, ok
+}
+
+func (f *file) SetProperty(key string, value interface{}) {
+ f.meta[key] = value
+}
+
+func (f *file) Data() (*bytes.Buffer, error) {
+ file, err := os.Open(f.path)
+ if err != nil {
+ return nil, err
+ }
+ defer file.Close()
+
+ var buff bytes.Buffer
+ if _, err := buff.ReadFrom(file); err != nil {
+ return nil, err
+ }
+
+ return &buff, nil
+}
M goldsmith.go => goldsmith.go +3 -3
@@ 33,14 33,14 @@ type File interface {
Path() string
SetPath(path string)
- Meta(key string) (interface{}, bool)
- SetMeta(key string, value interface{})
+ Property(key string) (interface{}, bool)
+ SetProperty(key string, value interface{})
Data() (*bytes.Buffer, error)
}
type Processor interface {
- Process(ctx Context, input chan file, output chan file) error
+ Process(ctx Context, input chan File, output chan File) error
}
type Applier interface {