Branch level 9

.gitignore

@@ -15,3 +15,4 @@ bin/
 
 /text-ui-test/ACTUAL.txt
 text-ui-test/EXPECTED-UNIX.TXT
+*.json

README.md

@@ -1,4 +1,4 @@
-# Duke project template
+# duke.core.Duke project template
 
 This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.
 
@@ -15,7 +15,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version.
    1. Click `Open or Import`.
    1. Select the project directory, and click `OK`
    1. If there are any further prompts, accept the defaults.
-1. After the importing is complete, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()`. If the setup is correct, you should see something like the below:
+1. After the importing is complete, locate the `src/main/java/duke.core.Duke.java` file, right-click it, and choose `Run duke.core.Duke.main()`. If the setup is correct, you should see something like the below:
    ```
    Hello from
     ____        _        

data/storage.json

@@ -0,0 +1,8 @@
+[
+  {
+    "at": "sss",
+    "type": "Events",
+    "taskName": "aa",
+    "isDone": false
+  }
+]

src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: duke.core.Duke
+

src/main/java/duke/Parser/DateParser.java

@@ -0,0 +1,46 @@
+package duke.Parser;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class DateParser {
+
+    private static final List<DateTimeFormatter> dtformaters = Arrays.asList(
+            DateTimeFormatter.ofPattern("yyyyMMdd HH:mm"),
+            DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"),
+            DateTimeFormatter.ofPattern("yyyy MM dd HH:mm"),
+            DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm"),
+            DateTimeFormatter.ofPattern("yyyyMMdd HHmm"),
+            DateTimeFormatter.ofPattern("yyyy-MM-dd HHmm"),
+            DateTimeFormatter.ofPattern("yyyy MM dd HHmm"),
+            DateTimeFormatter.ofPattern("yyyy/MM/dd HHmm"));
+
+    private static final List<DateTimeFormatter> dformaters = Arrays.asList(
+            DateTimeFormatter.ofPattern("yyyyMMdd"),
+            DateTimeFormatter.ofPattern("yyyy/MM/dd"),
+            DateTimeFormatter.ofPattern("yyyy-MM-dd"),
+            DateTimeFormatter.ofPattern("yyyy MM dd"));
+
+    public static LocalDateTime parseDate(String command) throws DateTimeParseException {
+        for(DateTimeFormatter dtf : dtformaters) {
+            try {
+                return LocalDateTime.parse(command, dtf);
+            } catch (DateTimeParseException e) {
+            }
+        }
+
+        for(DateTimeFormatter dtf : dformaters) {
+            try {
+                return LocalDate.parse(command, dtf).atStartOfDay();
+            } catch (DateTimeParseException e) {
+            }
+        }
+
+        return null;
+    }
+}

src/main/java/duke/commands/AddDeadline.java

@@ -0,0 +1,12 @@
+package duke.commands;
+
+import duke.storage.Database;
+
+public class AddDeadline extends Command {
+    @Override
+    public int execute() {
+        Database.addDeadline(args);
+        clearArgs();
+        return 0;
+    }
+}

src/main/java/duke/commands/AddEvent.java

@@ -0,0 +1,12 @@
+package duke.commands;
+
+import duke.storage.Database;
+
+public class AddEvent extends Command {
+    @Override
+    public int execute() {
+        Database.addEvent(args);
+        clearArgs();
+        return 0;
+    }
+}

src/main/java/duke/commands/AddTodo.java

@@ -0,0 +1,12 @@
+package duke.commands;
+
+import duke.storage.Database;
+
+public class AddTodo extends Command {
+    @Override
+    public int execute() {
+        Database.addToDo(args);
+        clearArgs();
+        return 0;
+    }
+}

src/main/java/duke/commands/Command.java

@@ -0,0 +1,13 @@
+package duke.commands;
+
+abstract public class Command {
+    public String args;
+
+    public int execute() {
+        return 0;
+    }
+
+    public void clearArgs() {
+        args = null;
+    }
+}

src/main/java/duke/commands/Delete.java

@@ -0,0 +1,13 @@
+package duke.commands;
+
+import duke.storage.Database;
+
+public class Delete extends Command{
+
+    @Override
+    public int execute() {
+        Database.delete(args);
+        clearArgs();
+        return 0;
+    }
+}

src/main/java/duke/commands/DoneBy.java

@@ -0,0 +1,13 @@
+package duke.commands;
+
+import duke.storage.Database;
+
+public class DoneBy extends Command{
+
+    @Override
+    public int execute() {
+        Database.doneBy(args);
+        clearArgs();
+        return 0;
+    }
+}

src/main/java/duke/commands/Find.java

