easycoder 250609.1__tar.gz → 250611.1__tar.gz

{easycoder-250609.1 → easycoder-250611.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 250609.1
+Version: 250611.1
 Summary: Rapid scripting in English
 Keywords: compiler,scripting,prototyping,programming,coding,python,low code,hypertalk,computer language,learn to code
 Author-email: Graham Trott <gtanyware@gmail.com>
@@ -8,6 +8,7 @@ Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
 Requires-Dist: pytz
 Requires-Dist: requests
+Requires-Dist: paramiko
 Requires-Dist: pyside6
 Project-URL: Home, https://github.com/easycoder/easycoder-py
 

{easycoder-250609.1 → easycoder-250611.1}/easycoder/__init__.py

@@ -9,4 +9,4 @@ from .ec_program import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250609.1"
+__version__ = "250611.1"

{easycoder-250609.1 → easycoder-250611.1}/easycoder/ec_core.py

@@ -1,4 +1,5 @@
-import json, math, hashlib, threading, os, subprocess, sys, time, numbers, base64, binascii, random, requests
+import json, math, hashlib, threading, os, subprocess, sys, time
+import numbers, base64, binascii, random, requests, paramiko
 from psutil import Process
 from datetime import datetime
 from random import randrange
@@ -386,7 +387,7 @@ class Core(Handler):
         return True
 
     def r_exit(self, command):
-        if self.program.graphics != None:
+        if self.program.parent == None and self.program.graphics != None:
             self.program.graphics.force_exit(None)
         return -1
 
@@ -601,6 +602,7 @@ class Core(Handler):
                 variable['name'] = name
                 variable['keyword'] = keyword
                 variable['import'] = None
+                variable['used'] = False
                 self.addCommand(variable)
                 if self.peek() != 'and':
                     break
@@ -711,7 +713,7 @@ class Core(Handler):
         return self.nextPC()
 
     # 1 Load a plugin. This is done at compile time.
-    # 2 Load text from a file
+    # 2 Load text from a file or ssh
     def k_load(self, command):
         self.nextToken()
         if self.tokenIs('plugin'):
@@ -725,7 +727,15 @@ class Core(Handler):
             if symbolRecord['hasValue']:
                 command['target'] = symbolRecord['name']
                 if self.nextIs('from'):
-                    command['file'] = self.nextValue()
+                    if self.nextIsSymbol():
+                        record = self.getSymbolRecord()
+                        if record['keyword'] == 'ssh':
+                            command['ssh'] = record['name']
+                            command['path'] = self.nextValue()
+                            self.add(command)
+                            return True
+
+                    command['file'] = self.getValue()
                     self.add(command)
                     return True
         else:
@@ -734,15 +744,24 @@ class Core(Handler):
 
     def r_load(self, command):
         target = self.getVariable(command['target'])
-        filename = self.getRuntimeValue(command['file'])
-        try:
-            with open(filename) as f: content = f.read()
-        except:
-            content = ''
-        try:
-            if filename.endswith('.json'): content = json.loads(content)
-        except:
-            RuntimeError(self.program, 'Bad or null JSON string')
+        if 'ssh' in command:
+            ssh = self.getVariable(command['ssh'])
+            path = self.getRuntimeValue(command['path'])
+            sftp = ssh['sftp']
+            try:
+                with sftp.open(path, 'r') as remote_file: content = remote_file.read().decode()
+            except:
+                RuntimeError(self.program, f'Unable to read from {path}')
+        else:
+            filename = self.getRuntimeValue(command['file'])
+            try:
+                with open(filename) as f: content = f.read()
+            except:
+                RuntimeError(self.program, f'Unable to read from {filename}')
+            try:
+                if filename.endswith('.json'): content = json.loads(content)
+            except:
+                RuntimeError(self.program, 'Bad or null JSON string')
         value = {}
         value['type'] = 'text'
         value['content'] = content
@@ -1036,10 +1055,10 @@ class Core(Handler):
         program = command['program']
         code = program.code[program.pc]
         lino = str(code['lino'] + 1)
-        while len(lino) < 5: lino = f' {lino}'
+#        while len(lino) < 5: lino = f' {lino}'
         if value == None: value = '<empty>'
         if 'log' in command:
-            print(f'{datetime.now().time()}:{lino}-> {value}')
+            print(f'{datetime.now().time()}:{self.program.name}:{lino}->{value}')
         else:
             print(value)
         return self.nextPC()
@@ -1203,9 +1222,9 @@ class Core(Handler):
                 if record['keyword'] == 'module':
                     name = record['name']
                     command['module'] = name
-                else: RuntimeError(self.program, f'Symbol \'name\' is not a module')
-            else: RuntimeError(self.program, 'Module name expected after \'as\'')
-        else: RuntimeError(self.program, '\'as {module name}\' expected')
+                else: FatalError(self.compiler, f'Symbol \'name\' is not a module')
+            else: FatalError(self.compiler, 'Module name expected after \'as\'')
+        else: FatalError(self.compiler, '\'as {module name}\' expected')
         exports = []
         if self.peek() == 'with':
             self.nextToken()
@@ -1244,16 +1263,35 @@ class Core(Handler):
     def k_save(self, command):
         command['content'] = self.nextValue()
         if self.nextIs('to'):
-            command['file'] = self.nextValue()
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                if record['keyword'] == 'ssh':
+                    command['ssh'] = record['name']
+                    command['path'] = self.nextValue()
+                    self.add(command)
+                    return True
+            command['file'] = self.getValue()
             self.add(command)
             return True
         return False
 
     def r_save(self, command):
         content = self.getRuntimeValue(command['content'])
-        filename = self.getRuntimeValue(command['file'])
-        if filename.endswith('.json'): content = json.dumps(content)
-        with open(filename, 'w') as f: f.write(content)
+        if 'ssh' in command:
+            ssh = self.getVariable(command['ssh'])
+            path = self.getRuntimeValue(command['path'])
+            sftp = ssh['sftp']
+            try:
+                with sftp.open(path, 'w') as remote_file: remote_file.write(content.encode())
+            except:
+                RuntimeError(self.program, 'Unable to write to {path}')
+        else:
+            filename = self.getRuntimeValue(command['file'])
+            if filename.endswith('.json'): content = json.dumps(content)
+            try:
+                with open(filename, 'w') as f: f.write(content)
+            except:
+                RuntimeError(self.program, f'Unable to write to {filename}')
         return self.nextPC()
 
     # Send a message to a module
@@ -1276,16 +1314,40 @@ class Core(Handler):
 
     # Set a value
     # set {variable}
+    # set {ssh} host {host} user {user} password {password}
     # set the elements of {variable} to {value}
     # set element/property of {variable} to {value}
     def k_set(self, command):
         if self.nextIsSymbol():
-            target = self.getSymbolRecord()
-            if target['hasValue']:
+            record = self.getSymbolRecord()
+            command['target'] = record['name']
+            if record['hasValue']:
                 command['type'] = 'set'
-                command['target'] = target['name']
                 self.add(command)
                 return True
+            elif record['keyword'] == 'ssh':
+                host = None
+                user = None
+                password = None
+                while True:
+                    token = self.peek()
+                    if token == 'host':
+                        self.nextToken()
+                        host = self.nextValue()
+                    elif token == 'user':
+                        self.nextToken()
+                        user = self.nextValue()
+                    elif token == 'password':
+                        self.nextToken()
+                        password = self.nextValue()
+                    else: break
+                command['host'] = host
+                command['user'] = user
+                command['password'] = password
+                command['type'] = 'ssh'
+                self.add(command)
+                return True
+
             return False
 
         token = self.getToken()
@@ -1333,6 +1395,12 @@ class Core(Handler):
                         command['value'] = self.nextValue()
                         self.add(command)
                         return True
+        
+        elif token == 'path':
+            command['path'] = self.nextValue()
+            self.add(command)
+            return True
+
         return False
 
     def r_set(self, command):
@@ -1384,6 +1452,11 @@ class Core(Handler):
             self.encoding = self.getRuntimeValue(command['encoding'])
             return self.nextPC()
 
+        elif cmdType == 'path':
+            path = self.getRuntimeValue(command['path'])
+            os.chdir(path)
+            return self.nextPC()
+
         elif cmdType == 'property':
             value = self.getRuntimeValue(command['value'])
             name = self.getRuntimeValue(command['name'])
@@ -1403,6 +1476,17 @@ class Core(Handler):
             val['content'] = content
             self.putSymbolValue(targetVariable, val)
             return self.nextPC()
+        
+        elif cmdType == 'ssh':
+            target = self.getVariable(command['target'])
+            host = self.getRuntimeValue(command['host'])
+            user = self.getRuntimeValue(command['user'])
+            password = self.getRuntimeValue(command['password'])
+            ssh = paramiko.SSHClient()
+            ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+            ssh.connect(host, username=user, password=password)
+            target['sftp'] = ssh.open_sftp()
+            return self.nextPC()
 
     # Shuffle a list
     def k_shuffle(self, command):
@@ -1473,6 +1557,12 @@ class Core(Handler):
 
         return self.nextPC()
 
+    def k_ssh(self, command):
+        return self.compileVariable(command, False)
+
+    def r_ssh(self, command):
+        return self.nextPC()
+
     # Declare a stack variable
     def k_stack(self, command):
         return self.compileVariable(command)
@@ -1624,6 +1714,7 @@ class Core(Handler):
         target['locked'] = False
         return self.nextPC()
 
+    # Use a plugin module
     def k_use(self, command):
         if self.nextIs('graphics'):
             print('Loading graphics module')

{easycoder-250609.1 → easycoder-250611.1}/easycoder/ec_program.py

@@ -317,9 +317,8 @@ class Program:
 						queue = deque()
 						if self.parent != None:
 							self.releaseParent()
-						else:
-							self.running = False
-							break
+						self.running = False
+						break
 					elif self.pc == None or self.pc == 0 or self.pc >= len(self.code):
 						break
 

{easycoder-250609.1 → easycoder-250611.1}/pyproject.toml

@@ -14,6 +14,7 @@ dynamic = ["version"]
 dependencies = [
     "pytz",
     "requests",
+    "paramiko",
     "pyside6"
 ]