Store log files in a folder in the user's home directory

dakshj · Apr 2, 2017 · 192369a · 192369a
1 parent 2a60eb3
commit 192369a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 18 deletions.
diff --git a/app/src/main/java/com/smarthome/ioT/db/Logger.java b/app/src/main/java/com/smarthome/ioT/db/Logger.java
@@ -5,15 +5,18 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.Collections;
 
 class Logger {
 
-    private static final String LOG_FILE_NAME = "Smart Home Logs";
+    private static final String LOG_FILE_NAME = "Smart Home Log";
+    private static final String LOG_FOLDER_NAME = LOG_FILE_NAME + "s";
 
+    private final Path logPath;
     private final File logFile;
 
     /**
@@ -23,18 +26,26 @@ class Logger {
      * @param currentTime The timestamp with which to create a new log file
      */
     Logger(final long currentTime) {
-        final URL resource = ClassLoader.getSystemClassLoader().getResource(".");
-        if (resource == null) {
-            throw new LogFileCreationFailedException("{failed to fetch folder path}");
-        }
+        logPath = Paths.get(System.getProperty("user.home"), LOG_FOLDER_NAME);
 
-        final File jarDir = new File(resource.getPath());
-        logFile = new File(jarDir, LOG_FILE_NAME + " - " + currentTime + ".txt");
+        logFile = new File(logPath.toFile(), LOG_FILE_NAME + " - " + currentTime + ".txt");
 
-        getLogFile();
+        initializeLogFile();
     }
 
-    private File getLogFile() {
+    private void initializeLogPath() {
+        if (!Files.exists(logPath)) {
+            try {
+                Files.createDirectories(logPath);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private void initializeLogFile() {
+        initializeLogPath();
+
         if (!logFile.exists()) {
             try {
                 if (!logFile.createNewFile()) {
@@ -44,7 +55,10 @@ private File getLogFile() {
                 e.printStackTrace();
             }
         }
+    }
 
+    private File getLogFile() {
+        initializeLogFile();
         return logFile;
     }
 

diff --git a/app/txt/test/User in System.txt b/app/txt/test/User in System.txt
@@ -261,14 +261,14 @@ Closing the door.
 0,652e5a87-00fb-4c08-9703-df17f75dde7b,1,null,0,1491171194315,18,BULB switched off.
 0,d4fd46cc-aeb6-44cc-8f4c-9b5fde33895f,1,null,1,1491171199726,12,OUTLET switched on.
 0,652e5a87-00fb-4c08-9703-df17f75dde7b,1,null,0,1491171200944,19,BULB switched on.
-0,d1ff63b4-34b9-46fa-b973-783cdc7bd8e9,0,1,null,1491171202389,13,Motion detected.
-0,d4fd46cc-aeb6-44cc-8f4c-9b5fde33895f,1,null,1,1491171203663,13,OUTLET switched off.
+0,d1ff63b4-34b9-46fa-b973-783cdc7bd8e9,0,1,null,1491171202389,15,Motion detected.
+0,d4fd46cc-aeb6-44cc-8f4c-9b5fde33895f,1,null,1,1491171203663,19,OUTLET switched off.
 0,652e5a87-00fb-4c08-9703-df17f75dde7b,1,null,0,1491171205066,20,BULB switched off.
-0,d4fd46cc-aeb6-44cc-8f4c-9b5fde33895f,1,null,1,1491171207686,14,OUTLET switched on.
-0,d4fd46cc-aeb6-44cc-8f4c-9b5fde33895f,1,null,1,1491171210335,15,OUTLET switched off.
+0,d4fd46cc-aeb6-44cc-8f4c-9b5fde33895f,1,null,1,1491171207686,21,OUTLET switched on.
+0,d4fd46cc-aeb6-44cc-8f4c-9b5fde33895f,1,null,1,1491171210335,22,OUTLET switched off.
 0,652e5a87-00fb-4c08-9703-df17f75dde7b,1,null,0,1491171211097,21,BULB switched on.
-0,d1ff63b4-34b9-46fa-b973-783cdc7bd8e9,0,1,null,1491171212306,14,Motion detected.
-0,d4fd46cc-aeb6-44cc-8f4c-9b5fde33895f,1,null,1,1491171214354,33,OUTLET switched on.
+0,d1ff63b4-34b9-46fa-b973-783cdc7bd8e9,0,1,null,1491171212306,21,Motion detected.
+0,d4fd46cc-aeb6-44cc-8f4c-9b5fde33895f,1,null,1,1491171214354,23,OUTLET switched on.
 0,d1ff63b4-34b9-46fa-b973-783cdc7bd8e9,0,1,null,1491171215853,33,Motion detected.
 0,d4fd46cc-aeb6-44cc-8f4c-9b5fde33895f,1,null,1,1491171218111,34,OUTLET switched off.
 0,652e5a87-00fb-4c08-9703-df17f75dde7b,1,null,0,1491171219422,33,BULB switched off.
@@ -280,10 +280,10 @@ Closing the door.
 0,d4fd46cc-aeb6-44cc-8f4c-9b5fde33895f,1,null,1,1491171235851,37,OUTLET switched on.
 0,d4fd46cc-aeb6-44cc-8f4c-9b5fde33895f,1,null,1,1491171239754,38,OUTLET switched off.
 0,d1ff63b4-34b9-46fa-b973-783cdc7bd8e9,0,1,null,1491171240778,36,Motion detected.
-0,d1ff63b4-34b9-46fa-b973-783cdc7bd8e9,0,1,null,1491171241670,37,Motion detected.
+0,d1ff63b4-34b9-46fa-b973-783cdc7bd8e9,0,1,null,1491171241670,41,Motion detected.
 0,ef7b89bc-0ec4-48ad-8885-3cc9b15601ee,0,2,null,1491171242474,33,Door opened.
 1,null,null,null,null,1491171242491,47,User exited the Smart Home.
 0,652e5a87-00fb-4c08-9703-df17f75dde7b,1,null,0,1491171242501,49,BULB switched off.
-0,ef7b89bc-0ec4-48ad-8885-3cc9b15601ee,0,2,null,1491171242984,34,Door closed.
+0,ef7b89bc-0ec4-48ad-8885-3cc9b15601ee,0,2,null,1491171242984,42,Door closed.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Log File END~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~