Finish refactor

4 files changed, 42 insertions, 36 deletions

diff --git a/main.py b/main.py
index 67e7a35..816c721 100644
--- a/main.py
+++ b/main.py
@@ -1,9 +1,7 @@
-from .note_tools.commands import (
-  NewNoteCommand,
-  NewNoteForTomorrowCommand
-)
+from .note_tools.today import NewNoteCommand
+from .note_tools.tomorrow import NewNoteForTomorrowCommand
 
-__all__= [
-  "NewNoteCommand",
-  "NewNoteForTomorrowCommand"
-]
+__all__ = [
+  'NewNoteCommand',
+  'NewNoteForTomorrowCommand'
+]
\ No newline at end of file
diff --git a/note_tools/__init__.py b/note_tools/__init__.py
index 69e6e67..8d6774d 100644
--- a/note_tools/__init__.py
+++ b/note_tools/__init__.py
@@ -1,7 +1,6 @@
 from datetime import datetime
 import os
-from typing import List, Optional, Tuple
-
+from typing import Optional, Tuple
 
 class NoteBaseCommand(object):    
   date = None
@@ -16,7 +15,7 @@ class NoteBaseCommand(object):
     return datetime.now()
 
   def get_date_parts(self) -> Tuple[str]:
-    return (self.date.strftime('%Y'), self.date.strftime('%m'), self.date.strftime('%d'))
+    return (self.date.strftime('%Y'), self.date.strftime('%m'))
       
   def write_file_heading(self, file_path):      
     date_yyyymmdd = self.date.strftime('%Y-%m-%d') 
diff --git a/note_tools/commands.py b/note_tools/today.py
index 97778ba..20f2e53 100644
--- a/note_tools/commands.py
+++ b/note_tools/today.py
@@ -1,29 +1,9 @@
 from . import NoteBaseCommand
-import sublime_plugin
-import datetime
 import os
-from typing import List, Optional, Tuple
-
-class NewNoteForTomorrowCommand(NoteBaseCommand, sublime_plugin.WindowCommand):
-    def run(self):
-      self.date = self.get_date() + timedelta(days=1)
-
-      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.")
+import sublime
+import sublime_plugin
+from pathlib import Path 
+from typing import List, Optional
 
 class NewNoteCommand(NoteBaseCommand, sublime_plugin.WindowCommand):
     def run(self):
@@ -32,10 +12,12 @@ class NewNoteCommand(NoteBaseCommand, sublime_plugin.WindowCommand):
         notes_path = self.get_notes_path(self.window.project_data())
 
         if notes_path:
-            year, month, day = self.get_date_parts()
+            year, month = self.get_date_parts()
             directory = os.path.join(notes_path, year, month)
+            print("directory: ", directory)
             os.makedirs(directory, exist_ok=True)
             file_path = os.path.join(directory, self.file_name())
+            print('path: ', file_path)
 
             # Check if file already exists
             if os.path.exists(file_path):
diff --git a/note_tools/tomorrow.py b/note_tools/tomorrow.py
new file mode 100644
index 0000000..2198a3b
--- /dev/null
+++ b/note_tools/tomorrow.py
@@ -0,0 +1,27 @@
+from . import NoteBaseCommand
+import os
+from datetime import timedelta
+import sublime
+import sublime_plugin
+
+class NewNoteForTomorrowCommand(NoteBaseCommand, sublime_plugin.WindowCommand):
+    def run(self):
+      self.date = self.get_date() + timedelta(days=1)
+
+      notes_path = self.get_notes_path(self.window.project_data())
+
+      if notes_path:
+        year, month = 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.")
+