1 files changed, 12 insertions, 48 deletions

diff --git a/note_tools/commands.py b/note_tools/commands.py
index 755bd5d..610d9be 100644
--- a/note_tools/commands.py
+++ b/note_tools/commands.py
@@ -6,52 +6,6 @@ import sys
 from pathlib import Path
 from typing import List, Optional, Tuple
 
-
-class OrganizeNotesCommand(sublime_plugin.WindowCommand):
-    def run(self):
-
-        now = datetime.datetime.now()
-
-        project_data = self.window.project_data()
-
-        notes_path = None
-
-        active_sheet = self.window.active_sheet()
-
-        # Close the active note right away
-        active_sheet.close()
-
-        if project_data and "folders" in project_data:
-            for folder in project_data['folders']:
-                folder_path = folder['path']
-                print(folder_path)
-                if os.path.basename(folder_path).lower() == "notes":
-                    notes_path = folder_path
-                    break
-
-        if notes_path is not None:
-            notes = self.list_files(notes_path, ['.sublime-project', '.sublime-workspace'])
-            for note in notes:
-                year, month = self.parse_file_date(note.name)
-                dirs = os.path.join(notes_path, year, month)
-                os.makedirs(dirs, exist_ok=True)
-                new_note = os.path.join(notes_path, year, month, note.name)
-                os.rename(note.resolve(), new_note)                
-                new_view = self.window.open_file(new_note)
-        else:
-            sublime.message_dialog("No 'Notes' directory found in the project. Please add a 'Notes' folder.")
-            
-    def list_files(self, directory: str, ignore_extensions: Optional[List[str]] = None) -> List[Path]:
-        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
-
-
 class NewNoteCommand(sublime_plugin.WindowCommand):
     def run(self):
         # Get the current date formatted as YYYYMMDD and YYYY-MM-DD
@@ -74,7 +28,8 @@ class NewNoteCommand(sublime_plugin.WindowCommand):
                     break
 
         if notes_path:
-            file_path = os.path.join(notes_path, file_name)
+            year, month, day = date_str_display.split('-')
+            file_path = os.path.join(notes_path, year, month, file_name)
 
             # Check if file already exists
             if os.path.exists(file_path):
@@ -83,7 +38,6 @@ class NewNoteCommand(sublime_plugin.WindowCommand):
                 # 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)
@@ -103,3 +57,13 @@ class NewNoteCommand(sublime_plugin.WindowCommand):
             sublime.set_timeout_async(lambda: self.set_cursor_position(view), 100)
         else:
             on_load()
+
+    def list_files(self, directory: str, ignore_extensions: Optional[List[str]] = None) -> List[Path]:
+        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