1 files changed, 33 insertions, 35 deletions

diff --git a/note_tools/commands.py b/note_tools/commands.py
index 610d9be..97778ba 100644
--- a/note_tools/commands.py
+++ b/note_tools/commands.py
@@ -1,46 +1,49 @@
-import sublime
+from . import NoteBaseCommand
 import sublime_plugin
 import datetime
 import os
-import sys
-from pathlib import Path
 from typing import List, Optional, Tuple
 
-class NewNoteCommand(sublime_plugin.WindowCommand):
+class NewNoteForTomorrowCommand(NoteBaseCommand, sublime_plugin.WindowCommand):
     def run(self):
-        # Get the current date formatted as YYYYMMDD and YYYY-MM-DD
-        date_str_yyyymmdd = datetime.datetime.now().strftime("%Y%m%d")
-        date_str_display = datetime.datetime.now().strftime("%Y-%m-%d")
-        file_name = f"{date_str_yyyymmdd}.md"
-        
-        # Create the underline based on the length of date_str_display
-        underline = '=' * len(date_str_display)
-        
-        # Get the project directory and look for a "Notes" or "notes" folder
-        project_data = self.window.project_data()
-        notes_path = None
+      self.date = self.get_date() + timedelta(days=1)
 
-        if project_data and 'folders' in project_data:
-            for folder in project_data['folders']:
-                folder_path = folder['path']
-                if os.path.basename(folder_path).lower() == "notes":
-                    notes_path = folder_path
-                    break
+      notes_path = self.get_notes_path(self.window.project_data())
+
+      if notes_path:
+          year, month, day = self.get_date_parts()
+          directory = os.path.join(notes_path, year, month)
+          os.makedirs(directory, exist_ok=True)
+          file_path = os.path.join(directory, self.file_name())
+
+          # Check if file already exists
+          if os.path.exists(file_path):
+            sublime.message_dialog(f"The file '{self.file_name()}' already exists.")
+        else:
+            self.write_file_heading(file_path)
+
+      else:
+          sublime.message_dialog("No 'Notes' directory found in the project. Please add a 'Notes' folder.")
+
+class NewNoteCommand(NoteBaseCommand, sublime_plugin.WindowCommand):
+    def run(self):
+        # Get the current date formatted as YYYYMMDD and YYYY-MM-DD
+        self.date = self.get_date()                
+        notes_path = self.get_notes_path(self.window.project_data())
 
         if notes_path:
-            year, month, day = date_str_display.split('-')
-            file_path = os.path.join(notes_path, year, month, file_name)
+            year, month, day = self.get_date_parts()
+            directory = os.path.join(notes_path, year, month)
+            os.makedirs(directory, exist_ok=True)
+            file_path = os.path.join(directory, self.file_name())
 
             # Check if file already exists
             if os.path.exists(file_path):
-                sublime.message_dialog(f"The file '{file_name}' already exists.")
+              sublime.message_dialog(f"The file '{self.file_name()}' already exists.")
             else:
-                # Create the new file and write the date string with a line underneath
-                with open(file_path, 'w') as file:
-                    file.write(f"{date_str_display}\n{underline}\n\n\n")
-                # Open the file and set the cursor position
-                new_view = self.window.open_file(file_path)
-                self.set_cursor_position(new_view)
+              self.write_file_heading(file_path)
+              new_view = self.window.open_file(file_path)
+              self.set_cursor_position(new_view)
 
         else:
             sublime.message_dialog("No 'Notes' directory found in the project. Please add a 'Notes' folder.")
@@ -62,8 +65,3 @@ class NewNoteCommand(sublime_plugin.WindowCommand):
         if ignore_extensions is None:
             ignore_extensions = []
         return [file for file in Path(directory).glob("*") if file.is_file() and file.suffix not in ignore_extensions]
-
-    def parse_file_date (self, file_name: str) -> Tuple[str, str]:
-        year = file_name[:4]
-        month = file_name[4:6]
-        return year, month