cleanup statsbook export

rollerderby · Apr 24, 2022 · c81daf4 · c81daf4
1 parent 2dde219
commit c81daf4
Show file tree

Hide file tree

Showing 42 changed files with 59 additions and 462 deletions.
diff --git a/src/com/carolinarollergirls/scoreboard/core/ScoreBoardImpl.java b/src/com/carolinarollergirls/scoreboard/core/ScoreBoardImpl.java
@@ -24,6 +24,7 @@
 import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProvider;
 import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProviderImpl;
 import com.carolinarollergirls.scoreboard.json.JSONStateManager;
+import com.carolinarollergirls.scoreboard.utils.StatsbookExporter;
 import com.carolinarollergirls.scoreboard.utils.ValWithId;
 import com.carolinarollergirls.scoreboard.utils.Version;
 
@@ -33,12 +34,6 @@ public ScoreBoardImpl() {
         addProperties(props);
         setupScoreBoard();
     }
-    public ScoreBoardImpl(ScoreBoardImpl cloned, ScoreBoardEventProvider root) { super(cloned, root); }
-
-    @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new ScoreBoardImpl(this, root);
-    }
 
     protected void setupScoreBoard() {
         removeAll(VERSION);
@@ -78,6 +73,7 @@ public void postAutosaveUpdate() {
             get(CLIENTS, "").postAutosaveUpdate();
             get(TWITTER, "").postAutosaveUpdate();
             initialLoadDone = true;
+            StatsbookExporter.preload(getSettings().get(SETTING_STATSBOOK_INPUT));
         }
     }
 

diff --git a/src/com/carolinarollergirls/scoreboard/core/admin/ClientsImpl.java b/src/com/carolinarollergirls/scoreboard/core/admin/ClientsImpl.java
@@ -19,12 +19,6 @@ public ClientsImpl(ScoreBoard parent) {
         addWriteProtectionOverride(CLIENT, Source.ANY_INTERNAL);
         addWriteProtectionOverride(DEVICE, Source.ANY_INTERNAL);
     }
-    public ClientsImpl(ClientsImpl cloned, ScoreBoardEventProvider root) { super(cloned, root); }
-
-    @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new ClientsImpl(this, root);
-    }
 
     @Override
     public void postAutosaveUpdate() {
@@ -153,12 +147,6 @@ public class ClientImpl extends ScoreBoardEventProviderImpl<Client> implements C
             addWriteProtectionOverride(CREATED, Source.ANY_INTERNAL);
             addWriteProtectionOverride(WROTE, Source.ANY_INTERNAL);
         }
-        public ClientImpl(ClientImpl cloned, ScoreBoardEventProvider root) { super(cloned, root); }
-
-        @Override
-        public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-            return new ClientImpl(this, root);
-        }
 
         @Override
         public void write() {
@@ -177,12 +165,6 @@ protected DeviceImpl(Clients parent, String id) {
             set(MAY_WRITE, parent.get(NEW_DEVICE_WRITE));
             addWriteProtectionOverride(CLIENT, Source.ANY_INTERNAL);
         }
-        public DeviceImpl(DeviceImpl cloned, ScoreBoardEventProvider root) { super(cloned, root); }
-
-        @Override
-        public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-            return new DeviceImpl(this, root);
-        }
 
         @Override
         public String getName() {

diff --git a/src/com/carolinarollergirls/scoreboard/core/admin/MediaImpl.java b/src/com/carolinarollergirls/scoreboard/core/admin/MediaImpl.java
@@ -19,7 +19,6 @@
 
 import com.carolinarollergirls.scoreboard.core.interfaces.Media;
 import com.carolinarollergirls.scoreboard.core.interfaces.ScoreBoard;
-import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProvider;
 import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProviderImpl;
 import com.carolinarollergirls.scoreboard.utils.BasePath;
 
@@ -29,15 +28,6 @@ public MediaImpl(ScoreBoard parent) {
         addProperties(props);
         setup(BasePath.get().toPath().resolve("html"));
     }
-    public MediaImpl(MediaImpl cloned, ScoreBoardEventProvider root) {
-        super(cloned, root);
-        path = cloned.path;
-    }
-
-    @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new MediaImpl(this, root);
-    }
 
     private void setup(Path path) {
         this.path = path;
@@ -185,15 +175,6 @@ public class MediaFormatImpl extends ScoreBoardEventProviderImpl<MediaFormat> im
             addProperties(props);
             this.format = format;
         }
