From 51212f2c938c6747a899550e28a2a58c983cc0b6 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Mon, 12 Jun 2023 16:13:20 +0200
Subject: [PATCH] Update

---
 TournamentStats/report/Queries.swift      |  5 +--
 TournamentStats/scrapper/Downloader.swift | 37 +++++++++++++++--------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/TournamentStats/report/Queries.swift b/TournamentStats/report/Queries.swift
index 370aa5d..7c838a9 100644
--- a/TournamentStats/report/Queries.swift
+++ b/TournamentStats/report/Queries.swift
@@ -153,10 +153,11 @@ class Queries {
         }
         
         prs.sort { (pr1, pr2) -> Bool in
-            if pr1.result.rank == pr2.result.rank {
+            if pr1.tournament.number == pr2.tournament.number {
                 return pr1.result.earnings > pr2.result.earnings
+            } else {
+                return pr1.tournament.number < pr2.tournament.number
             }
-            return pr1.result.rank < pr2.result.rank
         }
         
         return prs
diff --git a/TournamentStats/scrapper/Downloader.swift b/TournamentStats/scrapper/Downloader.swift
index 2116443..b58ff80 100644
--- a/TournamentStats/scrapper/Downloader.swift
+++ b/TournamentStats/scrapper/Downloader.swift
@@ -18,19 +18,30 @@ class Downloader {
     
     static func downloadWSOPResults() {
         
-        let ids = ["21666", // 1
-                   "21667", // 2
-                   "21670", // 5
-                   "21671", // 6
-                   "21669", // 4
-                   "21672", // 7
-                   "21673", // 8
-                   "21674", // 9
-                   "21668", // 3
-                   "21675", // 10
-                   "21676", // 11
-                   "21677", // 12
-                   "21678", // 13
+        let ids = [
+//            "21666", // 1
+//                   "21667", // 2
+//                   "21670", // 5
+//                   "21671", // 6
+//                   "21669", // 4
+//                   "21672", // 7
+//                   "21673", // 8
+//                   "21674", // 9
+//                   "21668", // 3
+//                   "21675", // 10
+//                   "21676", // 11
+//                   "21677", // 12
+//                   "21678", // 13
+//                   "21679", // 14
+//                   "21680", // 15
+//                   "21681", // 16
+//                   "21682", // 17
+//                   "21684", // 19
+//                   "21685", // 20
+//                   "21686", // 21
+                   "21687", // 22
+                   "21688", // 23
+                   "21689", // 24
         ]
         
         for id in ids {