Merge pull request #135 from junhyeong0411/master

Add exception for file corruptions in flashcard.txt

Author: junhyeong0411

data/flashcards/flashcard.txt

@@ -1,2 +1,5 @@
 3 | cs2113 | software enginnering | 3 
 5 | Hello | Duke | 4 
+7 | Hello | Duke | 5 
+9 | id | checker | 5 
+10 | id increases | correctly | 5 

data/flashcards/flashcard1110.txt

@@ -0,0 +1,3 @@
+3 | cs2113 | software enginnering | 3 
+5 | Hello | Duke | 4 
+7 | Hello | Duke | 5 

src/main/java/seedu/duke/calendar/CalendarManager.java

@@ -4,6 +4,7 @@
 
 import seedu.duke.calendar.command.EventCommand;
 import seedu.duke.calendar.command.UnknownCommand;
+import seedu.duke.storage.EventStorage;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;

src/main/java/seedu/duke/flashcard/Flashcard.java

@@ -45,7 +45,7 @@ public static void calculateAndUpdateGlobalMaxId(
             }
         }
 
-        globalMaxId = currentMax + 1;
+        globalMaxId = currentMax;
     }
 
     public int getId() {

src/main/java/seedu/duke/flashcard/FlashcardComponent.java

@@ -4,6 +4,7 @@
 
 import seedu.duke.flashcard.command.FlashcardCommand;
 import seedu.duke.flashcard.command.UnknownCommand;
+import seedu.duke.storage.FlashcardStorage;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;

src/main/java/seedu/duke/calendar/EventStorage.java renamed to src/main/java/seedu/duke/storage/EventStorage.java

@@ -1,10 +1,13 @@
-package seedu.duke.calendar;
+package seedu.duke.storage;
+
+import seedu.duke.calendar.Event;
+import seedu.duke.calendar.EventList;
+import seedu.duke.calendar.Goal;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Scanner;
 import java.util.logging.Level;
@@ -31,28 +34,6 @@ public boolean isStorageAvailable(){
         return f.exists();
     }
 
-    /**
-     * load an event from certain format
-     * Tokens includes attributes of Event
-     * @param tokens is used to get event name
-     * @return Event object
-     */
-    private Event loadEvent(String[] tokens){
-
-        assert tokens.length == 3 || tokens.length == 4: "Token length should be 3 or 4";
-        if(tokens.length == 3) {
-            String name = tokens[0].trim();
-            LocalDateTime from = LocalDateTime.parse(tokens[1].trim());
-            LocalDateTime to = LocalDateTime.parse(tokens[2].trim());
-            return new Event(name, from, to);
-        }
-        String name = tokens[0].trim();
-        LocalDateTime by = LocalDateTime.parse(tokens[1].trim());
-        int goal = Integer.parseInt(tokens[2].trim());
-        int completed = Integer.parseInt(tokens[3].trim());
-        return new Goal(name, by, goal, completed);
-    }
-
     /**
      * load list of events
      * from this.path
@@ -66,7 +47,7 @@ public EventList loadEvents() throws FileNotFoundException{
 
         while(s.hasNext()){
             String[] eventTokens = s.nextLine().split(" \\| ");
-            eventList.addEvent(loadEvent(eventTokens));
+            eventList.addEvent(EventStorageParser.loadEvent(eventTokens));
         }
 
         logger.log(Level.INFO, String.format(

src/main/java/seedu/duke/storage/EventStorageParser.java

@@ -0,0 +1,46 @@
+package seedu.duke.storage;
+
+import seedu.duke.calendar.Event;
+import seedu.duke.calendar.Goal;
+
+import java.time.LocalDateTime;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class EventStorageParser {
+
+    private static Logger logger; // for logging
+
+
+    /**
+     * load an event from certain format
+     * Tokens includes attributes of Event
+     * @param tokens is used to get event name
+     * @return Event object
+     */
+    public static Event loadEvent(String[] tokens){
+
+        logger = Logger.getLogger("event");
+        logger.setLevel(Level.WARNING);
+
+        assert tokens.length == 3 || tokens.length == 4: "Token length should be 3 or 4";
+
+        if(tokens.length == 3) {
+            String name = tokens[0].trim();
+            LocalDateTime from = LocalDateTime.parse(tokens[1].trim());
+            LocalDateTime to = LocalDateTime.parse(tokens[2].trim());
+
+            logger.log(Level.INFO, "loaded event");
+
+            return new Event(name, from, to);
+        }
+        String name = tokens[0].trim();
+        LocalDateTime by = LocalDateTime.parse(tokens[1].trim());
+        int goal = Integer.parseInt(tokens[2].trim());
+        int completed = Integer.parseInt(tokens[3].trim());
+
+        logger.log(Level.INFO, "loaded event");
+
+        return new Goal(name, by, goal, completed);
+    }
+}

