Merge pull request #65 from RedAtman/dev

Dev

commands.py

@@ -7,10 +7,9 @@
 import sublime_plugin
 
 from ._config import CONFIG
-from .lib.core import GlobalStorage, sync_once
-from .lib.gui import close_view, on_note_changed, open_view, show_message, show_quick_panel
+from .lib.core import GlobalStorage, close_view, on_note_changed, open_view, show_message, show_quick_panel
 from .lib.models import Note
-from .lib.operations import NoteCreator, NoteDeleter, NotesIndicator, NoteUpdater, OperationManager
+from .lib.operations import NoteCreator, NoteDeleter, NotesIndicator, NoteUpdater, Operator
 
 
 __all__ = [
@@ -24,7 +23,7 @@
 
 logger = logging.getLogger()
 
-
+operator = Operator()
 global_storage = GlobalStorage()
 
 
@@ -58,7 +57,7 @@ def on_close(self, view: sublime.View):
     def on_modified(self, view: sublime.View):
 
         def flush_saves():
-            if OperationManager().running:
+            if operator.running:
                 sublime.set_timeout(flush_saves, self.autosave_debounce_time)
                 return
             if not isinstance(note, Note):
@@ -117,7 +116,7 @@ def on_post_save(self, view: sublime.View):
         note.content = view_content
         note_updater = NoteUpdater(note=note)
         note_updater.set_callback(on_note_changed)
-        OperationManager().add_operation(note_updater)
+        operator.add_operation(note_updater)
 
 
 class SimplenoteListCommand(sublime_plugin.ApplicationCommand):
@@ -126,7 +125,7 @@ def run(self):
         if Note.tree.count:
             show_quick_panel()
         if not global_storage.get(CONFIG.SIMPLENOTE_STARTED_KEY):
-            sync_once()
+            sublime.run_command("simplenote_sync")
 
 
 class SimplenoteSyncCommand(sublime_plugin.ApplicationCommand):
@@ -146,11 +145,13 @@ def callback(self, updated_notes: List[Note]):
             )
         first_sync = sync_times == 0
         if first_sync:
-            show_quick_panel(first_sync)
+            show_quick_panel(True)
         global_storage.optimistic_update(CONFIG.SIMPLENOTE_SYNC_TIMES_KEY, sync_times + 1)
         global_storage.optimistic_update(CONFIG.SIMPLENOTE_STARTED_KEY, False)
 
     def run(self):
+        if operator.running:
+            return
         if global_storage.get(CONFIG.SIMPLENOTE_STARTED_KEY):
             return
         global_storage.optimistic_update(CONFIG.SIMPLENOTE_STARTED_KEY, True)
@@ -162,7 +163,7 @@ def run(self):
             return
         note_indicator = NotesIndicator(sync_note_number=sync_note_number)
         note_indicator.set_callback(self.callback)
-        OperationManager().add_operation(note_indicator)
+        operator.add_operation(note_indicator)
 
 
 class SimplenoteCreateCommand(sublime_plugin.ApplicationCommand):
@@ -173,7 +174,7 @@ def handle_new_note(self, note: Note):
     def run(self):
         note_creator = NoteCreator()
         note_creator.set_callback(self.handle_new_note)
-        OperationManager().add_operation(note_creator)
+        operator.add_operation(note_creator)
 
 
 class SimplenoteDeleteCommand(sublime_plugin.ApplicationCommand):
@@ -194,4 +195,4 @@ def run(self):
             return
         note_deleter = NoteDeleter(note=note)
         note_deleter.set_callback(self.handle_deletion, {"view": view})
-        OperationManager().add_operation(note_deleter)
+        operator.add_operation(note_deleter)

lib/core.py

@@ -1,46 +1,53 @@
+from functools import partial
 import logging
+import os
+from threading import Thread
+from typing import List, Optional
 
 import sublime
 
 from .._config import CONFIG
 from ..utils.lock.thread import OptimisticLockingDict
 from ..utils.patterns.singleton.base import Singleton
-from .gui import edit_settings, remove_status, show_message
-from .operations import OperationManager
+from .models import Note
 
 
 logger = logging.getLogger()
 
+__all__ = [
+    "GlobalStorage",
+    "sync",
+    "start",
+    "edit_settings",
+    "show_message",
+    "remove_status",
+    "get_view_window",
+    "open_view",
+    "close_view",
+    "on_note_changed",
+    "clear_orphaned_filepaths",
+    "QuickPanelPlaceholder",
+    "show_quick_panel",
+]
+
 
 class GlobalStorage(Singleton, OptimisticLockingDict):
     __mapper_key_type = {CONFIG.SIMPLENOTE_SYNC_TIMES_KEY: int, CONFIG.SIMPLENOTE_STARTED_KEY: bool}
 
     def optimistic_update(self, key, new_value):
+        """Validate the type of the value before it is stored"""
         _type = self.__mapper_key_type.get(key)
         if not _type is None:
             if not isinstance(new_value, _type):
                 raise TypeError("Value of %s must be type %s, got %s" % (key, _type, type(new_value)))
-
-        if key == CONFIG.SIMPLENOTE_SYNC_TIMES_KEY:
-            import time
-
-            logger.warning((time.time(), key, new_value))
         return super().optimistic_update(key, new_value)
 
 
-manager = OperationManager()
 global_storage = GlobalStorage()
 
 
