Merge new modpackman into master; update Jeffrey 2

1 files changed, 30 insertions, 20 deletions

diff --git a/util.py b/util.py
index e376649..3343434 100644
--- a/util.py
+++ b/util.py
@@ -236,28 +236,37 @@ def find_cdn(ffx, url, version):
     Returns the direct Forge CDN download URL
     """
     try:
-        # This goes to the "all files" page, where we get a table view of all 
-        ffx.get(url + '/files/all')
-        mod_versions = ffx.find_elements_by_class_name("listing")[0].find_elements_by_xpath("tbody/tr") # extract the table of files from the page
-        row_info = collections.namedtuple("row_info", ["type", "filename", "cdn_id", "game_version"]) # create a custom tuple because data
-        rows = []
-        for version_entry in mod_versions:
-            # parse out the four fields that we use
-            entry_cells = version_entry.find_elements_by_tag_name("td")
-            release_type = entry_cells[0].text
-            # Note that this is NOT the final filename - this is just the "release name".
-            filename = urllib.parse.quote(entry_cells[1].find_elements_by_tag_name("a")[0].text)
+        # This goes to the "all files" page, where we get a table view of all
+        page_index = 0;
+        while True:
+            ffx.get(url + f'/files/all?page={page_index}')
+            mod_versions = ffx.find_elements_by_class_name("listing")[0].find_elements_by_xpath("tbody/tr") # extract the table of files from the page
+            row_info = collections.namedtuple("row_info", ["type", "filename", "cdn_id", "game_version"]) # create a custom tuple because data
+            rows = []
+            for version_entry in mod_versions:
+                # parse out the four fields that we use
+                entry_cells = version_entry.find_elements_by_tag_name("td")
+                release_type = entry_cells[0].text
+                # Note that this is NOT the final filename - this is just the "release name".
+                filename = urllib.parse.quote(entry_cells[1].find_elements_by_tag_name("a")[0].text)
+                try:
+                    game_version = tuple([int(x) for x in entry_cells[4].find_element_by_class_name("mr-2").text.split(".")]) # get game version and convert to tuple
+                except:
+                    game_version = (0, 0, 0)
+                cdn_id = entry_cells[1].find_element_by_tag_name("a").get_property("href").split("/")[-1]
+
+                #TODO make this configurable
+                if 'fabric' not in filename.lower() or 'forge' in filename.lower():
+                    rows.append(row_info(release_type, filename, cdn_id, game_version))
+            rows.sort(key=lambda x: x.game_version, reverse=True)
             try:
-                game_version = tuple([int(x) for x in entry_cells[4].find_element_by_class_name("mr-2").text.split(".")]) # get game version and convert to tuple
-            except:
-                game_version = (0, 0, 0)
-            cdn_id = entry_cells[1].find_element_by_tag_name("a").get_property("href").split("/")[-1]
+                best_row = next(x for x in rows if x.game_version <= version)
+                break
+            except StopIteration:
+                if len(ffx.find_elements_by_class_name("pagination-next--inactive")) != 0:
+                    raise
+                page_index += 1
 
-            #TODO make this configurable
-            if 'fabric' not in filename.lower() or 'forge' in filename.lower():
-                rows.append(row_info(release_type, filename, cdn_id, game_version))
-        rows.sort(key=lambda x: x.game_version, reverse=True)
-        best_row = next(x for x in rows if x.game_version <= version)
 
         # We need to find the real, ForgeCDN compatible filename now by going to the file page.
         ffx.get(f'{url}/files/{best_row.cdn_id}')
@@ -271,6 +280,7 @@ def find_cdn(ffx, url, version):
 
     except:
         # import traceback; traceback.print_exc()
+        print(f"[!] Failed to retrieve valid CDN URL for {url}")
         return None