diff --git a/xword_dl/downloader/amuselabsdownloader.py b/xword_dl/downloader/amuselabsdownloader.py index ec8f8ae..c5e122a 100644 --- a/xword_dl/downloader/amuselabsdownloader.py +++ b/xword_dl/downloader/amuselabsdownloader.py @@ -81,6 +81,7 @@ def fetch_data(self, solver_url): ## In some cases we need to pull the underlying JavaScript ## # Find the JavaScript URL + amuseKey = None m1 = re.search(r'"([^"]+c-min.js[^"]+)"', res.text) js_url_fragment = m1.groups()[0] js_url = urllib.parse.urljoin(solver_url, js_url_fragment) @@ -98,6 +99,20 @@ def fetch_data(self, solver_url): amuseKey = [int(x) for x in re.findall(r'=\[\]\).push\(([0-9]{1,2})\)', res2.text)] + # But now that might not be the right key, and there's another one + # that we need to try! + # (current as of 10/26/2023) + key_2_order_regex = r'i=(\d+);i