-def sync_once():
-    if not manager.running:
-        sublime.run_command("simplenote_sync")
-    else:
-        logger.debug("Sync omitted")
-
-
 def sync(sync_interval: int = 30):
-    sync_once()
+    sublime.run_command("simplenote_sync")
     sublime.set_timeout(sync, sync_interval * 1000)
 
 
@@ -63,3 +70,155 @@ def start():
     show_message("Simplenote: Please configure username/password in settings file.")
     edit_settings()
     sublime.set_timeout(remove_status, 2000)
+
+
+def edit_settings():
+    settings_file = CONFIG.SIMPLENOTE_SETTINGS_USER_FILE_PATH
+    sublime.run_command(
+        "edit_settings",
+        {
+            "base_file": settings_file,
+            # "default": "// Simplenote Settings - User\n{\n\t$0\n}\n",
+        },
+    )
+
+
+def _show_message(message: str = ""):
+    if not isinstance(message, str):
+        try:
+            message = str(message)
+        except Exception:
+            message = ""
+    for window in sublime.windows():
+        for currentView in window.views():
+            currentView.set_status("Simplenote", message)
+
+
+def show_message(message: str):
+    _show_message(message)
+    sublime.message_dialog(message)
+
+
+def remove_status():
+    _show_message()
+
+
+def get_view_window(view: Optional[sublime.View] = None) -> sublime.Window:
+    window = None
+    if isinstance(view, sublime.View):
+        window = view.window()
+    if window is None:
+        window = sublime.active_window()
+    return window
+
+
+def open_view(filepath: str, view: Optional[sublime.View] = None):
+    window = get_view_window(view)
+    return window.open_file(filepath)
+
+
+def close_view(view: sublime.View):
+    view.set_scratch(True)
+    window = get_view_window(view)
+    window.focus_view(view)
+    window.run_command("close_file")
+
+
+def on_note_changed(note: Note):
+    old_window = sublime.active_window()
+    old_view = old_window.find_open_file(note._filepath)
+    # if note is not open in the current window
+    if not isinstance(old_view, sublime.View):
+        note.flush()
+        return
+
+    if note._filepath == note.filepath:
+        note.flush()
+        note.open()
+        return
+
+    note._close(note._filepath)
+    note.flush()
+    close_view(old_view)
+    note.open()
+    new_view = open_view(note.filepath, old_view)
+
+    # TODO: maybe not needed, or needed to be tested
+    old_active_view = old_window.active_view()
+    assert isinstance(old_active_view, sublime.View), "old_active_view is not a sublime.View"
+    if isinstance(old_active_view, sublime.View):
+        # old_window.focus_view(old_active_view)
+        if old_view.id() == old_active_view.id():
+            old_note_window = [window for window in sublime.windows() if window.id() == old_window.id()]
+            if old_note_window:
+                old_note_window[0].focus_view(new_view)
+        else:
+            old_window.focus_view(old_active_view)
+
+    sublime.set_timeout(partial(new_view.run_command, "revert"), 0)
+
+
+def on_select(list__modificationDate: List[float], selected_index: int):
+    if selected_index == -1:
+        return
+    note_id = list__modificationDate[selected_index]
+    selected_note = Note.tree.find(note_id)
+    if not isinstance(selected_note, Note):
+        show_message("Note not found: note id(%s), Please restart simplenote or sublime text." % note_id)
+        return
+    filepath = selected_note.open()
+    selected_note.flush()
+    view = open_view(filepath)
+
+
+def clear_orphaned_filepaths(list__filename: List[str] = []):
+    if not list__filename:
+        list__filename = [note.filename for note in Note.mapper_id_note.values()]
+    for filename in os.listdir(CONFIG.SIMPLENOTE_NOTES_DIR):
+        if filename not in list__filename:
+            os.remove(os.path.join(CONFIG.SIMPLENOTE_NOTES_DIR, filename))
+
+
+from enum import Enum
+
+
+class QuickPanelPlaceholder(str, Enum):
+    DEFAULT = "Select Note press key 'enter' to open"
+    FIRST_SYNC = "Sync complete. Press [super+shift+s] [super+shift+l] to display the note list again."
+
+
+def show_quick_panel(first_sync: bool = False):
+    if Note.tree.count <= 0:
+        show_message(
+            "No notes found. Please wait for the synchronization to complete, or press [super+shift+s, super+shift+c] to create a note."
+        )
+        return
+
+    list__modificationDate: List[float] = []
+    list__title: List[str] = []
+    list__filename: List[str] = []
+    for note in Note.tree.iter(reverse=True):
+        if not isinstance(note, Note):
+            raise Exception("note is not a Note: %s" % type(note))
+        if note.d.deleted:
+            continue
+        list__modificationDate.append(note.d.modificationDate)
+        list__title.append(note.title)
+        list__filename.append(note.filename)
+
+    placeholder = QuickPanelPlaceholder.DEFAULT
+    if first_sync:
+        task = Thread(target=clear_orphaned_filepaths, args=(list__filename,))
+        task.start()
+        placeholder = QuickPanelPlaceholder.FIRST_SYNC
+
+    def show_panel():
+        sublime.active_window().show_quick_panel(
+            list__title,
+            partial(on_select, list__modificationDate),
+            flags=sublime.MONOSPACE_FONT,
+            # on_highlight=self.on_select,
+            placeholder=placeholder,
+        )
+
+    sublime.set_timeout(show_panel, 500)