Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing the bug that multiple links in a dataset cannot be all downloaded #49

Merged
merged 2 commits into from
Nov 9, 2023
Merged

Fixing the bug that multiple links in a dataset cannot be all downloaded #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11e6359
fix: the bug that multiple links in a dataset cannot be all downloaded;
WenjieDu Nov 9, 2023
8af9cfb
feat: test TSDB on multiple datasets in CI testing workflow;
WenjieDu Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion tests/test_tsdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

DATASETS_TO_TEST = [
"ucr_uea_Wine",
"physionet_2012",
"beijing_multisite_air_quality",
]


Expand All @@ -40,7 +42,7 @@ def test_2_dataset_loading(self):
def test_3_dataset_purging(self):
cached_datasets = tsdb.list_cache()
assert isinstance(cached_datasets, list)
tsdb.delete_cache("ucr_uea_Wine") # delete single
tsdb.delete_cache("physionet_2012") # delete single
tsdb.delete_cache() # delete all

def test_4_logging(self):
Expand Down
10 changes: 3 additions & 7 deletions tsdb/utils/downloading.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def _download_and_extract(url: str, saving_path: str) -> Optional[str]:
return saving_path


def download_and_extract(dataset_name: str, dataset_saving_path: str) -> Optional[str]:
def download_and_extract(dataset_name: str, dataset_saving_path: str) -> None:
"""Wrapper of _download_and_extract.

Parameters
Expand All @@ -96,15 +96,11 @@ def download_and_extract(dataset_name: str, dataset_saving_path: str) -> Optiona
dataset_saving_path : str,
The local path for dataset saving.

Returns
-------
saving_path if successful else None

"""
logger.info("Start downloading...")
os.makedirs(dataset_saving_path)
if isinstance(DATABASE[dataset_name], list):
for link in DATABASE[dataset_name]:
return _download_and_extract(link, dataset_saving_path)
_download_and_extract(link, dataset_saving_path)
else:
return _download_and_extract(DATABASE[dataset_name], dataset_saving_path)
_download_and_extract(DATABASE[dataset_name], dataset_saving_path)