临时保存优化

Hansanshi · Dec 31, 2020 · e30469e · e30469e
1 parent 864c6aa
commit e30469e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/src/main/java/ink/markidea/note/controller/NoteController.java b/src/main/java/ink/markidea/note/controller/NoteController.java
@@ -142,7 +142,12 @@ public ServerResponse delNotebook(@PathVariable String notebookName){
      */
     @DeleteMapping("/{notebookName}/{noteTitle}")
     public ServerResponse delNote(@PathVariable String notebookName,
-                                  @PathVariable String noteTitle){
+                                  @PathVariable String noteTitle,
+                                  Boolean delDraft){
+        if (Boolean.TRUE.equals(delDraft)) {
+            noteService.delTmpSavedNote(noteTitle, notebookName);
+            return ServerResponse.buildSuccessResponse();
+        }
         return noteService.deleteNote(notebookName, noteTitle);
     }
 

diff --git a/src/main/java/ink/markidea/note/service/INoteService.java b/src/main/java/ink/markidea/note/service/INoteService.java
@@ -42,6 +42,8 @@ public interface INoteService {
      */
     void tmpSaveNote(String noteTitle, String notebookName, String content);
 
+    void delTmpSavedNote(String noteTitle, String notebookName);
+
     /**
      * delete note
      */

diff --git a/src/main/java/ink/markidea/note/service/impl/NoteServiceImpl.java b/src/main/java/ink/markidea/note/service/impl/NoteServiceImpl.java
@@ -235,6 +235,11 @@ public void tmpSaveNote(String noteTitle, String notebookName, String content) {
         invalidateCache(buildUserNoteKey(notebookName, noteTitle));
     }
 
+    @Override
+    public void delTmpSavedNote(String noteTitle, String notebookName) {
+        GitUtil.discardChange(getOrCreateUserGit(), getRelativeFileName(notebookName, noteTitle));
+    }
+
     @Override
     public ServerResponse deleteNote(String notebookName, String noteTitle){
         String relativeFileName = getRelativeFileName(notebookName,noteTitle);

diff --git a/src/main/java/ink/markidea/note/util/GitUtil.java b/src/main/java/ink/markidea/note/util/GitUtil.java
@@ -434,4 +434,13 @@ public static Set<String> getModifiedButUnCommitted(Git git, String dirPath) {
             throw new RuntimeException("git status error");
         }
     }
+
+    public static void discardChange(Git git, String path){
+        try {
+            git.checkout().addPath(path).call();
+        } catch (GitAPIException e) {
+            e.printStackTrace();
+        }
+    }
+
 }