Merge pull request #79 from junhyeong0411/master

Changed Storage to add difficulty and remove review

Author: junhyeong0411

data/flashcards/flashcard 1124.txt

@@ -0,0 +1 @@
+3 | Hello | Duke | - | - | -

data/flashcards/flashcard.txt

@@ -1 +1,2 @@
-3 | Hello | Duke | - | - | -
+3 | cs2113 | software enginnering | 5 
+5 | Hello | Duke | 5 

docs/Diagrams/FlashcardStorage.puml

@@ -1,5 +1,11 @@
 @startuml
-activate FlashcardStorage
+
+autoactivate on
+participant FlashcardComponent as fc
+participant FlashcardStorage as fs
+participant FlashcardDirectory as fd
+
+fc -> fs :
 
 
 @enduml

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

@@ -51,6 +51,10 @@ public void setId (int id) {
         this.id = id;
     }
 
+    public void setDifficulty(int difficulty) {
+        this.difficulty = difficulty;
+    }
+
 
     //@@author wendelinwemhoener
     public String toString() {

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

@@ -50,6 +50,8 @@ public FlashcardList loadFlashcards() throws FileNotFoundException{
         while(s.hasNext()){
             String[] flashTokens = s.nextLine().split(" \\| ");
             flashcardList.add(FlashcardStorageParser.loadFlashcard(flashTokens));
+            flashlogger.log(Level.INFO, "added flashcard");
+
         }
 
         flashlogger.log(Level.INFO, String.format(
@@ -78,12 +80,10 @@ public boolean saveFlashcards(ArrayList<Flashcard> flashcardList) {
                 int id = flashcard.getId();
                 String frontText = flashcard.getFrontText();
                 String backText = flashcard.getBackText();
-                ArrayList<FlashcardReview> reviewList = flashcard.getReviews();
-
-                String reviews = FlashcardStorageParser.reviewtoString(reviewList);
+                int difficulty = flashcard.getDifficulty();
 
-                fw.write(String.format("%d | %s | %s | - | %s | -\r\n",
-                        id, frontText, backText, reviews));
+                fw.write(String.format("%d | %s | %s | %d \r\n",
+                        id, frontText, backText, difficulty));
             }
             fw.close();
             return true;

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

@@ -1,14 +1,17 @@
 package seedu.duke.flashcard;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * FlashcardStorageParser class
  * Utility class for parsing
  */
 public final class FlashcardStorageParser {
 
+    private static Logger flashlogger; // for logging
+
     /**
      * load a flash card from certain format
      * Tokens includes attributes of Flashcard
@@ -17,82 +20,26 @@ public final class FlashcardStorageParser {
      */
     public static Flashcard loadFlashcard(String[] tokens){
 
-        assert tokens.length == 6 : "Token length should be 5";
+        flashlogger = Logger.getLogger("flash");
+        flashlogger.setLevel(Level.WARNING);
+
+        assert tokens.length == 4 : "Token length should be 4";
 
-        // flashlogger.log(Level.INFO, "token length is", tokens.length);
-        // System.out.println(tokens[0]);
+        flashlogger.log(Level.INFO, "token length is", tokens.length);
 
         int id = Integer.parseInt(tokens[0].trim());
         String frontText = tokens[1].trim();
         String backText = tokens[2].trim();
-        String[] tags = tokens[3].trim().split("/");
-        String[] reviews = tokens[4].trim().split("/");
-        String nextReviewOn = tokens[5].trim();
+        int difficulty = Integer.parseInt(tokens[3].trim());
 
 
         Flashcard flashcard = new Flashcard(frontText, backText);
 
         flashcard.setId(id);
+        flashcard.setDifficulty(difficulty);
 
-        //flashlogger.log(Level.INFO, "added flashcard");
-
-        for(String tag:tags){
-            if (tag.trim().equals("-")) {
-                break;
-            } else{
-                System.out.println("tags are not for v1");
-            }
-        }
-
-        for(String review: reviews){
-            if (review.trim().equals("-")) {
-                break;
-            } else{
-                String[] reviewTokens = review.split("#");
-                LocalDateTime reviewDate = LocalDateTime.parse(reviewTokens[0].trim());
-                ReviewDifficulty reviewDifficulty = ReviewDifficulty.valueOf(reviewTokens[1].trim());
-
-                FlashcardReview flashcardReview = new FlashcardReview(reviewDate, reviewDifficulty);
-                flashcard.addReview(flashcardReview);
-
-                flashcard.setLastReviewOn(reviewDate);
-
-            }
-        }
-
-        if(!nextReviewOn.equals("-")){
-            //LocalDateTime.parse(nextReviewOn);
-            System.out.println("reviews are not for v1");
-        }
+        flashlogger.log(Level.INFO, "loaded flashcard");
 
         return flashcard;
     }
-
-    /**
-     * reviews to String methods
-     * make String from reviews list
-     * @param reviewList
-     * @return String of review
-     */
-    public static String reviewtoString(ArrayList<FlashcardReview> reviewList){
-        StringBuilder reviews;
-
-        if(reviewList.isEmpty()){
-            reviews = new StringBuilder("-");
-        } else{
-            reviews = new StringBuilder();
-            for(FlashcardReview review: reviewList){
-                if(reviews.length() > 0){
-                    reviews.append("/");
-                }
-                reviews.append(review.getReviewDate().toString());
-                // identifier between date and difficulty is #
-                reviews.append(" # ");
-                reviews.append(review.getReviewDifficulty());
-
-            }
-        }
-
-        return reviews.toString();
-    }
 }