entangled-cli 2.3.0__py3-none-any.whl → 2.3.2__py3-none-any.whl

entangled/commands/reset.py

@@ -40,7 +40,7 @@ def reset():
             for path in input_file_list:
                 logging.debug("reading `%s`", path)
                 t.update(path)
-                _, _ = read_markdown_file(path, refs=refs, hooks=hooks)
+                _, _ = read_markdown_file(t, path, refs=refs, hooks=hooks)
 
             for h in hooks:
                 h.pre_tangle(refs)

entangled/commands/stitch.py

@@ -46,17 +46,16 @@ def stitch(*, force: bool = False, show: bool = False):
     refs = ReferenceMap()
     content: dict[Path, list[Content]] = {}
     try:
-        for path in input_file_list:
-            logging.debug("reading `%s`", path)
-            _, c = read_markdown_file(path, refs=refs, hooks=hooks)
-            content[path] = c
-
         with transaction(mode) as t:
+            for path in input_file_list:
+                logging.debug("reading `%s`", path)
+                _, c = read_markdown_file(t, path, refs=refs, hooks=hooks)
+                content[path] = c
+
             for path in t.db.managed_files:
                 logging.debug("reading `%s`", path)
                 t.update(path)
-                with open(path, "r") as f:
-                    CodeReader(path, refs).run(f.read())
+                _ = CodeReader(path, refs).run(t.read(path))
 
             for path in input_file_list:
                 t.write(path, stitch_markdown(refs, content[path]), [])

entangled/commands/tangle.py