-        public MediaFormatImpl(MediaFormatImpl cloned, ScoreBoardEventProvider root) {
-            super(cloned, root);
-            format = cloned.format;
-        }
-
-        @Override
-        public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-            return new MediaFormatImpl(this, root);
-        }
 
         @Override
         public String getId() {
@@ -221,16 +202,6 @@ public class MediaTypeImpl extends ScoreBoardEventProviderImpl<MediaType> implem
             this.parent = parent;
             this.type = type;
         }
-        public MediaTypeImpl(MediaTypeImpl cloned, ScoreBoardEventProvider root) {
-            super(cloned, root);
-            parent = (MediaFormat) super.parent;
-            type = cloned.type;
-        }
-
-        @Override
-        public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-            return new MediaTypeImpl(this, root);
-        }
 
         @Override
         public String getId() {
@@ -274,15 +245,6 @@ public class MediaFileImpl extends ScoreBoardEventProviderImpl<MediaFile> implem
             set(SRC, src);
             addWriteProtection(SRC);
         }
-        public MediaFileImpl(MediaFileImpl cloned, ScoreBoardEventProvider root) {
-            super(cloned, root);
-            type = (MediaType) super.parent;
-        }
-
-        @Override
-        public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-            return new MediaFileImpl(this, root);
-        }
 
         @Override
         public String getFormat() {

diff --git a/src/com/carolinarollergirls/scoreboard/core/admin/SettingsImpl.java b/src/com/carolinarollergirls/scoreboard/core/admin/SettingsImpl.java
@@ -5,8 +5,10 @@
 import com.carolinarollergirls.scoreboard.core.interfaces.ScoreBoard;
 import com.carolinarollergirls.scoreboard.core.interfaces.Settings;
 import com.carolinarollergirls.scoreboard.core.interfaces.Team;
-import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProvider;
+import com.carolinarollergirls.scoreboard.event.Child;
 import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProviderImpl;
+import com.carolinarollergirls.scoreboard.event.ValueWithId;
+import com.carolinarollergirls.scoreboard.utils.StatsbookExporter;
 import com.carolinarollergirls.scoreboard.utils.ValWithId;
 
 public class SettingsImpl extends ScoreBoardEventProviderImpl<Settings> implements Settings {
@@ -15,11 +17,12 @@ public SettingsImpl(ScoreBoard s) {
         addProperties(props);
         setDefaults();
     }
-    public SettingsImpl(SettingsImpl cloned, ScoreBoardEventProvider root) { super(cloned, root); }
 
     @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new SettingsImpl(this, root);
+    protected void itemAdded(Child<?> prop, ValueWithId item, Source source) {
+        if (item != null && ScoreBoard.SETTING_STATSBOOK_INPUT.equals(item.getId()) && scoreBoard.isInitialLoadDone()) {
+            StatsbookExporter.preload(item.getValue());
+        }
     }
 
     private void setDefaults() {

diff --git a/src/com/carolinarollergirls/scoreboard/core/admin/TwitterImpl.java b/src/com/carolinarollergirls/scoreboard/core/admin/TwitterImpl.java
@@ -67,12 +67,6 @@ public void scoreBoardChange(ScoreBoardEvent<?> e) {
 
         twitter.addListener(new Listener());
     }
-    public TwitterImpl(TwitterImpl cloned, ScoreBoardEventProvider root) { super(cloned, root); }
-
-    @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new TwitterImpl(this, root);
-    }
 
     @Override
     public void postAutosaveUpdate() {
@@ -254,12 +248,6 @@ public ConditionalTweetImpl(Twitter t, String id) {
             super(t, id, Twitter.CONDITIONAL_TWEET);
             addProperties(props);
         }
-        public ConditionalTweetImpl(ConditionalTweetImpl cloned, ScoreBoardEventProvider root) { super(cloned, root); }
-
-        @Override
-        public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-            return new ConditionalTweetImpl(this, root);
-        }
 
         @Override
         protected void valueChanged(Value<?> prop, Object value, Object last, Source source, Flag flag) {
@@ -295,12 +283,6 @@ public FormatSpecifierImpl(Twitter t, String id) {
             addWriteProtectionOverride(DESCRIPTION, Source.ANY_INTERNAL);
             addWriteProtectionOverride(CURRENT_VALUE, Source.ANY_INTERNAL);
         }
-        public FormatSpecifierImpl(FormatSpecifierImpl cloned, ScoreBoardEventProvider root) { super(cloned, root); }
-
-        @Override
-        public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-            return new FormatSpecifierImpl(this, root);
-        }
     }
 
     protected class TweetScoreBoardListener implements ScoreBoardListener {

diff --git a/src/com/carolinarollergirls/scoreboard/core/current/CurrentGameImpl.java b/src/com/carolinarollergirls/scoreboard/core/current/CurrentGameImpl.java
@@ -56,12 +56,6 @@ public CurrentGameImpl(ScoreBoard sb) {
             }
         }
     }
