Add fix and test for filename handlers (#28)

Author: clemense

src/yourdfpy/urdf.py

@@ -454,21 +454,25 @@ def filename_handler_ignore_directive(fname):
     Returns:
         str: The file name without the prefix.
     """
-    return fname.split(f":{os.path.sep}{os.path.sep}")[-1]
+    if "://" in fname or ":\\\\" in fname:
+        return ":".join(fname.split(":")[1:])[2:]
+    return fname
 
 
 def filename_handler_ignore_directive_package(fname):
     """A filename handler that removes the 'package://' directive and the package it refers to.
+    It subsequently calls filename_handler_ignore_directive, i.e., it removes any other directive.
 
     Args:
         fname (str): A file name.
 
     Returns:
         str: The file name without 'package://' and the package name.
     """
-    if fname.startswith("package:"):
-        return os.path.sep.join(
-            fname.split(f":{os.path.sep}{os.path.sep}")[-1].split(os.path.sep)[1:]
+    if fname.startswith("package://"):
+        string_length = len("package://")
+        return os.path.join(
+            *os.path.normpath(fname[string_length:]).split(os.path.sep)[1:]
         )
     return filename_handler_ignore_directive(fname)
 

tests/test_utils.py

@@ -0,0 +1,110 @@
+import pytest
+from functools import partial
+
+from yourdfpy import urdf
+
+__author__ = "Clemens Eppner"
+__copyright__ = "Clemens Eppner"
+__license__ = "MIT"
+
+
+def test_filename_handler_absolute2relative():
+    result = urdf.filename_handler_absolute2relative(
+        fname="/a/b/c/d.urdf",
+        dir="/a/b/",
+    )
+    assert result == "c/d.urdf"
+
+    result = urdf.filename_handler_absolute2relative(
+        fname="/a/b/c/d.urdf",
+        dir="/c/d/",
+    )
+    assert result == "/a/b/c/d.urdf"
+
+
+def test_filename_handler_add_prefix():
+    result = urdf.filename_handler_add_prefix(
+        fname="a/b/c/hoho.urdf",
+        prefix="package://",
+    )
+    assert result == "package://a/b/c/hoho.urdf"
+
+
+def test_filename_handler_ignore_directive():
+    result = urdf.filename_handler_ignore_directive(fname="/a/b/c/d.urdf")
+    assert result == "/a/b/c/d.urdf"
+
+    result = urdf.filename_handler_ignore_directive(fname="package://a/b/c/d.urdf")
+    assert result == "a/b/c/d.urdf"
+
+    result = urdf.filename_handler_ignore_directive(fname="file://a/b/c/d.urdf")
+    assert result == "a/b/c/d.urdf"
+
+    result = urdf.filename_handler_ignore_directive(fname="file:///a/b/c/d.urdf")
+    assert result == "/a/b/c/d.urdf"
+
+    result = urdf.filename_handler_ignore_directive(fname="file:\\\\a\\b\\c\\d.urdf")
+    assert result == "a\\b\\c\\d.urdf"
+
+
+def test_filename_handler_ignore_directive_package():
+    result = urdf.filename_handler_ignore_directive_package(fname="/a/b/c/d.urdf")
+    assert result == "/a/b/c/d.urdf"
+
+    result = urdf.filename_handler_ignore_directive_package(
+        fname="package://a/b/c/d.urdf"
+    )
+    assert result == "b/c/d.urdf"
+
+    result = urdf.filename_handler_ignore_directive_package(fname="file://a/b/c/d.urdf")
+    assert result == "a/b/c/d.urdf"
+
+    result = urdf.filename_handler_ignore_directive_package(
+        fname="file:///a/b/c/d.urdf"
+    )
+    assert result == "/a/b/c/d.urdf"
+
+    result = urdf.filename_handler_ignore_directive_package(
+        fname="file:\\\\a\\b\\c\\d.urdf"
+    )
+    assert result == "a\\b\\c\\d.urdf"
+
+
+def test_filename_handler_magic():
+    result = urdf.filename_handler_magic(fname="/a/b/c/d/e.urdf", dir="/a/")
+    assert result == "/a/b/c/d/e.urdf"
+
+
+def test_filename_handler_meta():
+    result = urdf.filename_handler_meta(
+        fname="/a/b/c/d/e.urdf",
+        filename_handlers=[
+            urdf.filename_handler_ignore_directive,
+            partial(urdf.filename_handler_absolute2relative, dir="/a/"),
+        ],
+    )
+    assert result == "/a/b/c/d/e.urdf"
+
+
+def test_filename_handler_null():
+    result = urdf.filename_handler_null(fname="a/b/c/d/e.urdf")
+    assert result == "a/b/c/d/e.urdf"
+
+
+def test_filename_handler_relative():
+    result = urdf.filename_handler_relative(fname="d/e.urdf", dir="/a/b/c")
+    assert result == "/a/b/c/d/e.urdf"
+
+
+def test_filename_handler_relative_to_urdf_file():
+    result = urdf.filename_handler_relative_to_urdf_file(
+        fname="b/c/d.urdf", urdf_fname="/a/b.urdf"
+    )
+    assert result == "/a/b/c/d.urdf"
+
+
+def test_filename_handler_relative_to_urdf_file_recursive():
+    result = urdf.filename_handler_relative_to_urdf_file_recursive(
+        fname="b/c/d.urdf", urdf_fname="/a/b.urdf", level=1
+    )
+    assert result == "/b/c/d.urdf"