@@ -0,0 +1,13 @@
+package duke.commands;
+
+import duke.storage.Database;
+
+public class Find extends Command{
+
+    @Override
+    public int execute() {
+        Database.find(args);
+        clearArgs();
+        return 0;
+    }
+}

src/main/java/duke/commands/ListAll.java

@@ -0,0 +1,13 @@
+package duke.commands;
+
+
+import duke.storage.Database;
+
+public class ListAll extends Command {
+    @Override
+    public int execute() {
+        Database.listAll();
+        clearArgs();
+        return 0;
+    }
+}

src/main/java/duke/commands/MarkDone.java

@@ -0,0 +1,18 @@
+package duke.commands;
+
+import duke.storage.Database;
+
+public class MarkDone extends Command {
+    @Override
+    public int execute() {
+        try {
+            Database.markDone(args);
+            clearArgs();
+        }  catch (NumberFormatException e) {
+            System.out.println("The index given is not a number.");
+        } catch (IndexOutOfBoundsException e) {
+            System.out.println("The index is out of range. You don't have a task at that number.");
+        }
+        return 0;
+    }
+}

src/main/java/duke/commands/PrintBye.java

@@ -0,0 +1,14 @@
+package duke.commands;
+
+import duke.storage.Database;
+
+public class PrintBye extends Command {
+    @Override
+    public int execute() {
+
+        Database.handleBye();
+
+        clearArgs();
+        return -1;
+    }
+}

src/main/java/duke/core/CommandLib.java

@@ -0,0 +1,62 @@
+package duke.core;
+
+import duke.commands.*;
+import duke.exceptions.NullArgumentException;
+
+import java.util.HashMap;
+
+public class CommandLib {
+    private final HashMap<String, Command> commandMap = new HashMap<>();
+
+    public CommandLib() {
+        // Initialise the map with all possible duke.commands
+        MarkDone markDone = new MarkDone();
+        this.register(Constants.DONE_CMD, markDone);
+        AddTodo addTodo = new AddTodo();
+        this.register(Constants.TODO_CMD, addTodo);
+        AddDeadline addDeadline = new AddDeadline();
+        this.register(Constants.DEADLINE_CMD, addDeadline);
+        AddEvent addEvent = new AddEvent();
+        this.register(Constants.EVENT_CMD, addEvent);
+        ListAll listAll = new ListAll();
+        this.register(Constants.LIST_CMD, listAll);
+        PrintBye printBye = new PrintBye();
+        this.register(Constants.BYE_CMD, printBye);
+        Delete delete = new Delete();
+        this.register(Constants.DELETE_CMD, delete);
+        Find find = new Find();
+        this.register(Constants.FIND_CMD , find);
+        DoneBy doneBy = new DoneBy();
+        this.register(Constants.DONEBY_CMD , doneBy);
+    }
+
+    public void register(String commandName, Command command) {
+        commandMap.put(commandName, command);
+    }
+
+    public int execute(String cmd) {
+
+        String[] args = cmd.split(" ", 2);
+        Command command = commandMap.get(args[0]);
+
+        try {
+            command.args = args[1];
+        } catch (NullPointerException e) {
+            System.out.println("Oops, the command is not recognised!");
+            return 0;
+        } catch (ArrayIndexOutOfBoundsException e) {}
+
+        int result = 0;
+        try {
+            result = command.execute();
+        } catch (NullArgumentException e) {
+            System.out.println(e.getMessage());
+        } catch (NullPointerException e) {
+            System.out.println("Oops, the command is not recognised!");
+        }
+
+        return result;
+    }
+}
+
+

src/main/java/duke/core/Constants.java

@@ -0,0 +1,30 @@
+package duke.core;
+
+public class Constants {
+    public static final String DONE_CMD = "done";
+    public static final String TODO_CMD = "todo";
+    public static final String DEADLINE_CMD = "deadline";
+    public static final String EVENT_CMD = "event";
+    public static final String LIST_CMD = "list";
+    public static final String BYE_CMD = "bye";
+    public static final String DELETE_CMD = "delete";
+    public static final String FIND_CMD = "find";
+    public static final String DONEBY_CMD = "doneby";
+
+    public static final String BY_PARSER = " /by ";
+    public static final String AT_PARSER = " /at ";
+
+    public static final String SEPLINE = "------------------------------------------";
+    public static final String TICK = "\u2713";
+    public static final String CROSS = "\u2718";
+    public static final String FILEPATH = "data/storage.json";
+
+    public static final String LOGO = " ____        _        \n"
+            + "|  _ \\ _   _| | _____ \n"
+            + "| | | | | | | |/ / _ \\\n"
+            + "| |_| | |_| |   <  __/\n"
+            + "|____/ \\__,_|_|\\_\\___|\n";
+
+    public static final int DESCRIPTION = 0;
+    public static final int TIME = 1;
+}