golibs/assetprecompiler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor code re-org

Browse Source
This commit is contained in:
Chris Pickett
2018-11-28 12:19:14 -06:00
parent fca59e037e
commit 34a0971b0f
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
compile.go
View File

@ -25,11 +25,20 @@ const (
func initMinify() *minify.M { func initMinify() *minify.M {
minifier := minify.New() minifier := minify.New()
minifier.AddFunc("text/css", css.Minify) minifier.AddFunc(string(CSS), css.Minify)
minifier.AddFunc("text/js", js.Minify) minifier.AddFunc(string(JS), js.Minify)
return minifier 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) { func getBytes(config Config, minifier *minify.M) (map[FileType]*bytes.Buffer, error) {
buf := make(map[FileType]*bytes.Buffer) 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 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 return nil, err
} }
} else { } else {
@ -86,11 +95,13 @@ func finalize(config Config, buf map[FileType]*bytes.Buffer) (map[FileType]*Comp
if config.Minify { if config.Minify {
ext = ".min" + ext ext = ".min" + ext
} }
dir := filepath.Join(config.OutputDir, string(key)) dir := filepath.Join(config.OutputDir, string(key))
os.MkdirAll(dir, os.ModeDir) os.MkdirAll(dir, os.ModeDir)
destFile := filepath.Join(dir, "app-"+ret[key].Hash+ext) destFile := filepath.Join(dir, "app-"+ret[key].Hash+ext)
ret[key].OutputPath = destFile
ioutil.WriteFile(destFile, bytes, 0644) 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) return finalize(config, buf)
} }
func supportedFileType(t FileType) bool {
switch t {
case CSS, JS:
return true
}
return false
}