projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14510: Setting collection cache wip
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
fsaccess.py
diff --git
a/sdk/cwl/arvados_cwl/fsaccess.py
b/sdk/cwl/arvados_cwl/fsaccess.py
index 9a893df781f477dadac19264fb49cfa77b459bb7..5981268128486496f22d28b4928d0b90b5775e7e 100644
(file)
--- a/
sdk/cwl/arvados_cwl/fsaccess.py
+++ b/
sdk/cwl/arvados_cwl/fsaccess.py
@@
-83,7
+83,7
@@
class CollectionFsAccess(cwltool.stdfsaccess.StdFsAccess):
p = sp[0]
if p.startswith("keep:") and arvados.util.keep_locator_pattern.match(p[5:]):
pdh = p[5:]
p = sp[0]
if p.startswith("keep:") and arvados.util.keep_locator_pattern.match(p[5:]):
pdh = p[5:]
- return (self.collection_cache.get(pdh),
sp[1]
if len(sp) == 2 else None)
+ return (self.collection_cache.get(pdh),
urlparse.unquote(sp[1])
if len(sp) == 2 else None)
else:
return (None, path)
else:
return (None, path)
@@
-265,6
+265,12
@@
class CollectionFetcher(DefaultFetcher):
return super(CollectionFetcher, self).urljoin(base_url, url)
return super(CollectionFetcher, self).urljoin(base_url, url)
+ schemes = [u"file", u"http", u"https", u"mailto", u"keep", u"arvwf"]
+
+ def supported_schemes(self): # type: () -> List[Text]
+ return self.schemes
+
+
workflow_uuid_pattern = re.compile(r'[a-z0-9]{5}-7fd4e-[a-z0-9]{15}')
pipeline_template_uuid_pattern = re.compile(r'[a-z0-9]{5}-p5p6p-[a-z0-9]{15}')
workflow_uuid_pattern = re.compile(r'[a-z0-9]{5}-7fd4e-[a-z0-9]{15}')
pipeline_template_uuid_pattern = re.compile(r'[a-z0-9]{5}-p5p6p-[a-z0-9]{15}')