From e189b43beb6669785a1fa3df8e1b5f8c03d49fff Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Mon, 21 Dec 2020 18:28:01 +0100
Subject: [PATCH] Refactoring

---
 TournamentStats/AppDelegate.swift             | 24 +++++--------------
 .../UI/reports/InfographyView.swift           | 23 ++++++++++++++++++
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/TournamentStats/AppDelegate.swift b/TournamentStats/AppDelegate.swift
index 74faa04..ff80ede 100644
--- a/TournamentStats/AppDelegate.swift
+++ b/TournamentStats/AppDelegate.swift
@@ -44,29 +44,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
         print("start report generation...")
         let s = Date()
         let generator = ReportGenerator()
-        generator.go(importData: true)
+        generator.go(importData: false)
         let d = Date().timeIntervalSince(s)
         print("reports created in \(d)s")
         
-        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 false
-                }
-                
-                do {
-                    try imageData.write(to: directory.appendingPathComponent("infography.png")!)
-                } catch {
-                    print(error.localizedDescription)
-                }
-                
-            }
-
+        if true {
+            return
         }
         
+        InfographyView.generate(generator)
+        
+        
 //        if let ivc = UIStoryboard(name: "Main", bundle: Bundle.main).instantiateViewController(withIdentifier: "container") as? InfographyViewController {
 //            ivc.generator = generator
 //            ivc.view.frame = CGRect(x: 0, y: 0, width: 1500, height: 1500)
diff --git a/TournamentStats/UI/reports/InfographyView.swift b/TournamentStats/UI/reports/InfographyView.swift
index d65e1b5..32ea69a 100644
--- a/TournamentStats/UI/reports/InfographyView.swift
+++ b/TournamentStats/UI/reports/InfographyView.swift
@@ -11,6 +11,29 @@ import UIKit
 
 class InfographyView: UIView {
     
+    static func generate(_ generator: ReportGenerator) {
+        
+        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 false
+                }
+                
+                do {
+                    try imageData.write(to: directory.appendingPathComponent("infography.png")!)
+                } catch {
+                    print(error.localizedDescription)
+                }
+                
+            }
+
+        }
+
+    }
+    
     var generator: ReportGenerator? {
         didSet {
             self._fillView()