From 339b623e89ebdbdd4a715884757b6a1496ccabae Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 18 Oct 2019 00:27:01 +0200
Subject: [PATCH] minor changes in prefix and fullpath preparing

---
 pype/services/rest_api/lib/factory.py | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/pype/services/rest_api/lib/factory.py b/pype/services/rest_api/lib/factory.py
index 3a24fe5ae8..3c9f84cc85 100644
--- a/pype/services/rest_api/lib/factory.py
+++ b/pype/services/rest_api/lib/factory.py
@@ -20,14 +20,26 @@ def prepare_fullpath(path, prefix):
     :rtype: str
     """
 
+    if isinstance(path, (list, tuple)):
+        path_items = path
+    else:
+        path_items = [part for part in path.split("/") if part]
+
+    fullpath = "/"
     if path and prefix:
-        fullpath = "{}/{}".format(prefix, path).replace("//", "/")
+        items = [part for part in prefix.split("/") if part]
+        items.extend(path_items)
+        fullpath = "/".join(items)
+        if path.endswith("/"):
+            fullpath += "/"
+
     elif path:
-        fullpath = path
+        fullpath = "/".join(path_items)
+        if path.endswith("/"):
+            fullpath += "/"
+
     elif prefix:
         fullpath = prefix
-    else:
-        fullpath = "/"
 
     if not fullpath.startswith("/"):
         fullpath = "/{}".format(fullpath)
@@ -86,6 +98,9 @@ def prepare_prefix(url_prefix):
     if not url_prefix:
         return None
 
+    while url_prefix.endswith("/"):
+        url_prefix = url_prefix[:-1]
+
     if not url_prefix.startswith("/"):
         url_prefix = "/{}".format(url_prefix)
 
@@ -161,9 +176,7 @@ def prepare_callback_info(callback):
     callback_args_len = 0
     if callback_args:
         callback_args_len = len(callback_args)
-        if (
-            type(callback).__name__ == "method"
-        ):
+        if type(callback).__name__ == "method":
             callback_args_len -= 1
 
     defaults = callback_info.defaults