Removed web code editor and git autocommit

This is too much complication for now.

Author: lfagundes

solid_node/core/broker.py

@@ -114,3 +114,53 @@ async def get(self, key):
         async with httpx.AsyncClient() as client:
             response = await client.get((f'{BROKER_URL}/{key}'))
             return response.json()
+
+class AsyncLock:
+
+    def __init__(self, source):
+        self.source = source
+        self.locked = False
+
+    async def __aenter__(self):
+        await self.acquire_lock()
+        self.locked = True
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        await self.release_lock()
+        self.locked = False
+
+    async def acquire_lock(self):
+        async with websockets.connect(LOCK_URL) as websocket:
+            await websocket.send("acquire")
+            await websocket.recv()
+            logger.info(f'LOCK from {self.source} ')
+
+    async def release_lock(self):
+        async with websockets.connect(LOCK_URL) as websocket:
+            await websocket.send("release")
+            await websocket.recv()
+            logger.info(f'RELEASE from {self.source} ')
+
+
+class SyncLock:
+
+    def __init__(self, source):
+        self.source = source
+        self.locked = False
+
+    def __enter__(self):
+        self.acquire_lock()
+        self.locked = True
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.release_lock()
+        self.locked = False
+
+    def acquire_lock(self):
+        # Synchronous code to acquire lock
+        logger.info(f'SYNC LOCK from {self.source}')
+
+    def release_lock(self):
+        # Synchronous code to release lock
+        logger.info(f'SYNC RELEASE from {self.source}')

solid_node/core/builder.py

@@ -7,7 +7,6 @@
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler
 from .loader import load_node
-from .git import GitRepo
 from .broker import BrokerClient
 from solid_node.core.refactor import RefactorRequest
 from solid_node.node.base import StlRenderStart
@@ -22,7 +21,6 @@ def __init__(self, path):
         super().__init__()
         self.path = path
 
-        self.repo = GitRepo(path)
         self.file_changed = Future()
         self.observer = Observer()
 
@@ -35,39 +33,38 @@ async def _start(self):
         logger.info('START')
         self.broker = BrokerClient()
 
-        async with self.repo.async_lock('BUILDER'):
-            try:
-                self.node = load_node(self.path)
-            except Exception as e:
-                error_message = traceback.format_exc()
-                logger.error(error_message)
-                await self.rollback(error_message)
-                sys.exit(0)
-
-            try:
-                self.node.assemble()
-            except RefactorRequest as request:
-                await self.execute_refactor(request)
-            except Exception as e:
-                error_message = traceback.format_exc()
-                logger.error(error_message)
-                await self.rollback(error_message)
-                sys.exit(0)
-
-            for path in self.node.files:
-                self.observer.schedule(self, path, recursive=False)
-
-            self.observer.start()
-
-            try:
-                await self.generate_stl()
-            except RefactorRequest as request:
-                await self.execute_refactor(request)
-            except Exception as e:
-                error_message = traceback.format_exc()
-                logger.error(error_message)
-                await self.rollback(error_message)
-                sys.exit(0)
+        try:
+            self.node = load_node(self.path)
+        except Exception as e:
+            error_message = traceback.format_exc()
+            logger.error(error_message)
+            await self.report_error(error_message)
+            sys.exit(0)
+
+        try:
+            self.node.assemble()
+        except RefactorRequest as request:
+            await self.execute_refactor(request)
+        except Exception as e:
+            error_message = traceback.format_exc()
+            logger.error(error_message)
+            await self.report_error(error_message)
+            sys.exit(0)
+
+        for path in self.node.files:
+            self.observer.schedule(self, path, recursive=False)
+
+        self.observer.start()
+
+        try:
+            await self.generate_stl()
+        except RefactorRequest as request:
+            await self.execute_refactor(request)
+        except Exception as e:
+            error_message = traceback.format_exc()
+            logger.error(error_message)
+            await self.report_error(error_message)
+            sys.exit(0)
 
         await self.file_changed
         sys.exit(0)
@@ -79,7 +76,7 @@ async def execute_refactor(self, request):
         except Exception as e:
             error_message = traceback.format_exc()
             logger.error(error_message)
-            await self.rollback(f"Could not execute refactor\n\n{error_message}")
+            await self.report_error(f"Could not execute refactor\n\n{error_message}")
 
     async def generate_stl(self):
         try:
@@ -91,12 +88,12 @@ async def generate_stl(self):
             logger.info(f"{job.stl_file} done!")
             sys.exit(0)
 
-    async def rollback(self, error_message):
+    async def report_error(self, error_message):
         await self.broker.put('build_error', {
             'error': error_message,
             'tstamp': time.time(),
         })
-        self.repo.revert_last_commit()
+        await self.file_changed
         sys.exit(0)
 
     def on_modified(self, event):

solid_node/core/git.py

@@ -3,25 +3,26 @@
 import logging
 import websockets
 from git import Repo, InvalidGitRepositoryError, NoSuchPathError, GitCommandError
-from solid_node.core.broker import LOCK_URL
+from solid_node.core.broker import AsyncLock, SyncLock
 
 logger = logging.getLogger('core.git')
 
 
 class GitRepo:
