diff --git a/TournamentStats.xcodeproj/xcuserdata/laurent.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/TournamentStats.xcodeproj/xcuserdata/laurent.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 3ee4b92..134d531 100644 --- a/TournamentStats.xcodeproj/xcuserdata/laurent.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/TournamentStats.xcodeproj/xcuserdata/laurent.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -40,8 +40,8 @@ filePath = "TournamentStats/scrapper/Downloader.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "162" - endingLineNumber = "162" + startingLineNumber = "168" + endingLineNumber = "168" landmarkName = "downloadWSOPResults(tournamentInfo:)" landmarkType = "7"> @@ -56,8 +56,8 @@ filePath = "TournamentStats/scrapper/Downloader.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "135" - endingLineNumber = "135" + startingLineNumber = "141" + endingLineNumber = "141" landmarkName = "downloadWSOPResults(tournamentInfo:)" landmarkType = "7"> @@ -72,8 +72,8 @@ filePath = "TournamentStats/scrapper/Downloader.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "111" - endingLineNumber = "111" + startingLineNumber = "117" + endingLineNumber = "117" landmarkName = "downloadWSOPResults(tournamentInfo:)" landmarkType = "7"> @@ -88,8 +88,8 @@ filePath = "TournamentStats/scrapper/Downloader.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "104" - endingLineNumber = "104" + startingLineNumber = "110" + endingLineNumber = "110" landmarkName = "downloadWSOPResults(tournamentInfo:)" landmarkType = "7"> @@ -104,8 +104,8 @@ filePath = "TournamentStats/scrapper/Downloader.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "112" - endingLineNumber = "112" + startingLineNumber = "118" + endingLineNumber = "118" landmarkName = "downloadWSOPResults(tournamentInfo:)" landmarkType = "7"> @@ -120,8 +120,8 @@ filePath = "TournamentStats/scrapper/Downloader.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "127" - endingLineNumber = "127" + startingLineNumber = "133" + endingLineNumber = "133" landmarkName = "downloadWSOPResults(tournamentInfo:)" landmarkType = "7"> @@ -142,5 +142,37 @@ landmarkType = "7"> + + + + + + + + diff --git a/TournamentStats/UI/MasterViewController.swift b/TournamentStats/UI/MasterViewController.swift index 71a40c1..ef12237 100644 --- a/TournamentStats/UI/MasterViewController.swift +++ b/TournamentStats/UI/MasterViewController.swift @@ -16,7 +16,7 @@ class MasterViewController: UITableViewController { override func viewDidLoad() { super.viewDidLoad() - self.ccManager = ChipCountParser.start() +// self.ccManager = ChipCountParser.start() // Do any additional setup after loading the view. navigationItem.leftBarButtonItem = editButtonItem diff --git a/TournamentStats/scrapper/Downloader.swift b/TournamentStats/scrapper/Downloader.swift index dd850ab..ccc4ec8 100644 --- a/TournamentStats/scrapper/Downloader.swift +++ b/TournamentStats/scrapper/Downloader.swift @@ -18,9 +18,11 @@ class Downloader { static func downloadWSOPResults() { - let infos = [TS(id: "19728", date: "02/10/2021"), - TS(id: "19729", date: "03/10/2021"), - TS(id: "19730", date: "02/10/2021")] + let infos = [ + TS(id: "19728", date: "02/10/2021"), + TS(id: "19729", date: "03/10/2021"), + TS(id: "19730", date: "02/10/2021"), + TS(id: "19732", date: "04/10/2021")] for info in infos { downloadWSOPResults(tournamentInfo: info) @@ -54,7 +56,11 @@ class Downloader { do { let string = try String(contentsOf: url) - if let infos = string.slice(from: "
", to: "
") { + let infos = string.slice(from: "
", to: "
") + ?? string.slice(from: "
", to: "eventinfo-progress") + ?? string.slice(from: "
", to: "eventstats") + + if let infos = infos { try realm.write { @@ -179,6 +185,8 @@ class Downloader { print("Bad page strresultsblock") } } + } else { + print("Missing name block") } } catch {