Skip to content

Commit 4da48c7

Browse files
committed
fixed win32 unable to find snapshot assets
1 parent a8051c8 commit 4da48c7

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

src/ffmpeg_downloader/_win32.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@
3030
# last one gets picked
3131
asset_priority = ["full-shared", "full", "essentials"]
3232

33+
3334
def are_assets_options():
3435
return True
3536

37+
3638
def get_latest_version(proxy=None, retries=None, timeout=None):
3739
return Version(
3840
download_info(
@@ -57,8 +59,14 @@ def get_latest_snapshot(proxy=None, retries=None, timeout=None):
5759
config = Config()
5860
snapshot = config.snapshot
5961
if ver not in snapshot:
60-
assets, eol = retrieve_releases_page(1, ver, 10, proxy, retries, timeout)
61-
if eol:
62+
page = 1
63+
assets, eol = retrieve_releases_page(page, ver, 100, proxy, retries, timeout)
64+
while assets is None and not eol:
65+
page += 1
66+
assets, eol = retrieve_releases_page(
67+
page, ver, 100, proxy, retries, timeout
68+
)
69+
if assets is None:
6270
raise ValueError(f"Assets for snapshot {ver} could not be located.")
6371
config = Config()
6472
config.snapshot = {ver: assets}
@@ -85,7 +93,6 @@ def check_rate_limit(proxy=None, retries=None, timeout=None):
8593
def retrieve_releases_page(
8694
page, snapshot=None, per_page=100, proxy=None, retries=None, timeout=None
8795
):
88-
8996
headers = {"Accept": "application/vnd.github+json"}
9097
url = "https://api.github.com/repos/GyanD/codexffmpeg/releases"
9198

@@ -124,19 +131,18 @@ def retrieve_releases_page(
124131
None,
125132
), not len(info)
126133
else:
127-
128134
return {
129135
tag: url
130136
for tag, url in (
131137
(Version(rel["tag_name"]), extract_assets(rel["assets"]))
132-
for rel in info if re.match(r'\d+\.\d+(?:\.\d+)?$', rel['tag_name'])
138+
for rel in info
139+
if re.match(r"\d+\.\d+(?:\.\d+)?$", rel["tag_name"])
133140
)
134141
if tag
135142
}, not len(info)
136143

137144

138145
def update_releases_info(force=None, proxy=None, retries=None, timeout=None):
139-
140146
config = Config()
141147
releases = {} if force else config.releases
142148
changed = False
@@ -187,7 +193,6 @@ def get_download_info(version, option):
187193

188194

189195
def extract(zippaths, dst, progress=None):
190-
191196
zippath = zippaths[0]
192197

193198
with zipfile.ZipFile(zippath, "r") as f:

0 commit comments

Comments
 (0)