mirror
/
repo2docker
kopia lustrzana https://github.com/jupyterhub/repo2docker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Make the splitting logic more straightforward

pull/1336/head
Sol Lee 2024-03-25 02:37:31 +00:00
rodzic 391b9bc5ba
commit 472c5cdc29
1 zmienionych plików z 8 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
repo2docker/contentproviders/ckan.py
Wyświetl plik

@ -1,4 +1,3 @@
import re
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from os import path from os import path
from urllib.parse import urlparse from urllib.parse import urlparse
@ -37,7 +36,6 @@ class CKAN(ContentProvider):
return self.session.get(url, **kwargs) return self.session.get(url, **kwargs)
urlopen = _request urlopen = _request
url_regex = r"/dataset/[a-z0-9_\\-]*$"
def detect(self, source, ref=None, extra_args=None): def detect(self, source, ref=None, extra_args=None):
"""Trigger this provider for things that resolve to a CKAN dataset.""" """Trigger this provider for things that resolve to a CKAN dataset."""
@ -45,14 +43,18 @@ class CKAN(ContentProvider):
if not parsed_url.netloc: if not parsed_url.netloc:
return None return None
api_url = parsed_url._replace( url_parts = parsed_url.path.split("/")
path=re.sub(self.url_regex, "/api/3/action/", parsed_url.path) if url_parts[-2] == "dataset":
).geturl() self.dataset_id = url_parts[-1]
else:
return None
api_url_path = "/api/3/action/"
api_url = parsed_url._replace(path=api_url_path).geturl()
status_show_url = f"{api_url}status_show" status_show_url = f"{api_url}status_show"
resp = self.urlopen(status_show_url) resp = self.urlopen(status_show_url)
if resp.status_code == 200: if resp.status_code == 200:
self.dataset_id = parsed_url.path.rsplit("/", maxsplit=1)[1]
self.version = self._fetch_version(api_url) self.version = self._fetch_version(api_url)
return { return {
"dataset_id": self.dataset_id, "dataset_id": self.dataset_id,