support file watching

Author: eXceediDeaL

Makefile

@@ -2,7 +2,7 @@
 
 PY = python
 SHELL = powershell.exe
-override RARG += --wdir ../temp/debug
+override RARG += --dir ../temp/debug
 
 build : 
 	$(PY) setup.py sdist bdist_wheel

README.md

@@ -30,7 +30,7 @@ Use command `ecr` to run edl-cr.
 
 |Option|Description|
 |-|-|
-|`-w --wdir`|Set working directory|
+|`-d --dir`|Set working directory|
 |`-c --command`|Execute command just like in interactive mode|
 
 ## Interactive Mode
@@ -84,6 +84,9 @@ a.cpp> run b.cpp
 
 # run a.cpp with file input and standard output
 a.cpp> run -io fs
+
+# watch the file a.cpp and run auto
+a.cpp> run -w
 ```
 
 ### Input and Output
@@ -125,7 +128,7 @@ These are builtin commands. You can use system command in `importedCommand` list
 |`new [file] [-e --edit]`|Create new code file|
 |`now [file]`|Change current file|
 |`edit [file] [-n --now]`|Edit code file|
-|`run [file] [-io --io]`|Run code file|
+|`run [file] [-io --io] [-w]`|Run code file|
 |`clean`|Clean temp files|
 |`pwd`|Print working directory|
 |`cd`|Change working directory|

requirements.txt

@@ -6,3 +6,4 @@ twine
 pytest-html
 prompt_toolkit
 click
+watchdog

setup.py

@@ -15,14 +15,14 @@ def read(*parts):
 
 setup(
     name="edl-cr",
-    version="0.0.1.5",
+    version="0.0.2",
     description="A CLI tool to run code",
     long_description=long_description,
     long_description_content_type="text/markdown",
 
     license="Apache-2.0",
     classifiers=[
-        "Development Status :: 2 - Pre-Alpha",
+        "Development Status :: 3 - Alpha",
         "Programming Language :: Python :: 3.7",
         "License :: OSI Approved :: Apache Software License",
     ],
@@ -53,6 +53,7 @@ def read(*parts):
     python_requires='>=3.7',
     install_requires=[
         "prompt_toolkit>=2.0.7",
-        "click>=7.0"
+        "click>=7.0",
+        "watchdog>=0.9.0"
     ]
 )

src/ecr/__main__.py

@@ -62,6 +62,7 @@ def getITParser():
                          default=None, help="Change input and output")
     cmd_run.add_argument(
         "file", nargs="?", default=None, help="File name (only for this command)")
+    cmd_run.add_argument("-w", "--watch", action="store_true",default=False,help="Watch the file and run auto till Ctrl-C")
     cmd_run.set_defaults(func=run)
 
     cmd_edit = subpars.add_parser("edit", help="Edit code file")
@@ -174,15 +175,15 @@ def main():  # pragma: no cover
         prog="ecr", description="Code Runner")
     baseParser.add_argument("-v", "--version", default=False, action="store_true",
                             help="Get version")
-    baseParser.add_argument("-w", "--wdir", default=None,
+    baseParser.add_argument("-d", "--dir", default=None,
                             help="Set working directory")
     baseParser.add_argument(
         "-c", "--command", default=None,  help="Execute command")
     baseCmd = baseParser.parse_args()
     if baseCmd.version:
         return getVersion(None).value
-    if baseCmd.wdir != None:
-        os.chdir(baseCmd.wdir)
+    if baseCmd.dir != None:
+        os.chdir(baseCmd.dir)
 
     mainInit()
 
@@ -201,7 +202,7 @@ def main():  # pragma: no cover
             break
         if executeCommand(oricmd) == ReturnCode.EXIT.value:
             break
-    
+
     return 0
 
 

src/ecr/command.py

@@ -7,13 +7,27 @@
 import click
 import threading
 import time
+import watchdog
+from watchdog.events import FileSystemEventHandler
 from argparse import Namespace
 from .helper import loadMan, printHead
 from .core import manager
 from .ui import SwitchState, color
 from . import ReturnCode, shared, ui
 
 
+def printFileModify(file):
+    ui.console.write(color.useYellow("M"), file)
+
+
+def printFileCreate(file):
+    ui.console.write(color.useGreen("+"), file)
+
+
+def printFileDelete(file):
+    ui.console.write(color.useRed("-"), file)
+
+
 def assertInited()->bool:
     if shared.man == None:
         ui.console.error("Not have any ecr directory")
@@ -53,7 +67,7 @@ def new(args):
     result = shared.man.newCode(file)
     if result:
         shared.man.currentFile = file
-        ui.console.write(color.useGreen("+"), file)
+        printFileCreate(file)
         if args.edit:
             return edit(Namespace(file=file, now=False))
         return ReturnCode.OK
@@ -73,7 +87,7 @@ def edit(args):
         file = shared.man.currentFile
     result = shared.man.edit(file)
     if result:
-        ui.console.write(color.useYellow("M"), file)
+        printFileModify(file)
         if args.now:
             return now(Namespace(file=file))
         return ReturnCode.OK
@@ -83,6 +97,34 @@ def edit(args):
     return ReturnCode.OK
 
 
+class RunWatchEventHandler(FileSystemEventHandler):
+    def __init__(self, file, func):
+        self.func = func
+        self.file = file
+        self.state = False
+
+    def on_moved(self, event):
+        super().on_moved(event)
+        # self.func()
+
+        # what = 'directory' if event.is_directory else 'file'
+        # logging.info("Moved %s: from %s to %s", what, event.src_path,event.dest_path)
+
+    def on_created(self, event):
+        super().on_created(event)
+
+    def on_deleted(self, event):
+        super().on_deleted(event)
+        # self.func()
+
+    def on_modified(self, event):
+        super().on_modified(event)
+        if os.path.split(event.src_path)[-1] == self.file:
+            self.state = not self.state
+            if self.state: # one modify raise two event
+                self.func()
+
+
 def run(args):
     if not assertInited():
         return ReturnCode.UNLOADED
@@ -116,18 +158,44 @@ def run(args):
 
     result = ret[0] if len(ret) > 0 else False"""
 
-    result = shared.man.execute(io=args.io, file=args.file)
+    if not args.watch:
+        result = shared.man.execute(io=args.io, file=args.file)
 
-    if not result:
-        ui.console.error("Running failed")
-        return ReturnCode.RUNERR
-    return ReturnCode.OK
+        if not result:
+            ui.console.error("Running failed")
+            return ReturnCode.RUNERR
+        return ReturnCode.OK
+    else:
+        def func():
+            ui.console.clear()
+            ui.console.info(f"Watching", end=" ")
+            printFileModify(file)
+            result = shared.man.execute(io=args.io, file=args.file)
+            if not result:
+                ui.console.error("Running failed")
+
+        from watchdog.observers import Observer
+        file = args.file if args.file != None else shared.man.currentFile
+        path = shared.man.workingDirectory
+        ui.console.info(f"Watching {file} (press ctrl+c to end)")
+        event_handler = RunWatchEventHandler(file, func)
+        observer = Observer()
+        observer.schedule(event_handler, path, recursive=False)
+        observer.start()
+        try:
+            while True:
+                time.sleep(1)
+        except KeyboardInterrupt:
+            observer.stop()
+            ui.console.info("Watching end.")
+        observer.join()
+        return ReturnCode.OK
 
 
 def clean(args):
     if not assertInited():
         return ReturnCode.UNLOADED
-    shared.man.clean()
+    shared.man.clean(rmHandler=printFileDelete)
     return ReturnCode.OK
 
 

src/ecr/core/defaultData.py

@@ -1,7 +1,7 @@
 from . import CIO_SISO
 
 io = CIO_SISO
-timeLimit = 5
+timeLimit = 10
 editor = "vim"
 
 executors = {

src/ecr/core/manager.py

@@ -157,13 +157,14 @@ def edit(self, file=None):
         except:
             return False
 
-    def clean(self):
+    def clean(self, rmHandler=None):
         for file in os.listdir(self.workingDirectory):
             for pat in self.tempFileFilter:
                 try:
                     if pat == path.getFileExt(os.path.split(file)[-1]):
-                        os.remove(file)
-                        ui.console.write(color.useRed("-"), file)
+                        os.remove(os.path.join(self.workingDirectory, file))
+                        if rmHandler != None:
+                            rmHandler(file)
                         break
                 except:
                     pass

src/ecr/shared.py

@@ -1,7 +1,7 @@
 from .core import WorkManager, path
 from .ui import CLI
 
-version = "0.0.1.5"
+version = "0.0.2"
 
 cwd = None