From 34a0971b0f56b20b0a51ffb73079b14e9f5c97ba Mon Sep 17 00:00:00 2001 From: Parnic Date: Wed, 28 Nov 2018 12:19:14 -0600 Subject: [PATCH] Minor code re-org --- compile.go | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/compile.go b/compile.go index 1af9a24..04b05f6 100644 --- a/compile.go +++ b/compile.go @@ -25,11 +25,20 @@ const ( func initMinify() *minify.M { minifier := minify.New() - minifier.AddFunc("text/css", css.Minify) - minifier.AddFunc("text/js", js.Minify) + minifier.AddFunc(string(CSS), css.Minify) + minifier.AddFunc(string(JS), js.Minify) return minifier } +func supportedFileType(t FileType) bool { + switch t { + case CSS, JS: + return true + } + + return false +} + func getBytes(config Config, minifier *minify.M) (map[FileType]*bytes.Buffer, error) { buf := make(map[FileType]*bytes.Buffer) @@ -46,7 +55,7 @@ func getBytes(config Config, minifier *minify.M) (map[FileType]*bytes.Buffer, er } if config.Minify { - if err = minifier.Minify("text/"+string(ext), buf[ext], file); err != nil { + if err = minifier.Minify(string(ext), buf[ext], file); err != nil { return nil, err } } else { @@ -86,11 +95,13 @@ func finalize(config Config, buf map[FileType]*bytes.Buffer) (map[FileType]*Comp if config.Minify { ext = ".min" + ext } + dir := filepath.Join(config.OutputDir, string(key)) os.MkdirAll(dir, os.ModeDir) + destFile := filepath.Join(dir, "app-"+ret[key].Hash+ext) - ret[key].OutputPath = destFile ioutil.WriteFile(destFile, bytes, 0644) + ret[key].OutputPath = destFile } } } @@ -108,12 +119,3 @@ func Compile(config Config) (map[FileType]*CompileResult, error) { return finalize(config, buf) } - -func supportedFileType(t FileType) bool { - switch t { - case CSS, JS: - return true - } - - return false -}