Support static files #45
Conversation
This adds support for static files. You can add files into a directory that is defined by `StaticDir` in gnorm.toml and they will be copied to the directory defined by `OutputDir` in the gnorm.toml. The structure of the directories is preserved. Closes gnormal#14
|
ooh, I missed this. See, this is why I need the channel :) |
cli/parse.go
Outdated
| @@ -50,6 +50,13 @@ func parse(env environ.Values, r io.Reader) (*run.Config, error) { | |||
| if len(c.ExcludeTables) > 0 && len(c.IncludeTables) > 0 { | |||
| return nil, errors.New("both include tables and exclude tables") | |||
| } | |||
| if c.OutputDir == "" { | |||
| wd, err := os.Getwd() | |||
There was a problem hiding this comment.
in basically all cases, "." should just work here.
There was a problem hiding this comment.
Will that work even on windows?
There was a problem hiding this comment.
Yep, it works. But definitely good to be thinking about windows. :)
There was a problem hiding this comment.
perfect! Yah, windows folks need some love.
| @@ -107,4 +107,17 @@ type Config struct { | |||
| // PluginDirs a set of absolute/relative paths that will be used for | |||
| // plugin lookup. | |||
| PluginDirs []string | |||
|
|
|||
| // OutputDir is the directory relative to the project root (where the | |||
| // gnorm.toml file is located) in which all the generated files are written | |||
| } | ||
| } | ||
| if !dstat.IsDir() { | ||
| return fmt.Errorf("%s is not a directory", dest) |
There was a problem hiding this comment.
can you make this "Outputdir specifies a directory path that already exists as file %q" . or something like that? it'll make the error more clear to the user.
run/generate.go
Outdated
| } | ||
| dirs[o] = true | ||
| } | ||
| d, err := ioutil.ReadFile(path) |
There was a problem hiding this comment.
Don't read the whole file into memory, in theory it could be a 40 gig bluray image. Do this instead:
f, err := os.Open(path)
if err != nil {
return err
}
defer f.Close()
g, err := os.Cteate(target)
if err != nil {
return err
}
_, err := io.Copy(g, f) // copy goes right to left, like variable assignment
if err != nil {
return err
}
run/generate_test.go
Outdated
| } | ||
|
|
||
| for _, v := range src { | ||
| err := os.MkdirAll(v.path, 0777) |
There was a problem hiding this comment.
instead of creating the files programmatically, just put them in a directory called testdata - the go tool ignores those files, and then you won't need all this code to create them, and it'll make the code easier to read.
|
|
||
| // make sure the structure is preserved | ||
| var newPaths []string | ||
| filepath.Walk(dest, func(path string, info os.FileInfo, err error) error { |
There was a problem hiding this comment.
since you have a well-known list of files you're looking for, you can probably use ioutil.ReadDir and the code will be easier to follow.
There was a problem hiding this comment.
We are checking the order of files in nested directories. ReadDir reads the content of one directories, I think walk here is a better fit rather than calling ReadDil a couple of times which we will also be walking the directory tree.
run/generate.go
Outdated
| } | ||
| o := filepath.Join(dest, rel) | ||
| if !dirs[o] { | ||
| err = os.MkdirAll(o, stat.Mode()) |
There was a problem hiding this comment.
I would just call mkdirall every time, it won't error out if the directory already exists, and that way you don't have to keep track
|
Done |
|
Ping |
|
I tested this, but it's not prepending the outputDir to the templatePath target files. I have a fix for that which I could push to this branch if you give me rights to do it. You just need to check "Allow edits from maintainers" on this PR. |
|
Hey, Allow edits from maintainers is checked. |
|
weird, I tried to push again, but no luck. still says permission denied. I'll have to poke at it in the morning. all I did was add cfg.OutputDir to the genfile function,.and filepath.Join it to the generated path. |
|
Uh! Maybe you can add that in a separate PR? That was my intention but I forgot to add the comment . This PR was only about copying static files. |
This adds support for static files. You can add files into a directory that is defined by
StaticDirin gnorm.toml and they will be copied to the directory defined byOutputDirin the gnorm.toml.The structure of the directories is preserved.
Closes #14