viur-cli 2.3.8__tar.gz → 2.3.10__tar.gz

{viur_cli-2.3.8/src/viur_cli.egg-info → viur_cli-2.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: viur-cli
-Version: 2.3.8
+Version: 2.3.10
 Summary: Command-line interface for ViUR application maintenance.
 Author-email: "Andreas H. Kelch" <ak@mausbrand.de>
 License-Expression: MIT

{viur_cli-2.3.8 → viur_cli-2.3.10}/src/viur_cli/scriptor/cli.py

@@ -3,7 +3,6 @@ import click
 import json
 import requests
 import os
-import hashlib
 import difflib
 import asyncio
 import sys
@@ -29,6 +28,34 @@ def get_modules():
     return _modules
 
 
+def normalize_path(path: str | None) -> str:
+    """
+    Normalize a tree path for comparison.
+
+    The server stores node and leaf paths without surrounding slashes, whereas paths
+    derived from the local working directory may carry a leading or trailing slash.
+
+    :param path: The path to normalize, may be ``None``.
+    :return: The path without leading or trailing slashes.
+    """
+    return (path or "").strip("/")
+
+
+def scripts_differ(remote: str | None, local: str | None) -> bool:
+    """
+    Compare a remote and a local script, ignoring differing line endings.
+
+    Scripts edited in the browser are stored with CRLF, whereas local files usually use
+    LF. Comparing them line by line -- as ``pull`` already does -- keeps both commands
+    from reporting a file as modified just because of its line endings.
+
+    :param remote: The script as stored on the server, may be ``None``.
+    :param local: The script as read from the working directory, may be ``None``.
+    :return: True if the scripts differ in anything but their line endings.
+    """
+    return (remote or "").splitlines() != (local or "").splitlines()
+
+
 @cli.group()
 def script():
     """
@@ -164,7 +191,7 @@ def pull(ctx: click.Context, force: bool):
                 if os.path.exists(_path):
                     if force:
                         with open(_path, "r") as f:
-                            changed = f.read().splitlines() != (entry["script"] or "").splitlines()
+                            changed = scripts_differ(entry["script"], f.read())
                         os.remove(_path)
                         create_file()
                         if changed:
@@ -265,8 +292,6 @@ def push(ctx: click.Context, force: bool, watch: bool):
             if not working_dir.endswith("/"):
                 tmp += "/"
             file = file.removeprefix(tmp)
-            if _type == "node":
-                file += "/"
 
             is_root = False
             parent = parent.removeprefix(tmp).removeprefix(working_dir.replace("/", ""))
@@ -277,7 +302,7 @@ def push(ctx: click.Context, force: bool, watch: bool):
                 # Search for the entry with the given path
                 entry = None
                 async for item in tree.list(skel_type=_type):
-                    if item.get("path") == file:
+                    if normalize_path(item.get("path")) == normalize_path(file):
                         entry = item
                         break
 
@@ -287,8 +312,7 @@ def push(ctx: click.Context, force: bool, watch: bool):
                     with open(_real_file, "r") as f:
                         file_content = f.read()
 
-                        if hashlib.sha256((entry["script"] or "").encode("utf-8")).digest() \
-                                != hashlib.sha256(file_content.encode("utf-8")).digest():
+                        if scripts_differ(entry["script"], file_content):
                             can_push = force
                             if not can_push:
                                 can_push = click.confirm(f"Content of {file} changed. Overwrite?")
@@ -317,18 +341,31 @@ def push(ctx: click.Context, force: bool, watch: bool):
                             root_node_entry = node
                             break
 
-                    if not parent.endswith("/"):
-                        parent += "/"
+                    if root_node_entry is None:
+                        click.echo(click.style(
+                            "Unable to determine the root node of the script tree. "
+                            "Make sure the server is reachable and the session is still valid, "
+                            "otherwise run `viur script setup` again.",
+                            fg="red"
+                        ))
+                        return
 
                     parent_entry = root_node_entry
                     if not is_root:
                         # Find parent entry
                         parent_entry = None
                         async for node in tree.list(skel_type="node"):
-                            if node.get("path") == parent:
+                            if normalize_path(node.get("path")) == normalize_path(parent):
                                 parent_entry = node
                                 break
 
+                        if parent_entry is None:
+                            click.echo(click.style(
+                                f"Skipping {file}, because its parent folder {parent} does not exist on the server.",
+                                fg="red"
+                            ))
+                            continue
+
                     last = file
                     if file.count("/") > 0:
                         _split = [_f for _f in file.split("/") if _f]

{viur_cli-2.3.8 → viur_cli-2.3.10}/src/viur_cli/scriptor/login.py

@@ -49,7 +49,7 @@ def ensure_login(
 
         cookie_str: str = callback_app.cookie.get()
         key, value = cookie_str.split(";", 1)[0].split("=")
-        scriptor_config.get("cookies",{})[key] = value
+        scriptor_config.setdefault("cookies", {})[key] = value
         scriptor_config.save()
 
         return True

{viur_cli-2.3.8 → viur_cli-2.3.10}/src/viur_cli/version.py

@@ -1,2 +1,2 @@
-__version__ = "2.3.8"
+__version__ = "2.3.10"
 MINIMAL_PIPENV = "2023.11.15"

{viur_cli-2.3.8 → viur_cli-2.3.10/src/viur_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: viur-cli
-Version: 2.3.8
+Version: 2.3.10
 Summary: Command-line interface for ViUR application maintenance.
 Author-email: "Andreas H. Kelch" <ak@mausbrand.de>
 License-Expression: MIT