cmd: ignore bad softlinks, remove verbosity level for warning (now 1 is info, 2 is debug); fix bugs for --match/--include/--exclude, see #901

Author: tdewolff

cmd/minify/README.md

@@ -219,6 +219,13 @@ Match will filters all files by the given pattern, eg. `--match '*.css'` will on
 
 You may define multiple patterns within one option, such as: `--exclude '**/folder1/**' '**/folder2/**' '**/folder3/**'` Doing this might result in unexpected behaviour when it is followed immediately by the input files, as this would be interpreted as another pattern, and not as inputs. `--exclude dir_to_exclude folder_input` Instead format accordingly: `--exclude dir_to_exclude -- folder_input`.
 
+To match `*` or `?` literally, precede by a backslash. To specify a regular expression directly instead of a glob, use the tilde as a prefix (to use a tilde literally at the beginning, precede by a backslash). Examples of regular expressions:
+
+```
+./minify --match ~^path[0-9]/[^/]*.(js|html)$
+./minify --match ~^(?i)pathCaseInsensitive[0-9]/[^/]*.(js|html)$
+```
+
 ### Concatenate
 When multiple inputs are given and the output is either standard output or a single file, it will concatenate the files together if you use the bundle option.
 

cmd/minify/main.go

@@ -292,13 +292,11 @@ func run() int {
 	Debug = log.New(io.Discard, "", 0)
 	if !quiet {
 		Error = log.New(os.Stderr, "ERROR: ", 0)
+		Warning = log.New(os.Stderr, "WARNING: ", 0)
 		if 0 < verbose {
-			Warning = log.New(os.Stderr, "WARNING: ", 0)
-		}
-		if 1 < verbose {
 			Info = log.New(os.Stderr, "INFO: ", 0)
 		}
-		if 2 < verbose {
+		if 1 < verbose {
 			Debug = log.New(os.Stderr, "DEBUG: ", 0)
 		}
 	}
@@ -629,10 +627,14 @@ func compilePattern(pattern string) (*regexp.Regexp, error) {
 			pattern = pattern[1:]
 		}
 		pattern = regexp.QuoteMeta(pattern)
+		pattern = strings.ReplaceAll(pattern, `\\\*`, `\*`)
+		pattern = strings.ReplaceAll(pattern, `\\\?`, `\?`)
 		pattern = strings.ReplaceAll(pattern, `\*\*`, `.*`)
 		pattern = strings.ReplaceAll(pattern, `\*`, fmt.Sprintf(`[^%s]*`, sep))
-		pattern = strings.ReplaceAll(pattern, `\?`, fmt.Sprintf(`[^%s]?`, sep))
+		pattern = strings.ReplaceAll(pattern, `\?`, fmt.Sprintf(`[^%s]`, sep))
 		pattern = "^" + pattern + "$"
+	} else {
+		pattern = pattern[1:]
 	}
 	return regexp.Compile(pattern)
 }
@@ -693,7 +695,8 @@ func createTasks(fsys fs.FS, inputs []string, output string) ([]Task, []string,
 			info, err = os.Lstat(input)
 		}
 		if err != nil {
-			return nil, nil, err
+			Error.Println(err)
+			continue
 		}
 
 		if preserveLinks && info.Mode()&os.ModeSymlink != 0 {
@@ -747,7 +750,8 @@ func createTasks(fsys fs.FS, inputs []string, output string) ([]Task, []string,
 					// follow and dereference symlinks
 					info, err := fs.Stat(fsys, input)
 					if err != nil {
-						return err
+						Error.Println(err)
+						return nil
 					}
 					if info.IsDir() {
 						return fs.WalkDir(fsys, input, walkFn)