From 85d208bcaebc9eda5796a16c91e770e18e1f1db1 Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 6 Aug 2019 13:56:08 +0200 Subject: [PATCH] Refactoring --- TournamentStats.xcodeproj/project.pbxproj | 13 +++++++++---- .../{Importer.swift => RowImporter.swift} | 4 ++-- TournamentStats/report/ReportGenerator.swift | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) rename TournamentStats/{Importer.swift => RowImporter.swift} (96%) diff --git a/TournamentStats.xcodeproj/project.pbxproj b/TournamentStats.xcodeproj/project.pbxproj index 9a3dd8f..f8b16ee 100644 --- a/TournamentStats.xcodeproj/project.pbxproj +++ b/TournamentStats.xcodeproj/project.pbxproj @@ -42,6 +42,7 @@ 4D39B6F722F8573900625E31 /* StackTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D39B6F622F8573900625E31 /* StackTableCell.swift */; }; 4D39B6FA22F85C3400625E31 /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D39B6F922F85C3400625E31 /* UIView+Extensions.swift */; }; 4D39B6FC22F8686300625E31 /* CumulatedWins.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D39B6FB22F8686300625E31 /* CumulatedWins.swift */; }; + 4D39B6FE22F87C3700625E31 /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D39B6FD22F87C3700625E31 /* Charts.framework */; }; 4DA5CA1E22AD078A00AC628E /* CountryCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DA5CA1D22AD078A00AC628E /* CountryCounter.swift */; }; 4DDEF11422AE4FB900F4D7C1 /* TournamentStats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DDEF11322AE4FB900F4D7C1 /* TournamentStats.swift */; }; 4DF7608422A3FB96004B0EF1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DF7608322A3FB96004B0EF1 /* AppDelegate.swift */; }; @@ -54,7 +55,7 @@ 4DF760A722A3FD12004B0EF1 /* Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DF760A622A3FD12004B0EF1 /* Model.swift */; }; 4DF760AB22A3FDED004B0EF1 /* RealmSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DF760A922A3FDED004B0EF1 /* RealmSwift.framework */; }; 4DF760AC22A3FDED004B0EF1 /* Realm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DF760AA22A3FDED004B0EF1 /* Realm.framework */; }; - 4DF760B022A47C74004B0EF1 /* Importer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DF760AF22A47C74004B0EF1 /* Importer.swift */; }; + 4DF760B022A47C74004B0EF1 /* RowImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DF760AF22A47C74004B0EF1 /* RowImporter.swift */; }; 4DF760B322A47CAE004B0EF1 /* Realm+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DF760B222A47CAE004B0EF1 /* Realm+Extensions.swift */; }; 4DF760B522A47F6D004B0EF1 /* event2 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760B422A47F6D004B0EF1 /* event2 */; }; 4DF760B822A5234D004B0EF1 /* event60 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760B722A5234D004B0EF1 /* event60 */; }; @@ -179,6 +180,7 @@ 4D39B6F622F8573900625E31 /* StackTableCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StackTableCell.swift; sourceTree = ""; }; 4D39B6F922F85C3400625E31 /* UIView+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extensions.swift"; sourceTree = ""; }; 4D39B6FB22F8686300625E31 /* CumulatedWins.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CumulatedWins.swift; sourceTree = ""; }; + 4D39B6FD22F87C3700625E31 /* Charts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Charts.framework; path = Carthage/Build/iOS/Charts.framework; sourceTree = ""; }; 4DA5CA1D22AD078A00AC628E /* CountryCounter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountryCounter.swift; sourceTree = ""; }; 4DDEF11322AE4FB900F4D7C1 /* TournamentStats.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TournamentStats.swift; sourceTree = ""; }; 4DF7608022A3FB96004B0EF1 /* TournamentStats.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TournamentStats.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -195,7 +197,7 @@ 4DF760A622A3FD12004B0EF1 /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = ""; }; 4DF760A922A3FDED004B0EF1 /* RealmSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RealmSwift.framework; path = Carthage/Build/iOS/RealmSwift.framework; sourceTree = ""; }; 4DF760AA22A3FDED004B0EF1 /* Realm.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Realm.framework; path = Carthage/Build/iOS/Realm.framework; sourceTree = ""; }; - 4DF760AF22A47C74004B0EF1 /* Importer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Importer.swift; sourceTree = ""; }; + 4DF760AF22A47C74004B0EF1 /* RowImporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RowImporter.swift; sourceTree = ""; }; 4DF760B222A47CAE004B0EF1 /* Realm+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Realm+Extensions.swift"; sourceTree = ""; }; 4DF760B422A47F6D004B0EF1 /* event2 */ = {isa = PBXFileReference; lastKnownFileType = text; path = event2; sourceTree = ""; }; 4DF760B722A5234D004B0EF1 /* event60 */ = {isa = PBXFileReference; lastKnownFileType = text; path = event60; sourceTree = ""; }; @@ -281,6 +283,7 @@ files = ( 4DF760AB22A3FDED004B0EF1 /* RealmSwift.framework in Frameworks */, 4DF760AC22A3FDED004B0EF1 /* Realm.framework in Frameworks */, + 4D39B6FE22F87C3700625E31 /* Charts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -330,7 +333,7 @@ 4DF760A522A3FCF7004B0EF1 /* realm */, 4DF760C322A56207004B0EF1 /* utils */, 4DF7614422A593FC004B0EF1 /* report */, - 4DF760AF22A47C74004B0EF1 /* Importer.swift */, + 4DF760AF22A47C74004B0EF1 /* RowImporter.swift */, 4D0F103822C4C1C4005F797A /* ChipCountParser.swift */, 4DF760C822A56497004B0EF1 /* Seed.swift */, 4DF7614C22A6CC0D004B0EF1 /* NotablePlayers.swift */, @@ -363,6 +366,7 @@ 4DF760A822A3FDED004B0EF1 /* Frameworks */ = { isa = PBXGroup; children = ( + 4D39B6FD22F87C3700625E31 /* Charts.framework */, 4DF760AA22A3FDED004B0EF1 /* Realm.framework */, 4DF760A922A3FDED004B0EF1 /* RealmSwift.framework */, ); @@ -723,6 +727,7 @@ inputPaths = ( "$(SRCROOT)/Carthage/Build/iOS/Realm.framework", "$(SRCROOT)/Carthage/Build/iOS/RealmSwift.framework", + "$(SRCROOT)/Carthage/Build/iOS/Charts.framework", ); outputFileListPaths = ( ); @@ -741,7 +746,7 @@ files = ( 4DF7614822A59660004B0EF1 /* ReportGenerator.swift in Sources */, 4DF760C222A561FF004B0EF1 /* ColumnRepresentable.swift in Sources */, - 4DF760B022A47C74004B0EF1 /* Importer.swift in Sources */, + 4DF760B022A47C74004B0EF1 /* RowImporter.swift in Sources */, 4DF7614A22A66675004B0EF1 /* TournamentWinner.swift in Sources */, 4D0F103722C4C08F005F797A /* ChipCount.swift in Sources */, 4D39B6F122F829A500625E31 /* InfographyView.swift in Sources */, diff --git a/TournamentStats/Importer.swift b/TournamentStats/RowImporter.swift similarity index 96% rename from TournamentStats/Importer.swift rename to TournamentStats/RowImporter.swift index c25e14e..917da40 100644 --- a/TournamentStats/Importer.swift +++ b/TournamentStats/RowImporter.swift @@ -20,7 +20,7 @@ enum Columns : CaseIterable { case country } -class Importer { +class RowImporter { static func start() { @@ -38,7 +38,7 @@ class Importer { do { let data = try String(contentsOfFile: path, encoding: .utf8) - Importer.createResults(realm: realm, tournament: tournament, data: data) + RowImporter.createResults(realm: realm, tournament: tournament, data: data) } catch { print(error) } diff --git a/TournamentStats/report/ReportGenerator.swift b/TournamentStats/report/ReportGenerator.swift index 0d118a4..229a277 100644 --- a/TournamentStats/report/ReportGenerator.swift +++ b/TournamentStats/report/ReportGenerator.swift @@ -22,7 +22,7 @@ class ReportGenerator { } Seed.createTournaments() - Importer.start() + RowImporter.start() self.create() self.writeHTML()