Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
3503808
{Search for wildcards function updated}
Diya910 Apr 13, 2025
054a98b
Refactoring changes asked by the maintainer which include centralisat…
Diya910 Jun 15, 2025
69699d9
Fabrication of the code moved functions in folders.py
Diya910 Jul 2, 2025
15f8a3c
Update datashuttle/utils/folders.py
Diya910 Jul 4, 2025
8104024
Update datashuttle/utils/folders.py
Diya910 Jul 4, 2025
8a2cbbd
Update datashuttle/utils/folders.py
Diya910 Jul 4, 2025
a44cb61
Update datashuttle/utils/folders.py
Diya910 Jul 4, 2025
f9a21b4
Update datashuttle/utils/validation.py
Diya910 Jul 4, 2025
bd12cd6
Refactor: Clean up docstrings in folders.py and canonical_tags.py as …
Diya910 Jul 4, 2025
e0d2441
Merge branch 'date_feature' of https://github.com/Diya910/datashuttle…
Diya910 Jul 4, 2025
cc5f253
Merge remote-tracking branch 'upstream/main' into date_feature
JoeZiminski Jul 30, 2025
d1ede1d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 30, 2025
399b402
Fix linting.
JoeZiminski Jul 30, 2025
d318fb5
Merge branch 'date_feature' of https://github.com/Diya910/datashuttle…
JoeZiminski Jul 30, 2025
ac95503
Properly ignore mypy on tests.
JoeZiminski Jul 31, 2025
f70b6ff
Merge branch 'neuroinformatics-unit:main' into date_feature
Diya910 Aug 12, 2025
9391982
Updated test cases to use basemodel and also added more test cases to…
Diya910 Aug 14, 2025
23679eb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 14, 2025
2e3bcd7
Update datashuttle/utils/folders.py
Diya910 Aug 26, 2025
d4c7187
Merge remote-tracking branch 'upstream/main' into date_feature
JoeZiminski Sep 2, 2025
e2940b2
Cover DATETO etc. cases in check_and_format_names so they are not val…
JoeZiminski Sep 9, 2025
407afe5
Merge branch 'neuroinformatics-unit:main' into date_feature
Diya910 Sep 10, 2025
4c1bd4a
Introduce get_datetime_to_search_regexp function.
JoeZiminski Oct 27, 2025
84524ec
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 27, 2025
7da6305
Introduce get_datetime_to_search_regexp function.
JoeZiminski Oct 27, 2025
444a081
Merge branch 'date_feature' of https://github.com/Diya910/datashuttle…
JoeZiminski Oct 27, 2025
c60b5ff
Remove 'test_simple_wildcard_first'.
JoeZiminski Oct 27, 2025
1893fba
Update 'test_datetime_range_transfer'.
JoeZiminski Oct 27, 2025
120c4d6
Use parameterisation for download test.
JoeZiminski Oct 27, 2025
94161e2
Update error message check.
JoeZiminski Oct 27, 2025
0a936a2
Add 'upload_or_download' for all key tests.
JoeZiminski Oct 27, 2025
9d1fe46
Extend test_subject_level_date_range.
JoeZiminski Oct 27, 2025
86107d0
Update test_edge_case_exact_boundary_dates.
JoeZiminski Oct 27, 2025
c49403f
Adjust date test.
JoeZiminski Oct 27, 2025
08d77d8
Small tidy ups.
JoeZiminski Oct 27, 2025
8d9d96b
Troubleshooting.
JoeZiminski Oct 27, 2025
f393aa8
Merge remote-tracking branch 'upstream/main' into date_feature
JoeZiminski Oct 27, 2025
2e45e2b
Support datetime directly as sub ses values @DATETIME@.
JoeZiminski Oct 27, 2025
cc602a8
Add tests for new sub-@DATE@ ses-@DATE@ behaviour.
JoeZiminski Oct 27, 2025
8416bbe
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 27, 2025
06933ac
Extend tests to new sub case + some refactoring.
JoeZiminski Oct 27, 2025
28335db
Fix docstring for linter.
JoeZiminski Oct 29, 2025
d42d927
Handle sub case for datetime, date, time.
JoeZiminski Oct 30, 2025
2faf0a2
Merge branch 'date_feature' of https://github.com/Diya910/datashuttle…
JoeZiminski Oct 30, 2025
dc47915
Merge remote-tracking branch 'upstream/main' into date_feature
JoeZiminski Nov 3, 2025
b59eb2f
Fix tests.
JoeZiminski Nov 4, 2025
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
19 changes: 19 additions & 0 deletions datashuttle/configs/canonical_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,24 @@ def tags(tag_name: str) -> str:
"datetime": "@DATETIME@",
"to": "@TO@",
"*": "@*@",
"DATETO": "@DATETO@",
"TIMETO": "@TIMETO@",
"DATETIMETO": "@DATETIMETO@",
}
return tags[tag_name]


def get_datetime_formats() -> dict:
"""Get all datetime format strings.

Returns
-------
dict
A dictionary containing format strings for datetime, time, and date

"""
return {
"datetime": "%Y%m%dT%H%M%S",
"time": "%H%M%S",
"date": "%Y%m%d",
}
2 changes: 1 addition & 1 deletion datashuttle/utils/data_transfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ def get_processed_names(
processed_names = formatting.check_and_format_names(
names_checked, prefix, bypass_validation=True
)
processed_names = folders.search_for_wildcards(
processed_names = folders.search_with_tags(
self.__cfg,
self.__base_folder,
self.__local_or_central,
Expand Down
Loading
Loading