-    public CurrentGameImpl(CurrentGameImpl cloned, ScoreBoardEventProvider root) { super(cloned, root); }
-
-    @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new CurrentGameImpl(this, root);
-    }
 
     @Override
     public String getProviderId() {
@@ -173,7 +167,6 @@ public void postAutosaveUpdate() {
                 scoreBoard.add(ScoreBoard.GAME, g);
                 load(g);
             }
-            get(GAME).runExportDummy();
         }
     }
 

diff --git a/src/com/carolinarollergirls/scoreboard/core/game/BoxTripImpl.java b/src/com/carolinarollergirls/scoreboard/core/game/BoxTripImpl.java
@@ -10,7 +10,6 @@
 import com.carolinarollergirls.scoreboard.core.interfaces.Team;
 import com.carolinarollergirls.scoreboard.event.Child;
 import com.carolinarollergirls.scoreboard.event.Command;
-import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProvider;
 import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProviderImpl;
 import com.carolinarollergirls.scoreboard.event.Value;
 import com.carolinarollergirls.scoreboard.event.ValueWithId;
@@ -39,15 +38,6 @@ public BoxTripImpl(Fielding f) {
             for (Penalty p : f.getSkater().getUnservedPenalties()) { add(PENALTY, p); }
         }
     }
-    public BoxTripImpl(BoxTripImpl cloned, ScoreBoardEventProvider root) {
-        super(cloned, root);
-        game = toCloneIfInTree(cloned.game, root);
-    }
-
-    @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new BoxTripImpl(this, root);
-    }
 
     private void initReferences() {
         addWriteProtectionOverride(IS_CURRENT, Source.NON_WS);

diff --git a/src/com/carolinarollergirls/scoreboard/core/game/ClockImpl.java b/src/com/carolinarollergirls/scoreboard/core/game/ClockImpl.java
@@ -9,7 +9,6 @@
 import com.carolinarollergirls.scoreboard.event.Command;
 import com.carolinarollergirls.scoreboard.event.ConditionalScoreBoardListener;
 import com.carolinarollergirls.scoreboard.event.ScoreBoardEvent;
-import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProvider;
 import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProviderImpl;
 import com.carolinarollergirls.scoreboard.event.ScoreBoardListener;
 import com.carolinarollergirls.scoreboard.event.Value;
@@ -40,16 +39,6 @@ public ClockImpl(Game g, String i) {
         resetTime();
         game.addScoreBoardListener(new ConditionalScoreBoardListener<>(Game.class, Game.RULE, rulesetChangeListener));
     }
-    public ClockImpl(ClockImpl cloned, ScoreBoardEventProvider root) {
-        super(cloned, root);
-        game = (Game) parent;
-        subId = cloned.subId;
-    }
-
-    @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new ClockImpl(this, root);
-    }
 
     @Override
     public String getProviderId() {

diff --git a/src/com/carolinarollergirls/scoreboard/core/game/ExpulsionImpl.java b/src/com/carolinarollergirls/scoreboard/core/game/ExpulsionImpl.java
@@ -5,7 +5,6 @@
 import com.carolinarollergirls.scoreboard.core.interfaces.Penalty;
 import com.carolinarollergirls.scoreboard.core.interfaces.Skater;
 import com.carolinarollergirls.scoreboard.core.interfaces.Team;
-import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProvider;
 import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProviderImpl;
 import com.carolinarollergirls.scoreboard.event.Value;
 import com.carolinarollergirls.scoreboard.penalties.PenaltyCode;
@@ -24,16 +23,6 @@ public class ExpulsionImpl extends ScoreBoardEventProviderImpl<Expulsion> implem
             .addSource(p.getParent().getParent(), Team.DISPLAY_NAME);
         set(INFO, "");
     }
