Skip to content

Commit 04e8236

Browse files
committed
Refactor find_json_files_in_date_range
- remove the nested function for brevity
1 parent 6360f07 commit 04e8236

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

  • particle_tracking_manager/models/opendrift

particle_tracking_manager/models/opendrift/utils.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -118,17 +118,17 @@ def find_json_files_in_date_range(
118118
if end_year != start_year:
119119
json_list += fs2.glob(make_glob_from_year(end_year))
120120

121-
def filter_paths(start: datetime, end: datetime, paths: Iterable[str]) -> List[str]:
122-
if end < start:
123-
# if going backward in time, swap start and end
124-
end, start = start, end
125-
return [
126-
pth
127-
for pth in paths
128-
if start <= datetime.strptime(Path(pth).stem, filename_date_format) <= end
129-
]
130-
131-
return filter_paths(start, end, json_list)
121+
# if going backward in time, swap start and end
122+
from_date, to_date = (end, start) if end < start else (start, end)
123+
return [
124+
pth
125+
for pth in json_list
126+
if (
127+
from_date
128+
<= datetime.strptime(Path(pth).stem, filename_date_format)
129+
<= to_date
130+
)
131+
]
132132

133133

134134
def make_ciofs_kerchunk(start: datetime, end: datetime, name: str) -> dict:

0 commit comments

Comments
 (0)