Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

make sure all roots end without slashes

Browse source
This commit is contained in:
iLLiCiTiT 2021-11-22 18:29:52 +01:00
parent 97a2584fc2
commit 17b32059e4
1 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

42
openpype/modules/default_modules/job_queue/module.py
View file

@ -53,19 +53,37 @@ class JobQueueModule(OpenPypeModule):
server_url = modules_settings.get("server_url") or "" server_url = modules_settings.get("server_url") or ""
self._server_url = self.url_conversion(server_url) self._server_url = self.url_conversion(server_url)
jobs_root_mapping = modules_settings.get("jobs_root") jobs_root_mapping = self._roots_mapping_conversion(
if not jobs_root_mapping: modules_settings.get("jobs_root")
jobs_root_mapping = { )
"windows": "",
"linux": "",
"darwin": ""
}
self._jobs_root_mapping = jobs_root_mapping self._jobs_root_mapping = jobs_root_mapping
# Is always enabled # Is always enabled
# - the module does nothing until is used # - the module does nothing until is used
self.enabled = True self.enabled = True
@classmethod
def _root_conversion(cls, root_path):
"""Make sure root path does not end with slash."""
# Return empty string if path is invalid
if not root_path:
return ""
# Remove all slashes
while root_path.endswith("/") or root_path.endswith("\\"):
root_path = root_path[:-1]
return root_path
@classmethod
def _roots_mapping_conversion(cls, roots_mapping):
roots_mapping = roots_mapping or {}
for platform_name in ("windows", "linux", "darwin"):
roots_mapping[platform_name] = cls._root_conversion(
roots_mapping.get(platform_name)
)
return roots_mapping
@staticmethod @staticmethod
def url_conversion(url, ws=False): def url_conversion(url, ws=False):
if sys.version_info[0] == 2: if sys.version_info[0] == 2:
@ -110,13 +128,9 @@ class JobQueueModule(OpenPypeModule):
def get_jobs_root_from_settings(cls): def get_jobs_root_from_settings(cls):
module_settings = get_system_settings()["modules"] module_settings = get_system_settings()["modules"]
jobs_root_mapping = module_settings.get(cls.name, {}).get("jobs_root") jobs_root_mapping = module_settings.get(cls.name, {}).get("jobs_root")
if not jobs_root_mapping: converted_mapping = cls._roots_mapping_conversion(jobs_root_mapping)
jobs_root_mapping = {
"windows": "", return converted_mapping[platform.system().lower()]
"linux": "",
"darwin": ""
}
return jobs_root_mapping.get(platform.system().lower())
@property @property
def server_url(self): def server_url(self):