-    public ExpulsionImpl(ExpulsionImpl cloned, ScoreBoardEventProvider root) {
-        super(cloned, root);
-        game = (Game) parent;
-        penalty = toCloneIfInTree(cloned.penalty, root);
-    }
-
-    @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new ExpulsionImpl(this, root);
-    }
 
     @Override
     protected Object computeValue(Value<?> prop, Object value, Object last, Source source, Flag flag) {

diff --git a/src/com/carolinarollergirls/scoreboard/core/game/FieldingImpl.java b/src/com/carolinarollergirls/scoreboard/core/game/FieldingImpl.java
@@ -18,7 +18,6 @@
 import com.carolinarollergirls.scoreboard.event.Child;
 import com.carolinarollergirls.scoreboard.event.Command;
 import com.carolinarollergirls.scoreboard.event.ParentOrderedScoreBoardEventProviderImpl;
-import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProvider;
 import com.carolinarollergirls.scoreboard.event.Value;
 import com.carolinarollergirls.scoreboard.event.ValueWithId;
 
@@ -39,16 +38,6 @@ public FieldingImpl(TeamJam teamJam, Position position) {
         setInverseReference(SKATER, Skater.FIELDING);
         setRecalculated(NOT_FIELDED).addSource(this, SKATER);
     }
-    public FieldingImpl(FieldingImpl cloned, ScoreBoardEventProvider root) {
-        super(cloned, root);
-        teamJam = (TeamJam) parent;
-        game = toCloneIfInTree(cloned.game, root);
-    }
-
-    @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new FieldingImpl(this, root);
-    }
 
     @Override
     protected Object computeValue(Value<?> prop, Object value, Object last, Source source, Flag flag) {

diff --git a/src/com/carolinarollergirls/scoreboard/core/game/GameImpl.java b/src/com/carolinarollergirls/scoreboard/core/game/GameImpl.java
@@ -55,18 +55,11 @@ public GameImpl(ScoreBoard sb, PreparedTeam team1, PreparedTeam team2, Ruleset r
         getTeam(Team.ID_2).loadPreparedTeam(team2);
         jsonSnapshotter = new JSONStateSnapshotter(sb.getJsm(), this);
     }
-
     public GameImpl(ScoreBoard parent, String id) {
         super(parent, id, ScoreBoard.GAME);
         initReferences(scoreBoard.getRulesets().getRuleset(Rulesets.ROOT_ID));
         jsonSnapshotter = new JSONStateSnapshotter(getScoreBoard().getJsm(), this);
     }
-    public GameImpl(GameImpl cloned, ScoreBoardEventProvider root) { super(cloned, root); }
-
-    @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new GameImpl(this, root);
-    }
 
     private void initReferences(Ruleset rs) {
         addProperties(props);
@@ -950,11 +943,6 @@ public void exportDone(boolean success) {
         statsbookExporter = null;
     }
 
-    @Override
-    public void runExportDummy() {
-        if (statsbookExporter == null) { statsbookExporter = new StatsbookExporter(this); }
-    }
-
     protected GameSnapshot snapshot = null;
     protected boolean replacePending = false;
     protected boolean autostartRan = false;

diff --git a/src/com/carolinarollergirls/scoreboard/core/game/JamImpl.java b/src/com/carolinarollergirls/scoreboard/core/game/JamImpl.java
@@ -36,15 +36,6 @@ public JamImpl(ScoreBoardEventProvider p, int j) {
             .addSource(getTeamJam(Team.ID_1), TeamJam.STAR_PASS)
             .addSource(getTeamJam(Team.ID_2), TeamJam.STAR_PASS);
     }
-    public JamImpl(JamImpl cloned, ScoreBoardEventProvider root) {
-        super(cloned, root);
-        game = toCloneIfInTree(cloned.game, root);
-    }
-
-    @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new JamImpl(this, root);
-    }
 
     @Override
     public void setParent(ScoreBoardEventProvider p) {

diff --git a/src/com/carolinarollergirls/scoreboard/core/game/OfficialImpl.java b/src/com/carolinarollergirls/scoreboard/core/game/OfficialImpl.java
@@ -4,7 +4,6 @@
 import com.carolinarollergirls.scoreboard.core.interfaces.Official;
 import com.carolinarollergirls.scoreboard.core.interfaces.Team;
 import com.carolinarollergirls.scoreboard.event.Child;
-import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProvider;
 import com.carolinarollergirls.scoreboard.event.ScoreBoardEventProviderImpl;
 import com.carolinarollergirls.scoreboard.event.Value;
 
@@ -14,15 +13,6 @@ public OfficialImpl(Game g, String id, Child<Official> type) {
         game = g;
         addProperties(props);
     }
-    public OfficialImpl(OfficialImpl cloned, ScoreBoardEventProvider root) {
-        super(cloned, root);
-        game = (Game) parent;
-    }
-
-    @Override
-    public ScoreBoardEventProvider clone(ScoreBoardEventProvider root) {
-        return new OfficialImpl(this, root);
-    }
 
     @Override
     public int compareTo(Official other) {