Support new page nav attribute changes made by SA

AwfulCore/Sources/AwfulCore/Scraping/Helpers.swift

@@ -108,20 +108,35 @@ func scrapeCustomTitle(_ html: HTMLNode) -> RawHTML? {
 }
 
 
-func scrapePageDropdown(_ node: HTMLNode) -> (pageNumber: Int?, pageCount: Int?) {
+struct PageNavigationData {
+    let currentPage: Int
+    let totalPages: Int
+    let baseURL: String?
+    let perPage: Int?
+}
+
+func scrapePageNavigationData(_ node: HTMLNode) -> PageNavigationData? {
     guard let pageDiv = node.firstNode(matchingSelector: "div.pages") else {
-        return (nil, nil)
+        return nil
     }
-    let pageSelect = pageDiv.firstNode(matchingSelector: "select")
-    let pageCount = pageSelect?.childElementNodes.count ?? 1
 
-    let pageNumber = pageSelect
-        .flatMap { $0.firstNode(matchingSelector: "option[selected]") }
-        .flatMap { $0["value"] }
-        .flatMap { Int($0) }
-        ?? 1
+    if let currentPageStr = pageDiv["data-current-page"],
+       let totalPagesStr = pageDiv["data-total-pages"],
+       let currentPage = Int(currentPageStr),
+       let totalPages = Int(totalPagesStr) {
+
+        let baseURL = pageDiv["data-base-url"]
+        let perPage = pageDiv["data-per-page"].flatMap { Int($0) }
+
+        return PageNavigationData(
+            currentPage: currentPage,
+            totalPages: totalPages,
+            baseURL: baseURL,
+            perPage: perPage
+        )
+    }
 
-    return (pageNumber: pageNumber, pageCount: pageCount)
+    return nil
 }
 
 enum ForumGroupID: String {

AwfulCore/Sources/AwfulCore/Scraping/PostsPageScrapeResult.swift

@@ -34,7 +34,9 @@ public struct PostsPageScrapeResult: ScrapeResult {
 
         isSingleUserFilterEnabled = body.firstNode(matchingSelector: "table.post a.user_jump[title *= 'Remove']") != nil
 
-        (pageNumber: pageNumber, pageCount: pageCount) = scrapePageDropdown(body)
+        let pageNavData = scrapePageNavigationData(body)
+        pageNumber = pageNavData?.currentPage
+        pageCount = pageNavData?.totalPages
 
         let posts = try body
             .nodes(matchingSelector: "table.post")

AwfulCore/Sources/AwfulCore/Scraping/ThreadListScrapeResult.swift

@@ -80,7 +80,9 @@ public struct ThreadListScrapeResult: ScrapeResult {
 
         isBookmarkedThreadsPage = body.firstNode(matchingSelector: "form[name='bookmarks']") != nil
 
-        (pageNumber: pageNumber, pageCount: pageCount) = scrapePageDropdown(body)
+        let pageNavData = scrapePageNavigationData(body)
+        pageNumber = pageNavData?.currentPage
+        pageCount = pageNavData?.totalPages
     }
 }