htmlcmp 1.0.12__tar.gz → 1.0.15__tar.gz

{htmlcmp-1.0.12 → htmlcmp-1.0.15}/PKG-INFO

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

{htmlcmp-1.0.12 → htmlcmp-1.0.15}/pyproject.toml

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

{htmlcmp-1.0.12 → htmlcmp-1.0.15}/src/htmlcmp/compare_output_server.py

@@ -12,8 +12,8 @@ from flask import Flask, send_from_directory, send_file
 import watchdog.observers
 import watchdog.events
 
-from compare_output import comparable_file, compare_files
-from html_render_diff import get_browser, html_render_diff
+from htmlcmp.compare_output import comparable_file, compare_files
+from htmlcmp.html_render_diff import get_browser, html_render_diff
 
 
 class Config:
@@ -33,12 +33,14 @@ class Observer:
                 self._path = path
 
             def dispatch(self, event):
-                if event.event_type in ["opened"]:
-                    return
+                event_type = event.event_type
+                src_path = Path(event.src_path)
 
-                if event.src_path.is_file():
-                    Config.comparator.submit(event.src_path.relative_to(self._path))
+                if event_type in ["opened"]:
+                    return
 
+                if src_path.is_file():
+                    Config.comparator.submit(src_path.relative_to(self._path))
         self._observer = watchdog.observers.Observer()
         self._observer.schedule(Handler(Config.path_a), Config.path_a, recursive=True)
         self._observer.schedule(Handler(Config.path_b), Config.path_b, recursive=True)
@@ -52,7 +54,7 @@ class Observer:
             if not a.is_dir() or not b.is_dir():
                 raise ValueError("Both paths must be directories")
 
-            common_path = a / Config.path_a
+            common_path = a.relative_to(Config.path_a)
 
             left = sorted(p.name for p in a.iterdir())
             right = sorted(p.name for p in b.iterdir())
@@ -106,8 +108,6 @@ class Comparator:
     def compare(self, path: Path):
         if not isinstance(path, Path):
             raise TypeError("Path must be of type Path")
-        if not path.is_file():
-            raise ValueError("Path must be a file")
         if path not in self._future:
             raise RuntimeError("Path not submitted for comparison")
 
@@ -166,7 +166,7 @@ def root():
         if not a.is_dir() or not b.is_dir():
             raise ValueError("Both paths must be directories")
 
-        common_path = a / Config.path_a
+        common_path = a.relative_to(Config.path_a)
 
         left = sorted(p.name for p in a.iterdir())
         right = sorted(p.name for p in b.iterdir())

{htmlcmp-1.0.12 → htmlcmp-1.0.15}/src/htmlcmp.egg-info/PKG-INFO

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