Skip to content

Commit

Permalink
parse gbfs_api_url from provider registry (#69)
Browse files Browse the repository at this point in the history
  • Loading branch information
thekaveman committed Aug 18, 2019
1 parent 9ee7f78 commit 11a067d
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions mds/providers.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,15 @@ class Provider():
"""
A simple model for an entry in the Provider registry.
"""
def __init__(self, provider_name, provider_id, url, mds_api_url, **kwargs):
self.provider_name = provider_name
def __init__(self, *args, **kwargs):
self.provider_name = kwargs.pop("provider_name", None)

provider_id = kwargs.pop("provider_id", None)
self.provider_id = provider_id if isinstance(provider_id, UUID) else UUID(provider_id)
self.url = self._clean_url(url)
self.mds_api_url = self._clean_url(mds_api_url)

self.url = self._clean_url(kwargs.pop("url", None))
self.mds_api_url = self._clean_url(kwargs.pop("mds_api_url", None))
self.gbfs_api_url = self._clean_url(kwargs.pop("gbfs_api_url", None))

for k,v in kwargs.items():
setattr(self, k, v)
Expand All @@ -31,8 +35,11 @@ def _clean_url(self, url):
"""
Helper to return a normalized URL
"""
url = url.lower().rstrip("/")
return url if url.startswith("https://") else f"https://{url}"
if url:
url = url.lower().rstrip("/")
return url if url.startswith("https://") else f"https://{url}"
else:
return None

def configure(self, config, use_id=False):
"""
Expand Down

0 comments on commit 11a067d

Please sign in to comment.