fix: exclude works with bash completion

3560b1f7 · Volker Schukai · 55cb1ee5 · 3560b1f7 · 3560b1f7 · 3560b1f7
Verified Commit 3560b1f7 authored 10 months ago by Volker Schukai
--- a/examples/example3/source/page1.html
+++ b/examples/example3/source/page1.html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark light">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Page 1</title>
+    <style>
+        *:not(:defined) {
+            visibility: hidden;
+        }
+    </style>
+</head>
+<body>
+    <h1>Page 1</h1>
+
+
+<footer>
+    <p>Footer</p>
+</footer>
+</body>
\ No newline at end of file
--- a/examples/example3/source/page2.html
+++ b/examples/example3/source/page2.html
+<!DOCTYPE html><html lang="en"><head>
+    <meta charset="UTF-8"/>
+    <meta name="color-scheme" content="dark light"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <title>Page 2</title>
+    <style>
+        *:not(:defined) {
+            visibility: hidden;
+        }
+    </style>
+</head>
+<body>
+<h1>Page 2</h1>
+<footer>
+    <p>Footer</p>
+</footer>
+</body></html>
\ No newline at end of file
--- a/examples/example3/source/parts/exclude.html
+++ b/examples/example3/source/parts/exclude.html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark light">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Exclude this</title>
+    <style>
+        *:not(:defined) {
+            visibility: hidden;
+        }
+    </style>
+</head>
+<body>
+<h1>Exclude This</h1>
+</body>
\ No newline at end of file
--- a/examples/example3/sync.yaml
+++ b/examples/example3/sync.yaml
+sync:
+  - source:
+      path: "source/page1.html"
+      selector: "footer"
+    destination:
+      path: "source/"
+      exclude:
+        - "source/page1.html"
+        - "source/parts/*"
--- a/source/html/sync.go
+++ b/source/html/sync.go
@@ -91,31 +91,28 @@ func SyncHtml(p string) error {
 						return nil
 					}

-					if exclude != nil {
-						for _, e := range exclude {
-							e, err := filepath.Abs(e)
-							if err != nil {
-								return err
-							}
-							if e == pp {
-								return nil
-							}
-						}
-					}
-
 					ext := filepath.Ext(pp)
-					if ext == ".html" {
+					if ext != ".html" {
+						return nil
+					}

-						var dd *html.Node
-						if dd, err = readHTML(pp); err != nil {
-							return err
-						}
+					excludeFlag, err2 := checkExcludes(exclude, pp)
+					if err2 != nil {
+						return err2
+					}

-						destinationFiles[pp] = dd
-						destinationFile[absSource] = append(destinationFile[absSource], pp)
+					if excludeFlag {
+						return nil
+					}

+					var dd *html.Node
+					if dd, err = readHTML(pp); err != nil {
+						return err
 					}

+					destinationFiles[pp] = dd
+					destinationFile[absSource] = append(destinationFile[absSource], pp)
+
 					return nil
 				}); err != nil {
 					return err
@@ -123,22 +120,13 @@ func SyncHtml(p string) error {
 			} else if filepath.Ext(d) == ".html" {

 				if exclude != nil {
-					for _, e := range exclude {
-						e, err := filepath.Abs(e)
-						if err != nil {
-							return err
-						}
-
-						if e == d {
-							return nil
-						}
-
-						if r, err := filepath.Match(e, d); err != nil {
-							return err
-						} else if r {
-							return nil
-						}
+					excludeFlag, err2 := checkExcludes(exclude, d)
+					if err2 != nil {
+						return err2
+					}

+					if excludeFlag {
+						continue
 					}
 				}

@@ -259,3 +247,25 @@ func SyncHtml(p string) error {

 	return nil
 }
+
+func checkExcludes(exclude []string, d string) (bool, error) {
+	for _, e := range exclude {
+		e, err := filepath.Abs(e)
+		if err != nil {
+			return false, err
+		}
+
+		if e == d {
+			return true, nil
+		}
+
+		if r, err := filepath.Match(e, d); err != nil {
+			return false, err
+		} else if r {
+			return true, nil
+		}
+
+	}
+
+	return false, nil
+}