-    """Manages a git repository for user's project. Every time
-    user saves a file, the repository is commited, and if the
-    build fails, it's rolled back."""
+    """Manages a git repository for user's project.
+    It was used for browser's code editor, now it's
+    not in use.
+    """
     def __init__(self, file_path):
         self.repo = _find_repo_root(file_path)
         self._lock = None
 
     def async_lock(self, source):
-        self._lock = RepoAsyncLock(source)
+        self._lock = AsyncLock(source)
         return self._lock
 
     def sync_lock(self, source):
-        self._lock = RepoSyncLock(source)
+        self._lock = SyncLock(source)
         return self._lock
 
     @property
@@ -49,57 +50,6 @@ def _assert_lock(self, operation):
         logger.debug(f'{operation} by {self._lock.source}')
 
 
-class RepoAsyncLock:
-
-    def __init__(self, source):
-        self.source = source
-        self.locked = False
-
-    async def __aenter__(self):
-        await self.acquire_lock()
-        self.locked = True
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        await self.release_lock()
-        self.locked = False
-
-    async def acquire_lock(self):
-        async with websockets.connect(LOCK_URL) as websocket:
-            await websocket.send("acquire")
-            await websocket.recv()
-            logger.info(f'LOCK from {self.source} ')
-
-    async def release_lock(self):
-        async with websockets.connect(LOCK_URL) as websocket:
-            await websocket.send("release")
-            await websocket.recv()
-            logger.info(f'RELEASE from {self.source} ')
-
-
-class RepoSyncLock:
-
-    def __init__(self, source):
-        self.source = source
-        self.locked = False
-
-    def __enter__(self):
-        self.acquire_lock()
-        self.locked = True
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.release_lock()
-        self.locked = False
-
-    def acquire_lock(self):
-        # Synchronous code to acquire lock
-        logger.info(f'SYNC LOCK from {self.source}')
-
-    def release_lock(self):
-        # Synchronous code to release lock
-        logger.info(f'SYNC RELEASE from {self.source}')
-
-
 def _find_repo_root(file_path):
     """
     Find the root of the Git repository starting from the given file path.

solid_node/core/loader.py

@@ -10,12 +10,12 @@
 
 def load_node(path):
     if not path.endswith('.py'):
-        raise Exception("Can only load .py files")
+        raise Exception(f"Can only load .py files, not {path}")
     return load_instance(path, AbstractBaseNode)
 
 def load_test(path):
     if not path.endswith('.py'):
-        raise Exception("Can only load .py files")
+        raise Exception(f"Can only load .py files, not {path}")
 
     parts = path.split('/')
     parts[-1] = f'test_{parts[-1]}'

solid_node/viewers/web/app/public/index.html

@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Solid Node</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

solid_node/viewers/web/app/src/App.css

@@ -8,6 +8,11 @@
 }
 
 .top {
+    width: 100%;
+    height: 50px;
+}
+
+.body {
     display: flex;
     flex: 1;
 }

solid_node/viewers/web/app/src/App.tsx

@@ -3,14 +3,13 @@ import * as THREE from 'three';
 import './App.css';
 import { Resizable } from 're-resizable';
 import { STLViewer, STLViewerHandles } from './viewer/STLViewer';
-//import { ControlCube } from './viewer/ControlCube';
+import { ControlCube } from './viewer/ControlCube';
 //import { NodeProvider } from './context';
 import { RotationControl } from './viewer/viewer.d';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { Node, Context, loadNode } from './node';
 import { Reloader } from './reloader';
 import { Animator } from './animator';
-import CodeEditor from './CodeEditor';
 import NavigationTree from './NavigationTree';
 
 
@@ -71,34 +70,15 @@ const App = () => {
   };
   */
 
-  const fontSize = 15;
-
   return (
     <Router>
       <div className="app">
         <div className="top">
+        </div>
+        <div className="body">
           <Resizable
-            defaultSize={{ width: '12%', height: '100%' }}
             className="pane left"
-            enable={{ right: true }}
-          >
-            <NavigationTree />
-          </Resizable>
-
-          <Resizable
-            className="pane center"
-            defaultSize={{ width: '46.4%', height: '100%' }}
-            enable={{ right: true }}
-          >
-            <CodeEditor
-              node={node}
-              fontSize={fontSize}
-            />
-          </Resizable>
-
-          <Resizable
-            className="pane right"
-            defaultSize={{ width: '41.6%', height: '100%' }}
+            defaultSize={{ width: '80%', height: '100%' }}
             enable={{ right: true }}
           >
             {!error &&
@@ -123,11 +103,14 @@ const App = () => {
               */}
             </div>
           </Resizable>
+          <Resizable
+            defaultSize={{ width: '20%', height: '100%' }}
+            className="pane right"
+            enable={{ right: true }}
+          >
+            <NavigationTree />
+          </Resizable>
         </div>
-
-        <Resizable defaultSize={{ width: '100%', height: '30%' }} className="pane bottom">
-          <h3>Console</h3>
-        </Resizable>
       </div>
     </Router>
   );