PyPI - htmlcmp - Versions diffs - 1.1.1__tar.gz → 1.2.1__tar.gz - Mend

htmlcmp 1.1.1tar.gz → 1.2.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

{htmlcmp-1.1.1 → htmlcmp-1.2.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htmlcmp
-Version: 1.1.1
+Version: 1.2.1
 Summary: Compare HTML files by rendered output
 Author: Andreas Stefl
 Maintainer-email: Andreas Stefl <stefl.andreas@gmail.com>

{htmlcmp-1.1.1 → htmlcmp-1.2.1}/pyproject.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [project]
 name = "htmlcmp"
-version = "1.1.1"
+version = "1.2.1"
 description = "Compare HTML files by rendered output"
 classifiers = []
 authors = [

{htmlcmp-1.1.1 → htmlcmp-1.2.1}/src/htmlcmp/compare_output.py RENAMED Viewed

@@ -241,9 +241,7 @@ def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("a", type=Path, help="Path to the first directory")
     parser.add_argument("b", type=Path, help="Path to the second directory")
-    parser.add_argument(
-        "--driver", choices=["chrome", "firefox", "phantomjs"], default="firefox"
-    )
+    parser.add_argument("--driver", choices=["chrome", "firefox"], default="firefox")
     parser.add_argument(
         "--diff-output", type=Path, help="Output directory for diff images"
     )

{htmlcmp-1.1.1 → htmlcmp-1.2.1}/src/htmlcmp/compare_output_server.py RENAMED Viewed

@@ -18,7 +18,6 @@ import watchdog.events
 from htmlcmp.compare_output import comparable_file, compare_files
 from htmlcmp.html_render_diff import get_browser, html_render_diff
 logger = logging.getLogger(__name__)
@@ -253,6 +252,28 @@ class Comparator:
 app = Flask("compare")
+@app.route("/script.js")
+def script_js():
+    logger.debug("Serving script.js")
+    return """
+function updateRef(path) {
+  fetch(`/update_ref/${path}`)
+    .then(response => {
+      if (response.ok) {
+        alert(`Reference updated for ${path}`);
+        location.reload();
+      } else {
+        alert(`Failed to update reference for ${path}: ${response.statusText}`);
+      }
+    })
+    .catch(error => {
+      alert(`Error updating reference for ${path}: ${error}`);
+    });
+}
+"""
 @app.route("/")
 def root():
     logger.debug("Generating root directory listing")
@@ -444,6 +465,7 @@ tr {
   padding-left: calc(1.0rem * var(--depth));
 }
 </style>
+<script src="/script.js"></script>
 </head>
 <body>
 """
@@ -493,6 +515,11 @@ function toggleChildren(parentId, show) {
   document.querySelectorAll(`tr[data-parent-id="${parentId}"]`)
     .forEach(child => {
       child.hidden = !show;
+      if (!show) {
+        toggleChildren(child.dataset.entryId, false);
+        const toggle = child.querySelector(".toggle");
+        if (toggle) toggle.textContent = "▶";
+      }
     });
 }
@@ -507,21 +534,6 @@ function toggleAll(show) {
       }
     });
 }
-function updateRef(path) {
-  fetch(`/update_ref/${path}`)
-    .then(response => {
-      if (response.ok) {
-        alert(`Reference updated for ${path}`);
-        location.reload();
-      } else {
-        alert(`Failed to update reference for ${path}: ${response.statusText}`);
-      }
-    })
-    .catch(error => {
-      alert(`Error updating reference for ${path}: ${error}`);
-    });
-}
 </script>
 </body>
 </html>
@@ -553,6 +565,7 @@ def compare(path: str):
 <style>
 html,body {{height:100%;margin:0;}}
 </style>
+<script src="/script.js"></script>
 </head>
 <body style="display:flex;flex-flow:row;">
 <div style="display:flex;flex:1;flex-flow:column;margin:5px;">
@@ -561,6 +574,7 @@ html,body {{height:100%;margin:0;}}
 </div>
 <div style="display:flex;flex:0 0 50px;flex-flow:column;">
   <a href="/image_diff/{path}" target="_blank">diff</a>
+  <button onclick="updateRef('{path}')">▶</button>
   <img src="/image_diff/{path}" width="50" height="0" style="flex:1;">
 </div>
 <div style="display:flex;flex:1;flex-flow:column;margin:5px;">
@@ -616,6 +630,27 @@ def file(variant: str, path: str):
     return send_from_directory(variant_root, path)
+@app.route("/update_ref/<path:path>")
+def update_ref(path: str):
+    logger.debug(f"Updating reference for path: {path}")
+    if not isinstance(path, str):
+        raise TypeError("Path must be a string")
+    src = Config.path_b / path
+    dst = Config.path_a / path
+    if not src.exists():
+        return f"Source file does not exist: {src}", 404
+    if src.is_file():
+        shutil.copy2(src, dst)
+    else:
+        shutil.copytree(src, dst, dirs_exist_ok=True)
+    return "Reference updated", 200
 def verbosity_to_level(verbosity: int) -> int:
     if verbosity >= 3:
         return logging.DEBUG
@@ -659,32 +694,11 @@ def setup_logging(
         root_logger.addHandler(file_handler)
-@app.route("/update_ref/<path:path>")
-def update_ref(path: str):
-    logger.debug(f"Updating reference for path: {path}")
-    if not isinstance(path, str):
-        raise TypeError("Path must be a string")
-    src = Config.path_b / path
-    dst = Config.path_a / path
-    if not src.exists():
-        return f"Source file does not exist: {src}", 404
-    if src.is_file():
-        shutil.copy2(src, dst)
-    else:
-        shutil.copytree(src, dst, dirs_exist_ok=True)
-    return "Reference updated", 200
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("ref", type=Path, help="Path to the reference directory")
     parser.add_argument("mon", type=Path, help="Path to the monitored directory")
-    parser.add_argument("--driver", choices=["chrome", "firefox", "phantomjs"])
+    parser.add_argument("--driver", choices=["chrome", "firefox"])
     parser.add_argument("--max-workers", type=int, default=1)
     parser.add_argument("--compare", action="store_true")
     parser.add_argument("--port", type=int, default=5000)

{htmlcmp-1.1.1 → htmlcmp-1.2.1}/src/htmlcmp/html_render_diff.py RENAMED Viewed

@@ -70,11 +70,7 @@ def get_browser(
             f"Expected int for max_width and max_height, got {type(max_width)} and {type(max_height)}"
         )
-    if driver == "phantomjs":
-        if shutil.which("phantomjs") is None:
-            raise EnvironmentError("PhantomJS is not installed or not found in PATH")
-        browser = webdriver.PhantomJS()
-    elif driver == "firefox":
+    if driver == "firefox":
         options = webdriver.FirefoxOptions()
         options.add_argument("--headless")
         browser = webdriver.Firefox(options=options)
@@ -109,9 +105,7 @@ def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("a", type=Path, help="Path to the first HTML file")
     parser.add_argument("b", type=Path, help="Path to the second HTML file")
-    parser.add_argument(
-        "--driver", choices=["chrome", "firefox", "phantomjs"], default="firefox"
-    )
+    parser.add_argument("--driver", choices=["chrome", "firefox"], default="firefox")
     parser.add_argument("--max-width", default=1000)
     parser.add_argument("--max-height", default=10000)
     args = parser.parse_args()

{htmlcmp-1.1.1 → htmlcmp-1.2.1}/src/htmlcmp/tidy_output.py RENAMED Viewed

@@ -10,7 +10,7 @@ from pathlib import Path
 from htmlcmp.common import bcolors
-def tidy_json(path: Path) -> int:
+def tidy_json(path: Path, verbose: bool = False) -> int:
     if not isinstance(path, Path):
         raise TypeError("path must be a Path object")
     if not path.is_file():
@@ -21,10 +21,11 @@ def tidy_json(path: Path) -> int:
             json.load(f)
         return 0
     except ValueError:
+        print(f"{bcolors.FAIL}Error: {path} is not a valid JSON file{bcolors.ENDC}")
         return 1
-def tidy_html(path: Path, html_tidy_config: Path = None) -> int:
+def tidy_html(path: Path, html_tidy_config: Path = None, verbose: bool = False) -> int:
     if not isinstance(path, Path):
         raise TypeError("path must be a Path object")
     if not path.is_file():
@@ -41,6 +42,15 @@ def tidy_html(path: Path, html_tidy_config: Path = None) -> int:
     result = subprocess.run(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True
     )
+    if result.stdout:
+        if verbose and result.returncode == 0:
+            print(result.stdout)
+        elif verbose and result.returncode == 1:
+            print(f"{bcolors.WARNING}Warning: {path} has warnings{bcolors.ENDC}")
+            print(f"{bcolors.WARNING}{result.stdout}{bcolors.ENDC}")
+        elif verbose or result.returncode > 1:
+            print(f"{bcolors.FAIL}Error: {path} has errors{bcolors.ENDC}")
+            print(f"{bcolors.FAIL}{result.stdout}{bcolors.ENDC}")
     if result.returncode == 1:
         return 1
     if result.returncode > 1:
@@ -48,16 +58,16 @@ def tidy_html(path: Path, html_tidy_config: Path = None) -> int:
     return 0
-def tidy_file(path: Path, html_tidy_config: Path = None) -> int:
+def tidy_file(path: Path, html_tidy_config: Path = None, verbose: bool = False) -> int:
     if not isinstance(path, Path):
         raise TypeError("path must be a Path object")
     if not path.is_file():
         raise FileNotFoundError(f"{path} is not a file")
     if path.suffix == ".json":
-        return tidy_json(path)
+        return tidy_json(path, verbose=verbose)
     elif path.suffix == ".html":
-        return tidy_html(path, html_tidy_config=html_tidy_config)
+        return tidy_html(path, html_tidy_config=html_tidy_config, verbose=verbose)
 def tidyable_file(path: Path) -> bool:
@@ -74,7 +84,11 @@ def tidyable_file(path: Path) -> bool:
 def tidy_dir(
-    path: Path, level: int = 0, prefix: str = "", html_tidy_config: Path = None
+    path: Path,
+    level: int = 0,
+    prefix: str = "",
+    html_tidy_config: Path = None,
+    verbose: bool = False,
 ) -> dict[str, list[Path]]:
     if not isinstance(path, Path):
         raise TypeError("path must be a Path object")
@@ -104,7 +118,7 @@ def tidy_dir(
     for filename in [path.name for path in files]:
         filepath = path / filename
-        tidy = tidy_file(filepath, html_tidy_config=html_tidy_config)
+        tidy = tidy_file(filepath, html_tidy_config=html_tidy_config, verbose=verbose)
         if tidy == 0:
             print(f"{prefix_file}{bcolors.OKGREEN}{filename} ✓{bcolors.ENDC}")
         elif tidy == 1:
@@ -121,6 +135,7 @@ def tidy_dir(
             level=level + 1,
             prefix=prefix + "│   ",
             html_tidy_config=html_tidy_config,
+            verbose=verbose,
         )
         result["warning"].extend(subresult["warning"])
         result["error"].extend(subresult["error"])
@@ -134,9 +149,16 @@ def main():
     parser.add_argument(
         "--html-tidy-config", type=Path, help="Path to tidy config file"
     )
+    parser.add_argument(
+        "--verbose",
+        action="store_true",
+        help="Print verbose output (warnings and errors)",
+    )
     args = parser.parse_args()
-    result = tidy_dir(args.path, html_tidy_config=args.html_tidy_config)
+    result = tidy_dir(
+        args.path, html_tidy_config=args.html_tidy_config, verbose=args.verbose
+    )
     if result["error"]:
         return 1

{htmlcmp-1.1.1 → htmlcmp-1.2.1}/src/htmlcmp.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htmlcmp
-Version: 1.1.1
+Version: 1.2.1
 Summary: Compare HTML files by rendered output
 Author: Andreas Stefl
 Maintainer-email: Andreas Stefl <stefl.andreas@gmail.com>

{htmlcmp-1.1.1 → htmlcmp-1.2.1}/tests/test_html_render_diff.py RENAMED Viewed

@@ -31,12 +31,6 @@ def test_get_browser():
     assert browser.name == "firefox"
     browser.quit()
-    # Test with PhantomJS
-    if shutil.which("phantomjs") is not None:
-        browser = get_browser("phantomjs")
-        assert browser.name == "phantomjs"
-        browser.quit()
 def test_html_render_diff():
     test1 = Path(__file__).parent / "test1.html"