Skip to content

Commit 978d22d

Browse files
author
sukunis
committed
handle customize or empty paths for ManagedRepository or OMERO
1 parent a56a4f4 commit 978d22d

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

omero-openlink/omero_openlink/scripts/omero/Create_OpenLink.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,25 @@ def get_omero_paths(client):
8787
managed_repo_dir = None
8888
orig_repo_dir = None
8989
for desc in repos.descriptions:
90-
if desc.name.val == "ManagedRepository":
90+
if "ManagedRepository".lower() in desc.name.val.lower():
9191
managed_repo_dir = desc.path.val + desc.name.val
92-
if desc.name.val == "OMERO":
92+
if "OMERO".lower() in desc.name.val.lower():
9393
orig_repo_dir = desc.path.val + desc.name.val
9494

95+
# if the repo paths could not be identify, check custom configurations from config of omero
96+
if not managed_repo_dir:
97+
managed_repo_dir=client.sf.getConfigService().getConfigValue("omero.managed.dir");
98+
if not orig_repo_dir:
99+
orig_repo_dir=client.sf.getConfigService().getConfigValue("omero.data.dir");
100+
101+
# catching empty paths
102+
if not managed_repo_dir:
103+
print("ERROR: no specification was found for managed repository path. Please check path of type Managed under \n >>omero fs repos \n or the value of omero.managed.dir under\n >>omero config get")
104+
return None,None
105+
106+
if not orig_repo_dir:
107+
print("ERROR: no specification was found for omero repository path. Please check path of type Public under \n >>omero fs repos \n or the value of omero.data.dir under\n >>omero config get")
108+
return None,None
95109

96110
if managed_repo_dir and not managed_repo_dir.endswith('/'):
97111
managed_repo_dir = managed_repo_dir + '/'

0 commit comments

Comments
 (0)