Rework Track/TrackSet management

- Split Tracks and their Statistics - Rewrite parsing - Migrate most of the track stuff to shared/ - Add tests for the new parser
PhilippvK · Oct 13, 2020 · e216182 · e216182
1 parent f33a4e0
commit e216182
Show file tree

Hide file tree

Showing 68 changed files with 1,501 additions and 812 deletions.
diff --git a/client/client.iml b/client/client.iml
@@ -10,19 +10,8 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="11" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.5.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.5.10" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty:3.6.6.Final" level="project" />
     <orderEntry type="library" name="Maven: info.picocli:picocli:4.5.1" level="project" />
     <orderEntry type="module" module-name="shared" />

diff --git a/editor/src/main/java/org/moparforia/editor/EditorPanel.java b/editor/src/main/java/org/moparforia/editor/EditorPanel.java
@@ -1,6 +1,7 @@
 package org.moparforia.editor;
 
-import org.moparforia.shared.Track;
+import org.moparforia.shared.tracks.Track;
+import org.moparforia.shared.tracks.TrackCategory;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -207,7 +208,7 @@ public void actionPerformed(ActionEvent e) {
                 chooser.showDialog(getThis(),"hurr");
                 File f = chooser.getSelectedFile();
                 //currentTrack = TrackStore.getTrack(f);//todo get rid of this (uses org.moparforia.server.track.TrackStore)!!
-                currentTrack = TrackEditor.loadTrack(f);
+                currentTrack = TrackEditor.loadTrack(f.toPath());
                 Map m = new MapDecompressor().decompress(currentTrack.getMap());
                 canvas.setMap(m);
             } catch (Exception exp) {
@@ -227,10 +228,8 @@ public void actionPerformed(ActionEvent e) {
             if(currentTrack == null) {
                 String data = new MapCompressor().compress(canvas.getMap());
                 String name = JOptionPane.showInputDialog(getThis(),"WUTS THE NAME OF THIS TRACK?");
-                Track t = new Track(name, "fc", data, 7,
-                        new int[]{1000, 1000, 2, 10}, new String[]{"fc", "sum cunt"}, new long[]{10, 3300000},
-                        new int[]{0, 0, 0, 0, 3, 0, 0, 0, 0, 10, 10});
-                currentTrack = t;
+                Track track = new Track(name, "fc", data, TrackCategory.UNKNOWN);
+                currentTrack = track;
             }
 
             MapCompressor mc = new MapCompressor();
@@ -240,13 +239,9 @@ public void actionPerformed(ActionEvent e) {
             String save = currentTrack.toString().replace("\t", "\n");
             File file = new File("tracks/custom/" + currentTrack.getName() + ".track");
 
-            PrintStream out = null;
-            try {
-                out = new PrintStream(new FileOutputStream(file, false));
+            try (PrintStream out = new PrintStream(new FileOutputStream(file, false))) {
                 out.print(save);
-            } catch (Exception ee) {
-            } finally {
-                if (out != null) out.close();
+            } catch (Exception ignored) {
             }
 
         }

diff --git a/editor/src/main/java/org/moparforia/editor/TrackEditor.java b/editor/src/main/java/org/moparforia/editor/TrackEditor.java
@@ -4,7 +4,10 @@
 
 package org.moparforia.editor;
 
-import org.moparforia.shared.Track;
+import org.moparforia.shared.tracks.Track;
+import org.moparforia.shared.tracks.TrackCategory;
+import org.moparforia.shared.tracks.filesystem.FileSystemTrackManager;
+import org.moparforia.shared.tracks.filesystem.TrackFileParser;
 
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
@@ -15,6 +18,7 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.io.*;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Scanner;
 
@@ -185,25 +189,9 @@ private void generateButtons() {
         togglePencil.setSelected(true);
     }
 
-    public static final Track loadTrack(File f) throws IOException {
-
-        String name = null, author = null, data = null;
-        Scanner scanner = new Scanner(new FileInputStream(f));
-        while (scanner.hasNextLine()) {
-            String line = scanner.nextLine();
-            if (line.startsWith("V ")) {
-                // hi
-            } else if (line.startsWith("S ")) {
-                // hi? get on it, watson
-            } else if (line.startsWith("A ")) {
-                author = line.substring(2);
-            } else if (line.startsWith("N ")) {
-                name = line.substring(2);
-            } else if (line.startsWith("T ")) {
-                data = line.substring(2);
-            }
-        }
-        return new Track(name, author, data, 7);
+    public static final Track loadTrack(Path path) throws IOException {
+
+        return TrackFileParser.parseTrack(path, TrackCategory.UNKNOWN);
     }
 
     private void menuNewActionPerformed(ActionEvent e) {
@@ -216,9 +204,9 @@ private void menuOpenActionPerformed(ActionEvent e) {
             int result = chooser.showOpenDialog(this);
             if (result != JFileChooser.CANCEL_OPTION) {
                 File f = chooser.getSelectedFile();
-                Track currentTrack = loadTrack(f);
+                Track currentTrack = loadTrack(f.toPath());
                 Map m = new MapDecompressor().decompress(currentTrack.getMap());
-                mapCanvas.updateProperties(currentTrack.getName(), currentTrack.getCategory());
+                mapCanvas.updateProperties(currentTrack.getName(), currentTrack.getCategory().getId());
                 mapCanvas.setMap(m);
             }
         } catch (Exception exp) {
@@ -241,7 +229,7 @@ private void menuSaveActionPerformed(ActionEvent e) {
             return;
         }
         String data = new MapCompressor().compress(mapCanvas.getMap());
-        Track t = new Track(mapCanvas.getTrackName(), "editor", data, 7);
+        Track track = new Track(mapCanvas.getTrackName(), "editor", data, TrackCategory.UNKNOWN);
 
         JFileChooser saver = new JFileChooser("tracks/custom/");
         saver.setFileFilter(new FileFilter() {
@@ -255,13 +243,13 @@ public String getDescription() {
                 return "*.track";
             }
         });
-        saver.setSelectedFile(new File(t.getName().replaceAll(" ", "_")));
+        saver.setSelectedFile(new File(track.getName().replaceAll(" ", "_")));
         int result = saver.showSaveDialog(this);
 
         if (result == JFileChooser.CANCEL_OPTION) return;
 
-        t.setMap(data);
-        String save = t.toSaveString().replace("\t", "\n");
+        track.setMap(data);
+        String save = FileSystemTrackManager.convertTrack(track).replace("\t", "\n");
 
         PrintStream out = null;
         try {

diff --git a/editor/src/main/java/org/moparforia/editor/TrackPropertiesDialog.java b/editor/src/main/java/org/moparforia/editor/TrackPropertiesDialog.java
@@ -4,6 +4,8 @@
 
 package org.moparforia.editor;
 
+import org.moparforia.shared.tracks.TrackCategory;
+
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
@@ -26,7 +28,7 @@ public TrackPropertiesDialog(Dialog owner) {
 
     private void loadValues() {
         textTrackName.setText(((TrackEditor)getOwner()).getMapCanvas().getTrackName());
-        comboTrackCategory.setSelectedIndex(((TrackEditor)getOwner()).getMapCanvas().getTrackCategory() - 1);
+        comboTrackCategory.setSelectedIndex(TrackCategory.BASIC.getId());
     }
 
     private void okButtonActionPerformed(ActionEvent e) {

diff --git a/pom.xml b/pom.xml
@@ -97,16 +97,6 @@
                 <version>3.10.6.Final</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>org.mongodb</groupId>
-                <artifactId>mongo-java-driver</artifactId>
-                <version>3.6.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.mongodb.morphia</groupId>
-                <artifactId>morphia</artifactId>
-                <version>1.2.2</version>
-            </dependency>
             <dependency>
                 <groupId>org.moparforia</groupId>
                 <artifactId>shared</artifactId>
@@ -137,6 +127,18 @@
                 <version>3.5.10</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>com.github.marschall</groupId>
+                <artifactId>memoryfilesystem</artifactId>
+                <version>2.1.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.softsmithy.lib</groupId>
+                <artifactId>softsmithy-lib-core</artifactId>
+                <version>2.1.1</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/server/pom.xml b/server/pom.xml
@@ -24,14 +24,6 @@
             <artifactId>netty</artifactId> <!-- Use 'netty-all' for 4.0 or above -->
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mongodb.morphia</groupId>
-            <artifactId>morphia</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.moparforia</groupId>
             <artifactId>shared</artifactId>

diff --git a/server/server.iml b/server/server.iml
@@ -11,11 +11,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.6.6.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.6.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb.morphia:morphia:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.proxytoys:proxytoys:1.0" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty:3.10.6.Final" level="project" />
     <orderEntry type="module" module-name="shared" />
     <orderEntry type="library" name="Maven: info.picocli:picocli:4.5.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
@@ -29,6 +25,5 @@
     <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.5.10" level="project" />
-    <orderEntry type="module" module-name="client" scope="TEST" />
   </component>
 </module>
diff --git a/server/src/main/java/org/moparforia/server/Server.java b/server/src/main/java/org/moparforia/server/Server.java
@@ -14,7 +14,9 @@
 import org.moparforia.server.game.LobbyType;
 import org.moparforia.server.game.Player;
 import org.moparforia.server.net.*;
-import org.moparforia.server.track.TrackManager;
+import org.moparforia.shared.tracks.TrackLoadException;
+import org.moparforia.shared.tracks.filesystem.FileSystemTrackManager;
+import org.moparforia.shared.tracks.filesystem.FileSystemStatsManager;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -152,10 +154,10 @@ public void addPlayer(Player p) {
     }
 
     public void start() {
-        //TrackStore.LoadTracks(); // gr8 piece of engineering right here!
         try {
-            new TrackManager().load();
-        } catch (IOException e) {
+            FileSystemTrackManager.getInstance().load();
+            FileSystemStatsManager.getInstance().load();
+        } catch (TrackLoadException | IOException e) {
             System.err.println("Unable to load tracks: " + e.getMessage());
             e.printStackTrace();
             return;

diff --git a/server/src/main/java/org/moparforia/server/db/Database.java b/server/src/main/java/org/moparforia/server/db/Database.java
@@ -4,7 +4,7 @@
 //import org.mongodb.morphia.Datastore;
 //import org.mongodb.morphia.Morphia;
 //import org.moparforia.server.util.SHA1;
-//import org.moparforia.shared.Track;
+//import org.moparforia.shared.tracks.Track;
 //
 ///**
 // * User: Johan