@@ -52,7 +52,7 @@ def tangle(*, annotate: str | None = None, force: bool = False, show: bool = Fal
             for path in input_file_list:
                 logging.debug("reading `%s`", path)
                 t.update(path)
-                _, _ = read_markdown_file(path, refs=refs, hooks=hooks)
+                _, _ = read_markdown_file(t, path, refs=refs, hooks=hooks)
 
             for h in hooks:
                 h.pre_tangle(refs)

entangled/commands/watch.py

@@ -20,7 +20,12 @@ class EventHandler(FileSystemEventHandler):
         if event.event_type == "opened":
             return
         config.read()
-        path = Path(event.src_path)
+
+        if isinstance(event.src_path, bytes):
+            path = Path(event.src_path.decode("utf-8"))
+        else:
+            path = Path(event.src_path)
+
         if path.absolute().is_relative_to(Path("./.entangled").absolute()):
             return
         if any(path.absolute().is_relative_to(p.absolute()) for p in self.watched):

entangled/io/stat.py

@@ -55,7 +55,7 @@ class FileData:
         if stat is None:
             return None
 
-        with open(path, "r") as f:
+        with open(path, "r", encoding="utf-8") as f:
             content = f.read()
             digest = hexdigest(content)
 

entangled/io/transaction.py

@@ -158,6 +158,9 @@ class Transaction:
         else:
             logging.debug("target `%s` unchanged", path)
 
+    def read(self, path: Path) -> str:
+        return self.fs[path].content
+
     def clear_orphans(self):
         orphans = self.db.managed_files - self.passed
         if not orphans:

entangled/io/virtual.py

@@ -25,7 +25,7 @@ def atomic_write(target: Path, content: str, mode: int | None):
     """
     tmp_dir = Path() / ".entangled" / "tmp"
     tmp_dir.mkdir(exist_ok=True, parents=True)
-    with tempfile.NamedTemporaryFile(mode="w", delete=False, dir=tmp_dir) as f:
+    with tempfile.NamedTemporaryFile(mode="w", delete=False, dir=tmp_dir, encoding="utf-8") as f:
         _ = f.write(assure_final_newline(content))
         # Flush and sync contents to disk
         f.flush()
@@ -53,7 +53,7 @@ class FileCache:
         """
         if key not in self._data:
             if (s := stat(key)) is None:
-                raise KeyError()
+                raise FileNotFoundError(key)
             self._data[key] = s
         return self._data[key]
 

entangled/markdown_reader.py

@@ -8,6 +8,8 @@ import mawk
 import logging
 
 from entangled.config.language import Language
+from entangled.io.transaction import Transaction
+from entangled.io.virtual import FileCache
 
 from .config import config
 from .utility import first
@@ -146,8 +148,8 @@ class MarkdownLexer(mawk.RuleSet):
         self.flush_plain_text()
         return []
 
-
 def read_markdown_file(
+    t: Transaction,
     path: Path,
     refs: ReferenceMap | None = None,
     hooks: list[HookBase] | None = None) \
@@ -167,9 +169,8 @@ def read_markdown_file(
     content is a list of `PlainText | ReferenceId`. Each `ReferenceId` can be
     looked up in the reference map.
     """
-    with open(path, "r") as f:
-        rel_path = path.resolve().relative_to(Path.cwd())
-        return read_markdown_string(f.read(), rel_path, refs, hooks)
+    rel_path = path.resolve().relative_to(Path.cwd())
+    return read_markdown_string(t.read(rel_path), rel_path, refs, hooks)
 
 
 def read_markdown_string(

{entangled_cli-2.3.0.dist-info → entangled_cli-2.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entangled-cli
-Version: 2.3.0
+Version: 2.3.2
 Summary: Literate Programming toolbox
 Project-URL: Homepage, https://entangled.github.io/
 Project-URL: Repository, https://github.com/entangled/entangled.py
@@ -20,7 +20,7 @@ Requires-Dist: repl-session>=0.2.0
 Requires-Dist: rich-argparse<2,>=1.4.0
 Requires-Dist: rich<14,>=13.3.5
 Requires-Dist: tomlkit<0.13,>=0.12.1
-Requires-Dist: watchdog<4,>=3.0.0
+Requires-Dist: watchdog>=6.0.0
 Description-Content-Type: text/markdown
 
 # Entangled

{entangled_cli-2.3.0.dist-info → entangled_cli-2.3.2.dist-info}/RECORD

@@ -4,7 +4,7 @@ entangled/document.py,sha256=uKU0uvtJmsG4exxt2D4CGSmqiQYK2oTimGQyheTTxNM,4512
 entangled/from_str.py,sha256=rW2qXsfZxCuyypSE6FKb59KyfiqCp29ywxKnLa5Fil0,674
 entangled/logging.py,sha256=zbo8oMDeYbwMg0tom-aOMMqR_b6guwybpisOj4viVw0,1488
 entangled/main.py,sha256=8leHmSrVuMD9YP1_C_K2cYTnNnz-BRL9YpeT-J1QRJU,1514
-entangled/markdown_reader.py,sha256=5j-p43__EnLjSxa6neRl5YCUvT8Z7HbySzPjBjgd8aA,7495
+entangled/markdown_reader.py,sha256=UUZyijrJpSCALbrKxB8ViuwCl5v5lrj9i8JzarzMwEI,7575
 entangled/parsing.py,sha256=HuIis_b5tEyVdfxprRtnhYNggx_SjDc5PzE5iJjPvoI,5440
 entangled/properties.py,sha256=sOzFigf_TuXCcT8cg-ilJCx3nqOBAifLU7oI36T9Cy8,2384
 entangled/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,12 +16,12 @@ entangled/version.py,sha256=RTD5BZt2bZcRpIcZQCepPi_KiJpK57KCNRK168jjZrM,85
 entangled/commands/__init__.py,sha256=dI8ZHT8j5Rt4lF5_GizqlCs7bUAvY5CZ5KmXF6zhLIw,316
 entangled/commands/brei.py,sha256=B3EYrD8IewVozyZOfUqJh0vTfm4l2SpebzGbzxQxaf4,1380
 entangled/commands/new.py,sha256=atvJa58tYkH9fL1-6iMrDElQedUTM2tit3GBKn6P99w,7065
-entangled/commands/reset.py,sha256=Py3zPtkR4GvN8lPa5tpoGFWGm2YNaN9O5eQMzbKb7fA,1916
+entangled/commands/reset.py,sha256=OMmMH4LxBLAt2376KEtI-F9rKyFaSD0SRLwnbBxUfIQ,1919
 entangled/commands/status.py,sha256=KiQ1zr45m62NSOMDDGnSzy7i7QrSor3PLAhSdHzTZb4,1681
-entangled/commands/stitch.py,sha256=pAdA2n69gxjjruwfKqJZWchdGH2PiHE0lUx4Kgm9XsY,1990
+entangled/commands/stitch.py,sha256=7XFzxwnh_HnIgYktOnQgEKJdc1Ag_rox8URF4OynQ4A,1970
 entangled/commands/sync.py,sha256=89poUlyfz_90_PkJrZMi22ze7D-b2mhfMi11GxZMPmY,1211
-entangled/commands/tangle.py,sha256=A-Cyqpqt0buYgJxuovJZx2r-NbU8da93rcIRDJs9EaU,2161
-entangled/commands/watch.py,sha256=CvcE9kEe1RweStz0gHrRQV0j76KdSPXBjhZ4G61d3wo,1642
+entangled/commands/tangle.py,sha256=JOiM1e_Dk0p2mcq27mZ3bUc6MdbVBeNyxVjyQ-fw55w,2164
+entangled/commands/watch.py,sha256=sEKI3vdRCkfdeACY9Ms9A2iXN-Z33atvDLdOFBYVyqA,1764
 entangled/config/__init__.py,sha256=HnhEyUn0p9dXjGdHz385I3UNjF5c8l1LNOS87pOLeYg,6321
 entangled/config/language.py,sha256=QuqyfWA5eAbhxk-NlpBtyqYTFC8457hmeLUaAcIgJ3I,1826
 entangled/config/templates.py,sha256=NPT5TaAczmLXXlFMaLeWO7YsRQZ5kHKki917LkFdlNM,1152
@@ -39,11 +39,11 @@ entangled/hooks/spdx_license.py,sha256=ptZlJ18AnneLbNprBlvu_PkvSxlLIQ4tnL5X55tl0
 entangled/hooks/task.py,sha256=0PXnJIfBCTpVAaSxGLdSWETnq1Q1YgYqeldKwX0fm8k,3847
 entangled/io/__init__.py,sha256=floq3Cc6jBBVJLzmeLYxW_-ebE1Ien76dKr1AzyOjGw,280
 entangled/io/filedb.py,sha256=eeLe_wqkHesof-nJknlEJIHjHLGwVJCHQ83ir2p1-ZQ,3913
-entangled/io/stat.py,sha256=L2BitRGewviJggkNmicMDwNMiC45CNEX600sp6lt2cY,1690
-entangled/io/transaction.py,sha256=Oyf59sOVdYvmWglNfTUanHCaVtdoZBKHgfbLqMRILkA,7622
-entangled/io/virtual.py,sha256=5xKEt1CmmwXXO23HNmfGlXPGD8HDHcaMlSMO9ZK5twQ,2965
-entangled_cli-2.3.0.dist-info/METADATA,sha256=-tkZRPoksrWVgTyFLh7zCtxoNTQAtSV3HWgRCy2igeA,18972
-entangled_cli-2.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-entangled_cli-2.3.0.dist-info/entry_points.txt,sha256=QekvPWFApAipNUVUT7jp-i7d_1V8INajgO8JeBK61y8,49
-entangled_cli-2.3.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-entangled_cli-2.3.0.dist-info/RECORD,,
+entangled/io/stat.py,sha256=vtfaqzCXlM0UwfrIB-yDYGiBcePVB1SWZ8D1CxTrlSE,1708
+entangled/io/transaction.py,sha256=xPB_tqeVkYz6gLisz6AgDtgfECDuN_3CiInD3JBUfSs,7699
+entangled/io/virtual.py,sha256=PjYzaizG1dTwEBAmXTTisekgU3k3TkX9VY7K8XLhDwQ,2995
+entangled_cli-2.3.2.dist-info/METADATA,sha256=iXcjCDQHGJxC7zmFe5pdAw0TX-XpsF1Hfmt-99PF8i0,18969
+entangled_cli-2.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+entangled_cli-2.3.2.dist-info/entry_points.txt,sha256=QekvPWFApAipNUVUT7jp-i7d_1V8INajgO8JeBK61y8,49
+entangled_cli-2.3.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+entangled_cli-2.3.2.dist-info/RECORD,,