ttkode 0.3.2a2__tar.gz → 0.5.0a2__tar.gz

{ttkode-0.3.2a2 → ttkode-0.5.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ttkode
-Version: 0.3.2a2
+Version: 0.5.0a2
 Summary: Terminal ToolKit Studio Code editor
 Author-email: Eugenio Parodi <ceccopierangiolieugenio@googlemail.com>
 License: MIT
@@ -19,7 +19,7 @@ Classifier: Topic :: Terminals
 Classifier: Topic :: Software Development :: User Interfaces
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: pyTermTk>=0.42.1-a.0
+Requires-Dist: pyTermTk>=0.46.0-a.0
 Requires-Dist: appdirs
 Requires-Dist: copykitten
 Requires-Dist: pygments

{ttkode-0.3.2a2 → ttkode-0.5.0a2}/pyproject.toml

@@ -24,7 +24,7 @@ classifiers = [
     "Topic :: Software Development :: User Interfaces",
 ]
 dependencies = [
-    'pyTermTk>=0.42.1-a.0',
+    'pyTermTk>=0.46.0-a.0',
     'appdirs',
     'copykitten',
     'pygments'

{ttkode-0.3.2a2 → ttkode-0.5.0a2}/ttkode/__init__.py

@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__version__:str = '0.3.2-a.2'
+__version__:str = '0.5.0-a.2'
 
 from .plugin import TTkodePlugin, TTkodePluginActivity
 from .proxy import TTKodeViewerProxy, ttkodeProxy

{ttkode-0.3.2a2 → ttkode-0.5.0a2}/ttkode/__main__.py

@@ -33,7 +33,6 @@ from TermTk import TTkLog
 
 from ttkode import TTkodeHelper
 from ttkode import ttkodeProxy
-from ttkode.app.ttkode import TTKode
 from ttkode.app.cfg import TTKodeCfg
 
 
@@ -62,10 +61,7 @@ def main():
 
     TTkodeHelper._loadPlugins()
 
-    ttkode = TTKode()
-    ttkodeProxy.setTTKode(ttkode)
-
-    root = TTk( layout=ttkode,
+    root = TTk( layout=ttkodeProxy.ttkode(),
                 title="TTkode",
                 mouseTrack=True,
                 sigmask=(

ttkode-0.5.0a2/ttkode/app/__init__.py

@@ -0,0 +1,27 @@
+
+# MIT License
+#
+# Copyright (c) 2021 Eugenio Parodi <ceccopierangiolieugenio AT googlemail DOT com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+from .cfg import *
+from .state import TTKodeState
+# from .glbl import *
+from .ttkode import TTKode, TTKodeWidget

ttkode-0.3.2a2/ttkode/app/__init__.py → ttkode-0.5.0a2/ttkode/app/state.py

@@ -1,4 +1,3 @@
-
 # MIT License
 #
 # Copyright (c) 2021 Eugenio Parodi <ceccopierangiolieugenio AT googlemail DOT com>
@@ -21,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from .cfg import *
-# from .glbl import *
-from .ttkode import *
+__all__ = ['TTKodeState']
+
+class TTKodeState():
+    pass

{ttkode-0.3.2a2 → ttkode-0.5.0a2}/ttkode/app/ttkode.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__all__ = ['TTKode']
+__all__ = ['TTKode', 'TTKodeWidget']
 
 import os
 from typing import List,Tuple,Optional,Any
@@ -31,6 +31,10 @@ from TermTk.TTkWidgets.tabwidget import _TTkNewTabWidgetDragData
 from .about import About
 from .activitybar import TTKodeActivityBar
 
+class TTKodeWidget():
+    def closeRequested(self, tab:ttk.TTkTabWidget, num:int):
+        raise NotImplementedError()
+
 class TTKodeFileWidgetItem(ttk.TTkTreeWidgetItem):
     __slots__ = ('_path', '_lineNumber')
     def __init__(self, *args, path:str, lineNumber:int=0, **kwargs) -> None:
@@ -45,16 +49,24 @@ class TTKodeFileWidgetItem(ttk.TTkTreeWidgetItem):
 class _TextDocument(ttk.TextDocumentHighlight):
     __slots__ = ('_filePath', '_tabText',
                  'fileChangedStatus', '_changedStatus', '_savedSnapshot')
-    def __init__(self, filePath:str="", tabText:ttk.TTkString=ttk.TTkString(), **kwargs):
+    def __init__(self, filePath:str="", **kwargs):
         self.fileChangedStatus:ttk.pyTTkSignal = ttk.pyTTkSignal(bool, _TextDocument)
         self._filePath:str = filePath
-        self._tabText = tabText
         self._changedStatus:bool = False
+        self._genTabText()
         super().__init__(**kwargs)
         self._savedSnapshot = self.snapshootId()
         self.guessLexerFromFilename(filePath)
         self.contentsChanged.connect(self._handleContentChanged)
 
+    def _genTabText(self):
+        self._tabText = (
+            ttk.TTkString(ttk.TTkCfg.theme.fileIcon.getIcon(self._filePath),ttk.TTkCfg.theme.fileIconColor) +
+            ttk.TTkColor.RST + " " + os.path.basename(self._filePath) )
+
+    def isChanged(self) -> bool:
+        return self._changedStatus
+
     def getTabButtonStyle(self) -> dict:
         if self._changedStatus:
             return {'default':{'closeGlyph':' ● '}}
@@ -70,17 +82,67 @@ class _TextDocument(ttk.TextDocumentHighlight):
             ttk.TTkLog.debug(f"{self.isUndoAvailable()=} == {self._changedStatus=}")
             self.fileChangedStatus.emit(self._changedStatus, self)
 
-    def save(self):
-        self._changedStatus = False
-        self._savedSnapshot = self.snapshootId()
-        self.fileChangedStatus.emit(self._changedStatus, self)
-        pass
-
-class _TextEdit(ttk.TTkTextEdit):
+    def save(self) -> None:
+        try:
+            with open(self._filePath, 'w') as f:
+                f.write(self.toPlainText())
+            self._changedStatus = False
+            self._savedSnapshot = self.snapshootId()
+            self.fileChangedStatus.emit(self._changedStatus, self)
+        except Exception as e:
+            ttk.TTkLog.error(f"Error saving file: {e}")
+
+    def saveToFile(self, fileName:str) -> None:
+        self._filePath = fileName
+        self._genTabText()
+        self.save()
+class _TextEdit(ttk.TTkTextEdit, TTKodeWidget):
+    __slots__ = ('docFocussed')
     def __init__(self, **kwargs):
+        self.docFocussed = ttk.pyTTkSignal(_TextDocument)
         super().__init__(**kwargs)
         self.cursorPositionChanged.connect(self._positionChanged)
-
+        self.textEditView().focusChanged.connect(self._handleFocusChanged)
+
+    @ttk.pyTTkSlot(bool)
+    def _handleFocusChanged(self, focus:bool) -> None:
+        if focus:
+            self.docFocussed.emit(self.document())
+
+    def closeRequested(self, tab:ttk.TTkTabWidget, num:int):
+        from ttkode import ttkodeProxy
+        doc = self.document()
+        docs = [wid.document() for wid in ttkodeProxy.iterWidgets(_TextEdit) if wid is not self]
+        if not doc.isChanged() or doc in docs:
+            ttkodeProxy.closeTab(self)
+        else:
+            pass
+            # Do you want to save the changes you made to ""?
+            # Your saves will be lost if you don't save them.
+            # Save, Don't Save, Cancel
+            messageBox = ttk.TTkMessageBox(
+                title="🚨 Close? 🚨",
+                text=ttk.TTkString(f"Do you want to save the change\nyou made to {os.path.basename(doc._filePath)}?\n\nYour saves will be lost\nif you don't save them."),
+                icon=ttk.TTkMessageBox.Icon.Warning,
+                standardButtons=
+                    ttk.TTkMessageBox.StandardButton.Discard|
+                    ttk.TTkMessageBox.StandardButton.Save|
+                    ttk.TTkMessageBox.StandardButton.Cancel)
+
+            @ttk.pyTTkSlot(ttk.TTkMessageBox.StandardButton)
+            def _cb(btn):
+                if btn == ttk.TTkMessageBox.StandardButton.Save:
+                    doc.save()
+                    self.textEditView().focusChanged.clear()
+                    ttkodeProxy.closeTab(self)
+                if btn == ttk.TTkMessageBox.StandardButton.Discard:
+                    self.textEditView().focusChanged.clear()
+                    ttkodeProxy.closeTab(self)
+                elif btn == ttk.TTkMessageBox.StandardButton.Cancel:
+                    return
+                messageBox.buttonSelected.clear()
+            messageBox.buttonSelected.connect(_cb)
+            ttk.TTkHelper.overlay(None, messageBox, 5, 5, True)
 
     @ttk.pyTTkSlot(ttk.TTkTextCursor)
     def _positionChanged(self, cursor:ttk.TTkTextCursor):
@@ -106,8 +168,10 @@ class _TextEdit(ttk.TTkTextEdit):
         tedit.textCursor().setPosition(line=linenum,pos=0)
 
 class TTKode(ttk.TTkGridLayout):
-    __slots__ = ('_kodeTab', '_activityBar')
+    __slots__ = ('_kodeTab', '_activityBar', '_lastDoc')
+    _lastDoc:Optional[_TextDocument]
     def __init__(self, **kwargs):
+        self._lastDoc = None
         super().__init__(**kwargs)
 
         appTemplate = ttk.TTkAppTemplate(border=False)
@@ -119,20 +183,22 @@ class TTKode(ttk.TTkGridLayout):
         appTemplate.setMenuBar(appMenuBar:=ttk.TTkMenuBarLayout(), ttk.TTkAppTemplate.MAIN)
         fileMenu = appMenuBar.addMenu("&File")
         fileMenu.addMenu("Open").menuButtonClicked.connect(self._showFileDialog)
+        fileMenu.addMenu("&Save").menuButtonClicked.connect(self.saveLastDoc)
+        fileMenu.addMenu("Save &As...").menuButtonClicked.connect(self.saveLastDocAs)
         fileMenu.addMenu("Close") # .menuButtonClicked.connect(self._closeFile)
-        fileMenu.addMenu("Exit").menuButtonClicked.connect(lambda _:ttk.TTkHelper.quit())
+        fileMenu.addMenu("Exit").menuButtonClicked.connect(self._quit)
 
         def _showAbout(btn):
             ttk.TTkHelper.overlay(None, About(), 30,10)
         def _showAboutTTk(btn):
             ttk.TTkHelper.overlay(None, ttk.TTkAbout(), 30,10)
 
-        appMenuBar.addMenu("&Quit", alignment=ttk.TTkK.RIGHT_ALIGN).menuButtonClicked.connect(ttk.TTkHelper.quit)
+        appMenuBar.addMenu("&Quit", alignment=ttk.TTkK.RIGHT_ALIGN).menuButtonClicked.connect(self._quit)
         helpMenu = appMenuBar.addMenu("&Help", alignment=ttk.TTkK.RIGHT_ALIGN)
         helpMenu.addMenu("About ...").menuButtonClicked.connect(_showAbout)
         helpMenu.addMenu("About ttk").menuButtonClicked.connect(_showAboutTTk)
 
-        fileTree = ttk.TTkFileTree(path='.', dragDropMode=ttk.TTkK.DragDropMode.AllowDrag)
+        fileTree = ttk.TTkFileTree(path='.', dragDropMode=ttk.TTkK.DragDropMode.AllowDrag, selectionMode=ttk.TTkK.SelectionMode.MultiSelection)
         self._activityBar = TTKodeActivityBar()
         self._activityBar.addActivity(name="Explorer", icon=ttk.TTkString("╔██\n╚═╝"), widget=fileTree, select=True)
 
@@ -159,11 +225,88 @@ class TTKode(ttk.TTkGridLayout):
 
         fileTree.fileActivated.connect(lambda x: self._openFile(x.path()))
         self._kodeTab.tabAdded.connect(self._tabAdded)
+        self._kodeTab.kodeTabCloseRequested.connect(self._handleTabCloseRequested)
+
+        ttk.TTkShortcut(ttk.TTkK.CTRL | ttk.TTkK.Key_S).activated.connect(self.saveLastDoc)
+
+
+    @ttk.pyTTkSlot(_TextDocument)
+    def _handleDocFocussed(self, doc:_TextDocument):
+        self._lastDoc = doc
+
+    @ttk.pyTTkSlot()
+    def _quit(self):
+        from ttkode import ttkodeProxy
+        docs = set(os.path.basename(wid.document()._filePath) for wid in ttkodeProxy.iterWidgets(_TextEdit) if wid.document().isChanged())
+        if docs:
+            messageBox = ttk.TTkMessageBox(
+                title="🚨 Quit? 🚨",
+                text=ttk.TTkString("Do you want to quit?\nThere are still unsaved documents,\nif you quit those changes will be lost" + ''.join([f"\n - {_d}" for _d in docs])),
+                icon=ttk.TTkMessageBox.Icon.Warning,
+                standardButtons=
+                    ttk.TTkMessageBox.StandardButton.Ok|
+                    ttk.TTkMessageBox.StandardButton.Cancel)
+            @ttk.pyTTkSlot(ttk.TTkMessageBox.StandardButton)
+            def _cb(btn):
+                if btn == ttk.TTkMessageBox.StandardButton.Ok:
+                    ttk.TTkHelper.quit()
+                elif btn == ttk.TTkMessageBox.StandardButton.Cancel:
+                    return
+                messageBox.buttonSelected.clear()
+            messageBox.buttonSelected.connect(_cb)
+            ttk.TTkHelper.overlay(None, messageBox, 5, 5, True)
+        else:
+            ttk.TTkHelper.quit()
+
+    @ttk.pyTTkSlot()
+    def saveLastDoc(self):
+        if self._lastDoc:
+            self._lastDoc.save()
+
+    @ttk.pyTTkSlot()
+    def saveLastDocAs(self):
+        if not self._lastDoc:
+            return
+        def _approveFile(fileName):
+            if os.path.exists(fileName):
+                @ttk.pyTTkSlot(ttk.TTkMessageBox.StandardButton)
+                def _cb(btn):
+                    if btn == ttk.TTkMessageBox.StandardButton.Save:
+                        self._lastDoc.saveToFile(fileName)
+                    elif btn == ttk.TTkMessageBox.StandardButton.Cancel:
+                        return
+                messageBox = ttk.TTkMessageBox(
+                    text= (
+                        ttk.TTkString( f'A file named "{os.path.basename(fileName)}" already exists.\nDo you want to replace it?', ttk.TTkColor.BOLD) +
+                        ttk.TTkString( f'\n\nReplacing it will overwrite its contents.') ),
+                    icon=ttk.TTkMessageBox.Icon.Warning,
+                    standardButtons=
+                        ttk.TTkMessageBox.StandardButton.Discard|
+                        ttk.TTkMessageBox.StandardButton.Save|
+                        ttk.TTkMessageBox.StandardButton.Cancel)
+                messageBox.buttonSelected.connect(_cb)
+                ttk.TTkHelper.overlay(None, messageBox, 5, 5, True)
+            else:
+                self._lastDoc.saveToFile(fileName)
+        filePicker = ttk.TTkFileDialogPicker(
+                pos = (3,3), size=(80,30),
+                acceptMode=ttk.TTkK.AcceptMode.AcceptSave,
+                caption="Save As...",
+                path=self._lastDoc._filePath,
+                fileMode=ttk.TTkK.FileMode.AnyFile ,
+                filter="All Files (*)")
+        filePicker.pathPicked.connect(_approveFile)
+        ttk.TTkHelper.overlay(None, filePicker, 5, 5, True)
+
+    @ttk.pyTTkSlot(ttk.TTkTabWidget, int)
+    def _handleTabCloseRequested(self, tab:ttk.TTkTabWidget, num:int):
+        # tab.removeTab(num)
+        tab.widget(num).closeRequested(tab, num)
 
     def _getTabButtonFromWidget(self, widget:ttk.TTkWidget) -> ttk.TTkTabButton:
-        for item, tab in self._kodeTab.iterWidgets():
-            if item == widget:
-                return tab
+        for kt, index in self._kodeTab.iterItems():
+            if kt.widget(index) == widget:
+                return kt.tabButton(index)
         return None
 
     ttk.pyTTkSlot(ttk.TTkTabWidget, int)
@@ -180,34 +323,37 @@ class TTKode(ttk.TTkGridLayout):
         ttk.TTkHelper.overlay(None, filePicker, 20, 5, True)
 
     def _getDocument(self, filePath) -> Tuple[_TextDocument, Optional[_TextEdit]]:
-        for item, _ in self._kodeTab.iterWidgets():
-            if issubclass(type(item), _TextEdit):
-                doc = item.document()
+        for kt, index in self._kodeTab.iterItems():
+            if issubclass(type(wid:=kt.widget(index)), _TextEdit):
+                doc = wid.document()
                 if issubclass(type(doc), _TextDocument):
                     if filePath == doc._filePath:
-                        return doc, item
+                        return doc, wid
         with open(filePath, 'r') as f:
             content = f.read()
-        tabText = ttk.TTkString(ttk.TTkCfg.theme.fileIcon.getIcon(filePath),ttk.TTkCfg.theme.fileIconColor) + ttk.TTkColor.RST + " " + os.path.basename(filePath)
-        td = _TextDocument(text=content, filePath=filePath, tabText=tabText)
+        td = _TextDocument(text=content, filePath=filePath)
         td.fileChangedStatus.connect(self._handleFileChangedStatus)
         return td, None
 
     ttk.pyTTkSlot(bool, _TextDocument)
     def _handleFileChangedStatus(self, status:bool, doc:_TextDocument) -> None:
         # ttk.TTkLog.debug(f"Status ({status}) -> {doc._filePath}")
-        for item, tab in self._kodeTab.iterWidgets():
-            if issubclass(type(item), _TextEdit):
-                if doc == item.document():
-                    tab.mergeStyle(doc.getTabButtonStyle())
+        for kt, index in self._kodeTab.iterItems():
+            if issubclass(type(wid:=kt.widget(index)), _TextEdit):
+                if doc == wid.document():
+                    kt.tabButton(index).mergeStyle(doc.getTabButtonStyle())
+                    kt.tabButton(index).setText(doc._tabText)
 
-    def _openFile(self, filePath, line:int=0, pos:int=0):
+    def _openFile(self, filePath, line:int=0, pos:int=0) -> None:
         filePath = os.path.realpath(filePath)
+        if not os.path.isfile(filePath):
+            return
         doc, tedit = self._getDocument(filePath=filePath)
         if tedit:
             self._kodeTab.setCurrentWidget(tedit)
         else:
             tedit = _TextEdit(document=doc, readOnly=False, lineNumber=True)
+            tedit.docFocussed.connect(self._handleDocFocussed)
             self._kodeTab.addTab(tedit, doc._tabText)
             self._kodeTab.setCurrentWidget(tedit)
         tedit.goToLine(line)
@@ -215,28 +361,36 @@ class TTKode(ttk.TTkGridLayout):
 
     def _dropEventProxyFile(self, evt:ttk.TTkDnDEvent):
         data = evt.data()
-        filePath = None
+        filePaths = []
+        linenums = []
 
         if ( issubclass(type(data), ttk.TTkTreeWidget._DropTreeData) and data.items ):
             if issubclass(type(data.items[0]), ttk.TTkFileTreeWidgetItem):
-                linenum:int = 0
-                ftwi:ttk.TTkFileTreeWidgetItem = data.items[0]
-                filePath = os.path.realpath(ftwi.path())
+                ftwis:List[ttk.TTkFileTreeWidgetItem] = data.items
+                filePaths = [os.path.realpath(_f.path()) for _f in ftwis]
+                linenums:List[int] = [0]*len(filePaths)
             elif issubclass(type(data.items[0]), TTKodeFileWidgetItem):
                 kfwi:TTKodeFileWidgetItem = data.items[0]
-                linenum:int = kfwi.lineNumber()
-                filePath = os.path.realpath(kfwi.path())
+                linenums:List[int] = [kfwi.lineNumber()]
+                filePaths = [os.path.realpath(kfwi.path())]
 
-        if filePath:
+        newData = []
+        for filePath,linenum in zip(filePaths,linenums) :
+            if not os.path.isfile(filePath):
+                continue
             doc, _ = self._getDocument(filePath=filePath)
             tedit = _TextEdit(document=doc, readOnly=False, lineNumber=True)
+            tedit.docFocussed.connect(self._handleDocFocussed)
             tedit.goToLine(linenum)
-            newData = _TTkNewTabWidgetDragData(
-                widget=tedit,
-                label=doc._tabText,
-                data=None,
-                closable=True
+            newData.append(
+                _TTkNewTabWidgetDragData(
+                    widget=tedit,
+                    label=doc._tabText,
+                    data=None,
+                    closable=True
+                )
             )
+        if newData:
             newEvt = evt.clone()
             newEvt.setData(newData)
             return newEvt

{ttkode-0.3.2a2 → ttkode-0.5.0a2}/ttkode/plugins/_010/findwidget.py

@@ -27,8 +27,9 @@ import re
 import fnmatch
 import mimetypes
 
-from threading import Thread
-from typing import Generator,List,Tuple
+from pathlib import Path
+from threading import Thread,Event,Lock
+from typing import Generator,List,Tuple,Dict,Optional
 
 import TermTk as ttk
 
@@ -70,24 +71,32 @@ def _load_gitignore_patterns(gitignore_path):
         return patterns
     return []
 
-def _should_ignore(path, patterns):
-    for pattern in patterns:
-        if fnmatch.fnmatch(path, pattern):
-            return True
-    return False
+def _glob_match_patterns(path, patterns) -> bool:
+    if path == '.':
+        check_path = ''
+    elif path.startswith('./'):
+        check_path = path[2:]
+    else:
+        check_path = path
+    return any(f"/{_p}/" in path for _p in patterns if _p) or any(fnmatch.fnmatch(check_path, _p) for _p in patterns if _p)
 
-def _custom_walk(directory:str, patterns:List[str]=[]) -> Generator[Tuple[str, str], None, None]:
+def _custom_walk(directory:str, include_patterns:List[str]=[], exclude_patterns:List[str]=[]) -> Generator[Tuple[str, str], None, None]:
     gitignore_path = os.path.join(directory, '.gitignore')
-    patterns = patterns + _load_gitignore_patterns(gitignore_path)
+    exclude_patterns = exclude_patterns + _load_gitignore_patterns(gitignore_path)
     for entry in sorted(os.listdir(directory)):
         full_path = os.path.join(directory, entry)
-        if _should_ignore(full_path, patterns):
+        if _glob_match_patterns(full_path, exclude_patterns):
+            continue
+        if not os.path.exists(full_path):
             continue
         if os.path.isdir(full_path):
             if entry == '.git':
                 continue
-            yield from _custom_walk(full_path, patterns)
+            yield from _custom_walk(full_path, include_patterns, exclude_patterns)
         else:
+            if include_patterns and not _glob_match_patterns(full_path, include_patterns):
+                # ttk.TTkLog.debug(f"{include_patterns=} {full_path=}")
+                continue
             yield directory, entry
 
 def _walk_with_gitignore(root):
@@ -95,7 +104,7 @@ def _walk_with_gitignore(root):
         gitignore_path = os.path.join(dirpath, '.gitignore')
         patterns = _load_gitignore_patterns(gitignore_path)
 
-        filenames[:] = [f for f in filenames if not _should_ignore(os.path.join(dirpath, f), patterns)]
+        filenames[:] = [f for f in filenames if not _glob_match_patterns(os.path.join(dirpath, f), patterns)]
 
         yield dirpath, filenames
 
@@ -126,10 +135,16 @@ class _MatchTreeWidgetItem(TTKodeFileWidgetItem):
 
 class FindWidget(ttk.TTkContainer):
     __slots__ = (
-        '_runId'
+        '_runId',
+        '_replace_data',
         '_results_tree',
+        '_search_thread', '_search_stop_event', '_search_lock',
         '_search_le','_replace_le','_files_inc_le','_files_exc_le')
     _runId:int
+    _search_lock:Lock
+    _search_thread:Optional[Thread]
+    _search_stop_event:Event
+    _replace_data:Dict
     _results_tree:ttk.TTkTreeWidget
     _search_le:ttk.TTkLineEdit
     _replace_le:ttk.TTkLineEdit
@@ -137,6 +152,10 @@ class FindWidget(ttk.TTkContainer):
     _files_exc_le:ttk.TTkLineEdit
     def __init__(self, **kwargs):
         self._runId = 0
+        self._replace_data = {}
+        self._search_thread = None
+        self._search_lock = Lock()
+        self._search_stop_event = Event()
         super().__init__(**kwargs)
         self.setLayout(layout:=ttk.TTkGridLayout())
 
@@ -177,9 +196,20 @@ class FindWidget(ttk.TTkContainer):
         self._files_exc_le = ft_excl
 
         btn_search.clicked.connect(self._search)
+        btn_replace.clicked.connect(self._ask_replace)
         btn_expand.clicked.connect(self._results_tree.expandAll)
         btn_collapse.clicked.connect(self._results_tree.collapseAll)
+
         search.returnPressed.connect(self._search)
+        replace.returnPressed.connect(self._search)
+        ft_incl.returnPressed.connect(self._search)
+        ft_excl.returnPressed.connect(self._search)
+
+        search.textEdited.connect(self._search)
+        replace.textEdited.connect(self._search)
+        ft_incl.textEdited.connect(self._search)
+        ft_excl.textEdited.connect(self._search)
+
         res_tree.itemActivated.connect(self._activated)
 
         @ttk.pyTTkSlot(str)
@@ -196,53 +226,113 @@ class FindWidget(ttk.TTkContainer):
             line = item.lineNumber()
             ttkodeProxy.openFile(file, line)
 
-
     @ttk.pyTTkSlot()
-    def _search(self):
-        self._runId += 1
-        search_pattern = str(self._search_le.text())
-        if not search_pattern:
+    def _ask_replace(self) -> None:
+        if not self._replace_le.text():
             return
-        def _search_threading():
-            self._results_tree.clear()
-            group = []
-            groupSize = 1
-            for (file,root,matches) in self._search_files('.',str(search_pattern),self._runId):
-                ttk.TTkLog.debug((file,matches))
-                item = ttk.TTkTreeWidgetItem([
-                        ttk.TTkString(
-                            ttk.TTkCfg.theme.fileIcon.getIcon(file),
-                            ttk.TTkCfg.theme.fileIconColor) + " " +
-                        ttk.TTkString(f" {file} ", ttk.TTkColor.YELLOW+ttk.TTkColor.BOLD+ttk.TTkColor.bg('#000088')) +
-                        ttk.TTkString(f" {root} ", ttk.TTkColor.fg("#888888"))
-                    ],expanded=True)
-                for num,line in matches:
-                    line = line.lstrip(' ')
-                    # index = line.find(search_pattern)
-                    # outLine =
-                    item.addChild(
-                        _MatchTreeWidgetItem([
-                            ttk.TTkString(str(num)+" ",ttk.TTkColor.CYAN) +
-                            ttk.TTkString(line.replace('\n','')).completeColor(
-                                match=search_pattern,
-                                color=ttk.TTkColor.GREEN)
-                            ],
-                            match=line,
-                            lineNumber=num,
-                            path=os.path.join(root,file)))
-                group.append(item)
-                if len(group) > groupSize:
-                    self._results_tree.addTopLevelItems(group)
-                    group = []
-                    groupSize <<= 1
-                # self._results_tree.addTopLevelItem(item)
-            if group:
+        _numFiles = len(self._replace_data.get('files',[]))
+        _numMatches = sum(len(_r.get('matches',[])) for _r in self._replace_data.get('files',[]))
+        _search_pattern = str(self._search_le.text())
+        _replace_pattern = str(self._replace_le.text())
+
+        messageBox = ttk.TTkMessageBox(
+            title="🚨 Apply? 🚨",
+            text=ttk.TTkString(f"Do you want to repace {_numMatches} occurrences of\n'{_search_pattern}'\nin {_numFiles} files with\n'{_replace_pattern}'?"),
+            icon=ttk.TTkMessageBox.Icon.Warning,
+            standardButtons=
+                ttk.TTkMessageBox.StandardButton.Ok|
+                ttk.TTkMessageBox.StandardButton.Cancel)
+
+        @ttk.pyTTkSlot(ttk.TTkMessageBox.StandardButton)
+        def _cb(btn):
+            if btn == ttk.TTkMessageBox.StandardButton.Ok:
+                ttk.TTkLog.debug(f"Replace '{_search_pattern}' with '{_replace_pattern}'")
+                for _file_def in self._replace_data.get('files',[]):
+                    _file = Path(_file_def['root']) / _file_def['file']
+                    if not self._replace_data.get('files',[]):
+                        ttk.TTkLog.error(f"{_file} does not exists!!!")
+                    else:
+                        _content = _file.read_text()
+                        _new_content = _content.replace(_search_pattern,_replace_pattern)
+                        _file.write_text(_new_content)
+            else:
+                ttk.TTkLog.debug(f"Discard")
+        messageBox.buttonSelected.connect(_cb)
+        ttk.TTkHelper.overlay(None, messageBox, 5, 5, True)
+
+    def _search_threading(self, search_pattern:str, include_patterns:str, exclude_patterns:str, replace_pattern:str) -> None:
+        self._results_tree.clear()
+        group = []
+        groupSize = 1
+        self._replace_data = {'files':[]}
+        for (file,root,matches) in self._search_files('.',search_pattern,self._runId,include_patterns,exclude_patterns):
+            if self._search_stop_event.is_set():
+                return
+
+            self._replace_data['files'].append({'file':file,'root':root,'matches':matches})
+            # ttk.TTkLog.debug((file,matches))
+            item = ttk.TTkTreeWidgetItem([
+                    ttk.TTkString(
+                        ttk.TTkCfg.theme.fileIcon.getIcon(file),
+                        ttk.TTkCfg.theme.fileIconColor) + " " +
+                    ttk.TTkString(f" {file} ", ttk.TTkColor.YELLOW+ttk.TTkColor.BOLD+ttk.TTkColor.bg('#000088')) +
+                    ttk.TTkString(f" {root} ", ttk.TTkColor.fg("#888888"))
+                ],expanded=True)
+            children = []
+            for num,line in matches:
+                line = line.lstrip(' ')
+                # index = line.find(search_pattern)
+                # outLine =
+                if replace_pattern:
+                    _s = line.replace('\n','').split(search_pattern)
+                    _j = (
+                        ttk.TTkString(search_pattern,ttk.TTkColor.RED + ttk.TTkColor.STRIKETROUGH) +
+                        ttk.TTkString(replace_pattern,ttk.TTkColor.GREEN) + ttk.TTkColor.RST)
+                    ttkLine = _j.join(_s)
+                else:
+                    ttkLine = ttk.TTkString(line.replace('\n','')).completeColor(
+                            match=search_pattern,
+                            color=ttk.TTkColor.GREEN)
+                children.append(_MatchTreeWidgetItem([ttk.TTkString(str(num)+" ",ttk.TTkColor.CYAN) + ttkLine] ,
+                        match=line,
+                        lineNumber=num,
+                        path=os.path.join(root,file)))
+            item.addChildren(children)
+            group.append(item)
+            if len(group) > groupSize:
                 self._results_tree.addTopLevelItems(group)
-        Thread(target=_search_threading).start()
+                group = []
+                if groupSize < 0x400:
+                    groupSize <<= 1
+            # self._results_tree.addTopLevelItem(item)
+        if group:
+            self._results_tree.addTopLevelItems(group)
 
-    def _search_files(self, root_folder, match, runId):
-        matches = []
-        for root, file in _custom_walk(root_folder):
+    @ttk.pyTTkSlot()
+    def _search(self) -> None:
+        with self._search_lock:
+            if self._search_thread:
+                self._search_stop_event.set()
+                self._search_thread.join()
+                self._search_stop_event.clear()
+                self._search_thread = None
+            self._runId += 1
+            search_pattern = str(self._search_le.text())
+            replace_pattern = str(self._replace_le.text())
+            include_patterns = _s.split(',') if (_s:=str(self._files_inc_le.text())) else []
+            exclude_patterns = _s.split(',') if (_s:=str(self._files_exc_le.text())) else []
+            if not search_pattern:
+                self._results_tree.clear()
+                return
+            if self._search_thread:
+                self._search_thread.join()
+            self._search_thread = Thread(
+                target=self._search_threading,
+                args=(search_pattern, include_patterns, exclude_patterns, replace_pattern))
+            self._search_thread.start()
+
+    def _search_files(self, root_folder, match, runId, include_patterns, exclude_patterns):
+        for root, file in _custom_walk(root_folder,include_patterns,exclude_patterns):
             if runId != self._runId:
                 return
             if True: # file.endswith('.py'): # file.endswith(file_extension):

{ttkode-0.3.2a2 → ttkode-0.5.0a2}/ttkode/proxy.py

@@ -26,7 +26,7 @@ from typing import Optional, Callable, Any
 
 import TermTk as ttk
 
-from ttkode.app.ttkode import TTKode
+from ttkode.app.ttkode import TTKode, TTKodeWidget
 
 class TTKodeViewerProxy():
     __slots__ = ('_fileName')
@@ -41,26 +41,30 @@ class TTKodeProxy():
                  '_ttkode',
                  # Signals
                  )
-    _ttkode:Optional[TTKode]
-    _openFileCb:Optional[Callable[[Any, int, int], Any]]
-    def __init__(self) -> None:
-        self._openFileCb = None
-        self._ttkode = None
-
-    def setTTKode(self, ttkode:TTKode) -> None:
+    _ttkode:TTKode
+    _openFileCb:Callable[[Any, int, int], Any]
+    def __init__(self, ttkode:TTKode) -> None:
         self._ttkode = ttkode
         self._openFileCb = ttkode._openFile
 
     def ttkode(self) -> TTKode:
-        if not self._ttkode:
-            raise Exception("TTkode uninitialized")
         return self._ttkode
 
+    def iterWidgets(self, widType=TTKodeWidget):
+        for kt, index in self._ttkode._kodeTab.iterItems():
+            if issubclass(type(wid:=kt.widget(index)), widType):
+                yield wid
+
+    @ttk.pyTTkSlot(TTKodeWidget)
+    def closeTab(self, widget:TTKodeWidget) -> None:
+        for kt, index in self._ttkode._kodeTab.iterItems():
+            if kt.widget(index)==widget:
+                kt.removeTab(index)
+
     def setOpenFile(self, cb):
         self._openFileCb = cb
 
     def openFile(self, fileName:str, line:int=0, pos:int=0):
-        if self._ttkode and self._openFileCb:
-            return self._openFileCb(fileName, line, pos)
+        return self._openFileCb(fileName, line, pos)
 
-ttkodeProxy:TTKodeProxy = TTKodeProxy()
+ttkodeProxy:TTKodeProxy = TTKodeProxy(ttkode=TTKode())

{ttkode-0.3.2a2 → ttkode-0.5.0a2}/ttkode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ttkode
-Version: 0.3.2a2
+Version: 0.5.0a2
 Summary: Terminal ToolKit Studio Code editor
 Author-email: Eugenio Parodi <ceccopierangiolieugenio@googlemail.com>
 License: MIT
@@ -19,7 +19,7 @@ Classifier: Topic :: Terminals
 Classifier: Topic :: Software Development :: User Interfaces
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: pyTermTk>=0.42.1-a.0
+Requires-Dist: pyTermTk>=0.46.0-a.0
 Requires-Dist: appdirs
 Requires-Dist: copykitten
 Requires-Dist: pygments

{ttkode-0.3.2a2 → ttkode-0.5.0a2}/ttkode.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ ttkode/app/about.py
 ttkode/app/activitybar.py
 ttkode/app/cfg.py
 ttkode/app/options.py
+ttkode/app/state.py
 ttkode/app/ttkode.py
 ttkode/plugins/_010_findplugin.py
 ttkode/plugins/_020_debugplugin.py

{ttkode-0.3.2a2 → ttkode-0.5.0a2}/ttkode.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pyTermTk>=0.42.1-a.0
+pyTermTk>=0.46.0-a.0
 appdirs
 copykitten
 pygments