diff --git a/src/adsb/download_adsb_data_to_parquet.py b/src/adsb/download_adsb_data_to_parquet.py index 579a375..0f0ef2c 100644 --- a/src/adsb/download_adsb_data_to_parquet.py +++ b/src/adsb/download_adsb_data_to_parquet.py @@ -82,8 +82,8 @@ def fetch_releases(version_date: str) -> list: if version_date == "v2024.12.31": year = "2025" BASE_URL = f"https://api.github.com/repos/adsblol/globe_history_{year}/releases" - # Match exact release name, exclude tmp releases - PATTERN = rf"^{re.escape(version_date)}-planes-readsb-prod-\d+$" + # Match both normal and tmp releases + PATTERN = rf"^{re.escape(version_date)}-planes-readsb-prod-\d+(tmp)?$" releases = [] page = 1 @@ -582,6 +582,12 @@ def process_version_date(version_date: str, keep_folders: bool = False): print(f"No releases found for {vd}.") return None + # Prefer non-tmp releases; only use tmp if no normal releases exist + normal_releases = [r for r in releases if "tmp" not in r["tag_name"]] + tmp_releases = [r for r in releases if "tmp" in r["tag_name"]] + releases = normal_releases if normal_releases else tmp_releases + print(f"Using {'normal' if normal_releases else 'tmp'} releases ({len(releases)} found)") + downloaded_files = [] for release in releases: tag_name = release["tag_name"] diff --git a/src/adsb/download_and_list_icaos.py b/src/adsb/download_and_list_icaos.py index ccaa6b5..27624c7 100644 --- a/src/adsb/download_and_list_icaos.py +++ b/src/adsb/download_and_list_icaos.py @@ -59,6 +59,12 @@ def download_and_extract(version_date: str) -> str | None: print(f"No releases found for {version_date}") return None + # Prefer non-tmp releases; only use tmp if no normal releases exist + normal_releases = [r for r in releases if "tmp" not in r["tag_name"]] + tmp_releases = [r for r in releases if "tmp" in r["tag_name"]] + releases = normal_releases if normal_releases else tmp_releases + print(f"Using {'normal' if normal_releases else 'tmp'} releases ({len(releases)} found)") + downloaded_files = [] for release in releases: tag_name = release["tag_name"]