From 77247e4b7700439ec21be366174a36a744c3acf6 Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 21 Oct 2021 13:17:14 +0200 Subject: [PATCH] updating data + fix --- .../xcdebugger/Breakpoints_v2.xcbkptlist | 24 +++---- .../xcschemes/xcschememanagement.plist | 14 ++-- TournamentStats/AppDelegate.swift | 38 +++++----- .../UI/reports/InfographyView.swift | 2 +- TournamentStats/scrapper/Downloader.swift | 70 ++++++++++--------- 5 files changed, 75 insertions(+), 73 deletions(-) diff --git a/TournamentStats.xcodeproj/xcuserdata/laurent.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/TournamentStats.xcodeproj/xcuserdata/laurent.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 95423a0..c12dbfc 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 = "219" - endingLineNumber = "219" + startingLineNumber = "221" + endingLineNumber = "221" landmarkName = "downloadWSOPResults(url:date:currentTournament:)" landmarkType = "7"> @@ -56,8 +56,8 @@ filePath = "TournamentStats/scrapper/Downloader.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "193" - endingLineNumber = "193" + startingLineNumber = "195" + endingLineNumber = "195" landmarkName = "downloadWSOPResults(url:date:currentTournament:)" landmarkType = "7"> @@ -72,8 +72,8 @@ filePath = "TournamentStats/scrapper/Downloader.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "169" - endingLineNumber = "169" + startingLineNumber = "171" + endingLineNumber = "171" landmarkName = "downloadWSOPResults(url:date:currentTournament:)" landmarkType = "7"> @@ -88,8 +88,8 @@ filePath = "TournamentStats/scrapper/Downloader.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "162" - endingLineNumber = "162" + startingLineNumber = "164" + endingLineNumber = "164" landmarkName = "downloadWSOPResults(url:date:currentTournament:)" landmarkType = "7"> @@ -104,8 +104,8 @@ filePath = "TournamentStats/scrapper/Downloader.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "170" - endingLineNumber = "170" + startingLineNumber = "172" + endingLineNumber = "172" landmarkName = "downloadWSOPResults(url:date:currentTournament:)" landmarkType = "7"> @@ -120,8 +120,8 @@ filePath = "TournamentStats/scrapper/Downloader.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "185" - endingLineNumber = "185" + startingLineNumber = "187" + endingLineNumber = "187" landmarkName = "downloadWSOPResults(url:date:currentTournament:)" landmarkType = "7"> diff --git a/TournamentStats.xcodeproj/xcuserdata/laurent.xcuserdatad/xcschemes/xcschememanagement.plist b/TournamentStats.xcodeproj/xcuserdata/laurent.xcuserdatad/xcschemes/xcschememanagement.plist index bd15700..217dbf2 100644 --- a/TournamentStats.xcodeproj/xcuserdata/laurent.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/TournamentStats.xcodeproj/xcuserdata/laurent.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,35 +9,35 @@ isShown orderHint - 2 + 4 GettingStarted (Playground) 2.xcscheme isShown orderHint - 3 + 5 GettingStarted (Playground).xcscheme isShown orderHint - 0 + 3 PlaygroundChart (Playground) 1.xcscheme isShown orderHint - 5 + 1 PlaygroundChart (Playground) 2.xcscheme isShown orderHint - 6 + 2 PlaygroundChart (Playground) 3.xcscheme @@ -65,12 +65,12 @@ isShown orderHint - 4 + 0 TournamentStats.xcscheme_^#shared#^_ orderHint - 1 + 6 SuppressBuildableAutocreation diff --git a/TournamentStats/AppDelegate.swift b/TournamentStats/AppDelegate.swift index 0e75cad..142f6c1 100644 --- a/TournamentStats/AppDelegate.swift +++ b/TournamentStats/AppDelegate.swift @@ -90,25 +90,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele // // } - return true - if let infographyView = Bundle.main.loadNibNamed("InfographyView", owner: self, options: nil)?.first as? InfographyView { - infographyView.generator = generator - - if let imageData = infographyView.toImage()?.pngData() { - - guard let directory = try? FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: false) as NSURL else { - return - } - - do { - try imageData.write(to: directory.appendingPathComponent("infography.png")!) - } catch { - print(error.localizedDescription) - } - - } - - } +// return true +// if let infographyView = Bundle.main.loadNibNamed("InfographyView", owner: self, options: nil)?.first as? InfographyView { +// infographyView.generator = generator +// +// if let imageData = infographyView.toImage()?.pngData() { +// +// guard let directory = try? FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: false) as NSURL else { +// return +// } +// +// do { +// try imageData.write(to: directory.appendingPathComponent("infography.png")!) +// } catch { +// print(error.localizedDescription) +// } +// +// } +// +// } } diff --git a/TournamentStats/UI/reports/InfographyView.swift b/TournamentStats/UI/reports/InfographyView.swift index 32ea69a..df0bbc6 100644 --- a/TournamentStats/UI/reports/InfographyView.swift +++ b/TournamentStats/UI/reports/InfographyView.swift @@ -19,7 +19,7 @@ class InfographyView: UIView { if let imageData = infographyView.toImage()?.pngData() { guard let directory = try? FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: false) as NSURL else { - return false + return } do { diff --git a/TournamentStats/scrapper/Downloader.swift b/TournamentStats/scrapper/Downloader.swift index 3c8b0b3..7dcd95a 100644 --- a/TournamentStats/scrapper/Downloader.swift +++ b/TournamentStats/scrapper/Downloader.swift @@ -19,43 +19,45 @@ class Downloader { static func downloadWSOPResults() { let infos: [TS] = [ -// 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"), -// TS(id: "19733", date: "05/10/2021"), -// TS(id: "19731", date: "06/10/2021"), -// TS(id: "19734", date: "06/10/2021"), -// TS(id: "19926", date: "06/10/2021"), -// TS(id: "19927", date: "06/10/2021"), -// TS(id: "19737", date: "06/10/2021"), -// TS(id: "19735", date: "07/10/2021"), -// TS(id: "19736", date: "08/10/2021"), -// TS(id: "19738", date: "08/10/2021"), -// TS(id: "19739", date: "08/10/2021"), -// TS(id: "19740", date: "09/10/2021"), -// TS(id: "19741", date: "09/10/2021"), -// TS(id: "19742", date: "11/10/2021"), -// TS(id: "19743", date: "11/10/2021"), -// TS(id: "19745", date: "12/10/2021"), -// TS(id: "19747", date: "12/10/2021"), -// TS(id: "19748", date: "12/10/2021"), -// TS(id: "19749", date: "13/10/2021"), -// TS(id: "19744", date: "14/10/2021"), -// TS(id: "19751", date: "14/10/2021"), -// TS(id: "19752", date: "14/10/2021"), -// TS(id: "19750", date: "15/10/2021"), -// TS(id: "19754", date: "15/10/2021"), -// TS(id: "19753", date: "16/10/2021"), -// TS(id: "19755", date: "16/10/2021"), -// TS(id: "19756", date: "17/10/2021"), -// TS(id: "19757", date: "17/10/2021"), -// TS(id: "19759", date: "17/10/2021"), -// TS(id: "19761", date: "19/10/2021"), -// TS(id: "19762", date: "19/10/2021"), + 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"), + TS(id: "19733", date: "05/10/2021"), + TS(id: "19731", date: "06/10/2021"), + TS(id: "19734", date: "06/10/2021"), + TS(id: "19926", date: "06/10/2021"), + TS(id: "19927", date: "06/10/2021"), + TS(id: "19737", date: "06/10/2021"), + TS(id: "19735", date: "07/10/2021"), + TS(id: "19736", date: "08/10/2021"), + TS(id: "19738", date: "08/10/2021"), + TS(id: "19739", date: "08/10/2021"), + TS(id: "19740", date: "09/10/2021"), + TS(id: "19741", date: "09/10/2021"), + TS(id: "19742", date: "11/10/2021"), + TS(id: "19743", date: "11/10/2021"), + TS(id: "19745", date: "12/10/2021"), + TS(id: "19747", date: "12/10/2021"), + TS(id: "19748", date: "12/10/2021"), + TS(id: "19749", date: "13/10/2021"), + TS(id: "19744", date: "14/10/2021"), + TS(id: "19751", date: "14/10/2021"), + TS(id: "19752", date: "14/10/2021"), + TS(id: "19750", date: "15/10/2021"), + TS(id: "19754", date: "15/10/2021"), + TS(id: "19753", date: "16/10/2021"), + TS(id: "19755", date: "16/10/2021"), + TS(id: "19756", date: "17/10/2021"), + TS(id: "19757", date: "17/10/2021"), + TS(id: "19759", date: "17/10/2021"), + TS(id: "19761", date: "19/10/2021"), + TS(id: "19762", date: "19/10/2021"), TS(id: "19758", date: "20/10/2021"), TS(id: "19763", date: "20/10/2021"), TS(id: "19764", date: "20/10/2021"), + TS(id: "19765", date: "21/10/2021"), + TS(id: "19766", date: "21/10/2021"), ]