Merge pull request #986 from Bram-Hub/dev

Fix User Directory Issue

Author: jadeandtea

.gitignore

@@ -12,6 +12,7 @@ cmake-build-*/
 out/
 build/
 bin/
+installer/
 
 # Native files generated on build, not needed in git
 native/windows/lib

src/main/java/edu/rpi/legup/app/LegupPreferences.java

@@ -1,5 +1,6 @@
 package edu.rpi.legup.app;
 
+import java.nio.file.Paths;
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.function.Function;
@@ -23,7 +24,7 @@ public class LegupPreferences {
             new EnumMap<>(LegupPreference.class);
 
     public enum LegupPreference {
-        WORK_DIRECTORY("work-directory", System.getProperty("user.dir"), o -> o),
+        WORK_DIRECTORY("work-directory", defaultUserDirectory(), o -> o),
         START_FULL_SCREEN("start-full-screen", false, Boolean::parseBoolean),
         AUTO_UPDATE("auto-update", true, Boolean::parseBoolean),
         DARK_MODE("night-mode", false, Boolean::parseBoolean),
@@ -33,7 +34,7 @@ public enum LegupPreference {
         ALLOW_DEFAULT_RULES("allow-default-rules", false, Boolean::parseBoolean),
         AUTO_GENERATE_CASES("auto-generate-cases", true, Boolean::parseBoolean),
         IMMEDIATE_FEEDBACK("immediate-feedback", true, Boolean::parseBoolean),
-        COLOR_THEME_FILE("color-theme-file", System.getProperty("user.dir"), o -> o),
+        COLOR_THEME_FILE("color-theme-file", defaultUserDirectory(), o -> o),
         COLOR_BLIND("color-blind", false, Boolean::parseBoolean);
 
         private final String id;
@@ -124,6 +125,10 @@ private static Object getPreferenceOrDefault(LegupPreference preference) {
         return current;
     }
 
+    private static String defaultUserDirectory() {
+        return Paths.get(System.getProperty("user.home")).toString();
+    }
+
     private static void addPreferenceFromDefault(LegupPreference preference) {
         preferencesMap.put(preference, getPreferenceOrDefault(preference));
     }

src/main/java/edu/rpi/legup/utility/Logger.java

@@ -1,6 +1,9 @@
 package edu.rpi.legup.utility;
 
-import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.appender.ConsoleAppender;
@@ -12,35 +15,52 @@
 
 public class Logger {
 
-    private static final String LEGUP_HOME =
-            System.getProperty("user.dir") + File.separator + ".legup" + File.separator;
+    private static final String LOG_PATTERN =
+            "[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} - %msg%n";
 
     public static void initLogger() {
         LoggerContext context = (LoggerContext) LogManager.getContext(false);
         Configuration config = context.getConfiguration();
+        if (config.getAppender("fileLogger") != null) {
+            System.setProperty("sun.java2d.noddraw", Boolean.TRUE.toString());
+            return;
+        }
+
         ConsoleAppender consoleAppender = config.getAppender("console");
-        PatternLayout consolePattern = (PatternLayout) consoleAppender.getLayout();
+        String logPattern = LOG_PATTERN;
+        if (consoleAppender != null && consoleAppender.getLayout() instanceof PatternLayout) {
+            logPattern = ((PatternLayout) consoleAppender.getLayout()).getConversionPattern();
+        }
         TimeBasedTriggeringPolicy triggeringPolicy =
                 TimeBasedTriggeringPolicy.newBuilder().withInterval(1).withModulate(true).build();
-        PatternLayout patternLayout =
-                PatternLayout.newBuilder()
-                        .withPattern(consolePattern.getConversionPattern())
-                        .build();
-        RollingFileAppender rollingFileAppender =
-                RollingFileAppender.newBuilder()
-                        .setName("fileLogger")
-                        .withFileName(LEGUP_HOME + "legup.log")
-                        .withFilePattern(LEGUP_HOME + "legup-%d{yyyy-MM-dd}.log.gz")
-                        .withPolicy(triggeringPolicy)
-                        .setLayout(patternLayout)
-                        .setConfiguration(config)
-                        .build();
-        rollingFileAppender.start();
-        config.addAppender(rollingFileAppender);
-        LoggerConfig rootLogger = config.getRootLogger();
-        rootLogger.addAppender(config.getAppender("fileLogger"), null, null);
-        context.updateLoggers();
+        PatternLayout patternLayout = PatternLayout.newBuilder().withPattern(logPattern).build();
+
+        try {
+            Path legupHome = getLegupHome();
+            Files.createDirectories(legupHome);
+            RollingFileAppender rollingFileAppender =
+                    RollingFileAppender.newBuilder()
+                            .setName("fileLogger")
+                            .withFileName(legupHome.resolve("legup.log").toString())
+                            .withFilePattern(
+                                    legupHome.resolve("legup-%d{yyyy-MM-dd}.log.gz").toString())
+                            .withPolicy(triggeringPolicy)
+                            .setLayout(patternLayout)
+                            .setConfiguration(config)
+                            .build();
+            rollingFileAppender.start();
+            config.addAppender(rollingFileAppender);
+            LoggerConfig rootLogger = config.getRootLogger();
+            rootLogger.addAppender(config.getAppender("fileLogger"), null, null);
+            context.updateLoggers();
+        } catch (IOException | RuntimeException e) {
+            System.err.println("Unable to initialize LEGUP file logging: " + e.getMessage());
+        }
 
         System.setProperty("sun.java2d.noddraw", Boolean.TRUE.toString());
     }
+
+    private static Path getLegupHome() {
+        return Paths.get(System.getProperty("user.home"), ".legup");
+    }
 }

src/test/java/edu/rpi/legup/utility/LoggerTest.java

@@ -0,0 +1,29 @@
+package edu.rpi.legup.utility;
+
+import static org.junit.Assert.assertTrue;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+public class LoggerTest {
+
+    @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+    @Test
+    public void initLoggerCreatesLegupHomeDirectory() throws Exception {
+        String originalUserHome = System.getProperty("user.home");
+        Path userHome = temporaryFolder.newFolder("home").toPath();
+        System.setProperty("user.home", userHome.toString());
+
+        try {
+            Logger.initLogger();
+
+            assertTrue(Files.isDirectory(userHome.resolve(".legup")));
+        } finally {
+            System.setProperty("user.home", originalUserHome);
+        }
+    }
+}