Added period and timestamp display to messages, flush log file period…

…ically

src/main/java/com/funkylogclient/FunkyLogSorter.java

@@ -6,6 +6,9 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.LinkedList;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import javafx.animation.PauseTransition;
 import javafx.scene.control.Alert;
@@ -31,6 +34,20 @@ public class FunkyLogSorter {
     public static String log_file_directory = System.getProperty("user.dir") + "/logs846";
     public static FileWriter log_file;
 
+    private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+
+    static {
+        scheduler.scheduleAtFixedRate(() -> {
+            if (log_file != null) {
+                try {
+                    log_file.flush();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }, 3000, 1000, TimeUnit.MILLISECONDS);
+    }
+
     public static void clear() {
         messages.clear();
         filtered.clear();
@@ -75,8 +92,6 @@ public static void trimMessages() {
     }
 
     public static void addMessage(Message m) {
-        System.out.println(m);
-
         messages.add(m);
 
         if (log_file != null) {
@@ -85,6 +100,8 @@ public static void addMessage(Message m) {
             } catch (IOException exc) {
                 exc.printStackTrace();
             }
+        } else {
+            System.out.println("Log file not open");
         }
 
         if (m.isError()) {
@@ -172,6 +189,8 @@ public static void makeNewLogFile() {
             if (log_file != null)
                 log_file.close();
             log_file = new FileWriter(log_file_directory + "/" + makeLogFileName());
+            System.out.print("Log file created: ");
+            System.out.println(log_file_directory + "/" + makeLogFileName());
         } catch (IOException exc) {
             exc.printStackTrace();
         }
@@ -225,5 +244,4 @@ public static void createTestError(Stage pstage) {
         addMessage(new Message("2;TestSender;This is an Error;0.0;0;0.0"));
         logAllMessages();
     }
-
 }

src/main/java/com/funkylogclient/FunkyLogs.java

@@ -37,7 +37,7 @@ public class FunkyLogs extends Application {
     @Override
     public void start(Stage primaryStage) {
         FunkyLogSorter.makeNewLogFile();
-        primaryStage.setTitle("FunkyLogs v1.1.0");
+        primaryStage.setTitle("FunkyLogs v1.1.2");
 
         root = new BorderPane();
         root.getStyleClass().add("root");

src/main/java/com/funkylogclient/Message.java

@@ -1,10 +1,15 @@
 package com.funkylogclient;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
 import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
+import javafx.scene.text.TextAlignment;
 
 public class Message {
     private int type;
@@ -26,6 +31,9 @@ public Message(String unparsed) {
             sender = split[1];
             content = split[2];
 
+            period = Integer.parseInt(split[4]);
+            period_timestamp = Double.parseDouble(split[5]);
+
             isValid = true;
         } catch (Exception exc) {
             System.out.println("Error in parsing message: " + unparsed);
@@ -34,6 +42,9 @@ public Message(String unparsed) {
             sender = new String("Unknown");
             time = 0.0;
 
+            period = 0;
+            period_timestamp = 0.0;
+
             isValid = false;
         }
     }
@@ -71,6 +82,17 @@ public int getPeriod() {
         return period;
     }
 
+    public String getPeriodName() {
+        switch (getPeriod()) {
+            case 1:
+                return "TELE-OP";
+            case 2:
+                return "AUTON";
+            default:
+                return "DISABLED";
+        }
+    }
+
     public boolean isLog() {
         return type == 0;
     }
@@ -112,9 +134,22 @@ public Node getComponent() {
 
         box.setPadding(new Insets(5, 5, 5, 5));
 
-        Text top = new Text(time + " [" + sender + "]");
+        HBox topBox = new HBox();
+        topBox.setPadding(new Insets(0, 0, 5, 0));
+        topBox.setSpacing(400);
+
+        Text top = new Text(
+                new BigDecimal(this.time).setScale(1, RoundingMode.HALF_UP).toString() + " [" + sender + "]");
         top.setStyle(Styles.TEXT_STYLE + Styles.TEXT_SMALL);
 
+        Text topRight = new Text(getPeriodName() + " " + new BigDecimal(this.period_timestamp)
+                .setScale(0, RoundingMode.HALF_UP).toString());
+        topRight.setStyle(Styles.TEXT_STYLE + Styles.TEXT_SMALLER);
+        HBox.setHgrow(topRight, Priority.ALWAYS);
+        topRight.setTextAlignment(TextAlignment.RIGHT);
+
+        topBox.getChildren().addAll(top, topRight);
+
         HBox body = new HBox();
         body.setPadding(new Insets(5, 5, 5, 30));
 
@@ -124,7 +159,7 @@ public Node getComponent() {
 
         body.getChildren().add(contentText);
 
-        box.getChildren().addAll(top, body);
+        box.getChildren().addAll(topBox, body);
 
         return box;
     }

src/main/java/com/funkylogclient/SidebarOtherSettings.java

@@ -55,27 +55,27 @@ public static VBox getSidebarOtherSettings(ChangeListener<Boolean> autoScrollCha
         });
         otherSettingsBox.getChildren().add(fileSelectionDialog);
 
-        // Region testLogButtonspacing = new Region();
-        // testLogButtonspacing.setMinHeight(20);
-        // otherSettingsBox.getChildren().add(testLogButtonspacing);
+        Region testLogButtonspacing = new Region();
+        testLogButtonspacing.setMinHeight(20);
+        otherSettingsBox.getChildren().add(testLogButtonspacing);
 
-        // Button testLogButton = new Button("Test Log");
-        // testLogButton.setOnAction((ev) -> {
-        // FunkyLogSorter.createTestLog(primaryStage);
-        // });
-        // otherSettingsBox.getChildren().add(testLogButton);
+        Button testLogButton = new Button("Test Log");
+        testLogButton.setOnAction((ev) -> {
+            FunkyLogSorter.createTestLog(primaryStage);
+        });
+        otherSettingsBox.getChildren().add(testLogButton);
 
-        // Button testWarningButton = new Button("Test Warning");
-        // testWarningButton.setOnAction((ev) -> {
-        // FunkyLogSorter.createTestWarning(primaryStage);
-        // });
-        // otherSettingsBox.getChildren().add(testWarningButton);
+        Button testWarningButton = new Button("Test Warning");
+        testWarningButton.setOnAction((ev) -> {
+            FunkyLogSorter.createTestWarning(primaryStage);
+        });
+        otherSettingsBox.getChildren().add(testWarningButton);
 
-        // Button testErrorButton = new Button("Test Error");
-        // testErrorButton.setOnAction((ev) -> {
-        // FunkyLogSorter.createTestError(primaryStage);
-        // });
-        // otherSettingsBox.getChildren().add(testErrorButton);
+        Button testErrorButton = new Button("Test Error");
+        testErrorButton.setOnAction((ev) -> {
+            FunkyLogSorter.createTestError(primaryStage);
+        });
+        otherSettingsBox.getChildren().add(testErrorButton);
 
         return otherSettingsBox;
     }

src/main/java/com/funkylogclient/Styles.java

@@ -9,14 +9,14 @@ public class Styles {
     public static final String TEXT_MED = "-fx-font-size: 14px; -fx-fill: #aaa; -fx-font-family: Poppins;";
     public static final String TEXT_GMED = "-fx-font-size: 16px; -fx-fill: #aaa; -fx-font-family: Poppins;";
     public static final String TEXT_SMALL = "-fx-font-size: 14px;";
+    public static final String TEXT_SMALLER = "-fx-font-size: 11px;";
     public static final String BOLD_TEXT = " -fx-font-weight: bold;";
 
     public static final String DEFAULT_MSG = "-fx-border-width: 3px;";
 
     public static final String SCROLL_PANE_STYLE = "-fx-background-color: #1E1E1E;";
 
-    public static final String RIGHT_SIDEBAR_STYLE = 
-        "-fx-background-radius:10; -fx-background-color: #1E1E1E;"
-        + "-fx-border-color: transparent transparent transparent #fff; -fx-border-width: 0.2px;";
+    public static final String RIGHT_SIDEBAR_STYLE = "-fx-background-radius:10; -fx-background-color: #1E1E1E;"
+            + "-fx-border-color: transparent transparent transparent #fff; -fx-border-width: 0.2px;";
 
 }