src/main/java/seedu/duke/flashcard/FlashcardStorage.java renamed to src/main/java/seedu/duke/storage/FlashcardStorage.java

@@ -1,4 +1,8 @@
-package seedu.duke.flashcard;
+package seedu.duke.storage;
+
+import seedu.duke.flashcard.Flashcard;
+import seedu.duke.flashcard.FlashcardList;
+import seedu.duke.storage.exceptions.FlashcardFileFormatException;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -9,6 +13,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static seedu.duke.storage.FlashcardStorageParser.flashcardFileChecker;
+
 /**
  * storage for flashcards
  * One storage manages one file
@@ -47,11 +53,19 @@ public FlashcardList loadFlashcards() throws FileNotFoundException{
         File f = new File (this.path);
         Scanner s = new Scanner(f);
 
-        while(s.hasNext()){
-            String[] flashTokens = s.nextLine().split(" \\| ");
-            flashcardList.add(FlashcardStorageParser.loadFlashcard(flashTokens));
-            flashlogger.log(Level.INFO, "added flashcard");
+        try{
+            while(s.hasNext()){
+                String[] flashTokens = s.nextLine().split(" \\| ");
+                flashcardFileChecker(flashTokens);
+                flashcardList.add(FlashcardStorageParser.loadFlashcard(flashTokens));
+                flashlogger.log(Level.INFO, "added flashcard");
 
+            }
+        } catch (FlashcardFileFormatException e) {
+            System.out.println("The flashcard save file is corrupted");
+            System.out.println("Automatically making new file");
+            flashcardList = new FlashcardList(new ArrayList<>());
+            saveFlashcards(flashcardList.getFlashcards());
         }
 
         flashlogger.log(Level.INFO, String.format(

src/main/java/seedu/duke/flashcard/FlashcardStorageParser.java renamed to src/main/java/seedu/duke/storage/FlashcardStorageParser.java

@@ -1,6 +1,8 @@
-package seedu.duke.flashcard;
+package seedu.duke.storage;
+
+import seedu.duke.flashcard.Flashcard;
+import seedu.duke.storage.exceptions.FlashcardFileFormatException;
 
-import java.time.LocalDateTime;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -12,6 +14,24 @@ public final class FlashcardStorageParser {
 
     private static Logger flashlogger; // for logging
 
+    /**
+     * check the saved file format
+     * token length should be 4
+     * type should be integer, string, string, integer
+     * @param tokens
+     * @throws FlashcardFileFormatException
+     */
+    public static void flashcardFileChecker(String[] tokens) throws FlashcardFileFormatException {
+        if(tokens.length != 4) throw new FlashcardFileFormatException();
+
+        try {
+            Integer.parseInt(tokens[0].trim());
+            Integer.parseInt(tokens[3].trim());
+        } catch (NumberFormatException e) {
+            throw new FlashcardFileFormatException();
+        }
+    }
+
     /**
      * load a flash card from certain format
      * Tokens includes attributes of Flashcard

src/main/java/seedu/duke/storage/exceptions/EventFileFormatException.java

@@ -0,0 +1,4 @@
+package seedu.duke.storage.exceptions;
+
+public class EventFileFormatException extends Exception{
+}