Skip to content

Filtering out of "*min.css" files #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Canop wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Filtering out of "*min.css" files #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions Cssfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,24 @@ package cssminify
import (
"os"
"path/filepath"
"regexp"
"strings"
)

func Files() []string {
// returns all .css files in the passed directory
func CssFiles(dir string) []string {
files := make([]string, 0)
filepath.Walk(".",
filepath.Walk(dir,
func(root string, info os.FileInfo, err error) error {
matched, _ := regexp.MatchString(".css$", root)
if matched {
if strings.HasSuffix(root, ".css") && !strings.HasSuffix(root, "min.css") {
files = append(files, root)
}
return err
})
return files
}

// returns all CSS files in the current directory
// might in the future also return HTML files to allow inline style minification
func Files() []string {
return CssFiles(".")
}
9 changes: 3 additions & 6 deletions Minify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"strings"
)

var spaceRegexp = regexp.MustCompile(`\s{2,}`)

func Minify(blocks []Block, file string) {
for _, block := range blocks {
showSelectors(string(block.selector))
Expand Down Expand Up @@ -45,10 +47,5 @@ func minifyProp(property string) string {
}

func cleanSpaces(str string) string {
str = strings.TrimSpace(str)
re := regexp.MustCompile(`\s\s`)
for str = re.ReplaceAllString(str, " "); re.Find([]byte(str)) != nil; {
str = re.ReplaceAllString(str, " ")
}
return str
return spaceRegexp.ReplaceAllString(strings.TrimSpace(str), " ")
}