easycoder 250826.2__tar.gz → 250920.1__tar.gz

{easycoder-250826.2 → easycoder-250920.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easycoder
-Version: 250826.2
+Version: 250920.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>

{easycoder-250826.2 → easycoder-250920.1}/easycoder/__init__.py

@@ -12,4 +12,4 @@ from .ec_pyside import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250826.2"
+__version__ = "250920.1"

{easycoder-250826.2 → easycoder-250920.1}/easycoder/ec_compiler.py

@@ -211,7 +211,6 @@ class Compiler:
 			token = self.tokens[self.index]
 			keyword = token.token
 			if self.debugCompile: print(self.script.lines[token.lino])
-#			print(f'{keyword} - {line}')
 #			if keyword != 'else':
 			if self.compileOne() == True:
 				if self.index == len(self.tokens) - 1:

{easycoder-250826.2 → easycoder-250920.1}/easycoder/ec_core.py

@@ -1,5 +1,6 @@
 import json, math, hashlib, threading, os, subprocess, time
 import numbers, base64, binascii, random, requests, paramiko
+from copy import deepcopy
 from psutil import Process
 from datetime import datetime
 from .ec_classes import FatalError, RuntimeWarning, RuntimeError, AssertionError, NoValueError, NoValueRuntimeError, Condition, Object
@@ -276,7 +277,7 @@ class Core(Handler):
         return self.incdec(command, '-')
 
     # Delete a file or a property
-    # delete {filename}
+    # delete file {filename}
     # delete property {value} of {variable}
     # delete element {name} of {variable}
     def k_delete(self, command):
@@ -305,8 +306,8 @@ class Core(Handler):
         type = command['type']
         if type == 'file':
             filename = self.getRuntimeValue(command['filename'])
-            if os.path.isfile(filename):
-                os.remove(filename)
+            if filename != None:
+                if os.path.isfile(filename): os.remove(filename)
         elif type == 'property':
             key = self.getRuntimeValue(command['key'])
             symbolRecord = self.getVariable(command['var'])
@@ -1076,7 +1077,7 @@ class Core(Handler):
         return False
 
     def r_push(self, command):
-        value = self.getRuntimeValue(command['value'])
+        value = deepcopy(self.getRuntimeValue(command['value']))
         stackRecord = self.getVariable(command['to'])
         if stackRecord['keyword'] != 'stack':
             RuntimeError(self.program, f'{stackRecord["name"]} is not a stack')
@@ -1503,8 +1504,11 @@ class Core(Handler):
             ssh = paramiko.SSHClient()
             target['ssh'] = ssh
             ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-            ssh.connect(host, username=user, password=password)
-            target['sftp'] = ssh.open_sftp()
+            try:
+                ssh.connect(host, username=user, password=password, timeout=10)
+                target['sftp'] = ssh.open_sftp()
+            except:
+                target['error'] = f'Unable to connect to {host} (timeout)'
             return self.nextPC()
 
     # Shuffle a list
@@ -2108,14 +2112,24 @@ class Core(Handler):
             return value
 
         if token == 'error':
-            if self.peek() == 'code':
+            token = self.peek()
+            if token == 'code':
                 self.nextToken()
                 value['item'] = 'errorCode'
                 return value
-            if self.peek() == 'reason':
+            elif token == 'reason':
                 self.nextToken()
                 value['item'] = 'errorReason'
                 return value
+            elif token in ['in', 'of']:
+                self.nextToken()
+                if self.nextIsSymbol():
+                    record = self.getSymbolRecord()
+                    if record['keyword'] == 'ssh':
+                        value['item'] = 'sshError'
+                        value['name'] = record['name']
+                        return value
+            return None
 
         if token == 'type':
             if self.nextIs('of'):
@@ -2279,6 +2293,10 @@ class Core(Handler):
         elif v['item'] == 'errorReason':
             value['type'] = 'text'
             value['content'] = errorReason
+        elif v['item'] == 'sshError':
+            record = self.getVariable(v['name'])
+            value['type'] = 'text'
+            value['content'] = record['error'] if 'error' in record else ''
         return value
 
     def v_files(self, v):
@@ -2430,7 +2448,7 @@ class Core(Handler):
     def v_now(self, v):
         value = {}
         value['type'] = 'int'
-        value['content'] = getTimestamp(time.time())
+        value['content'] = int(time.time())
         return value
 
     def v_position(self, v):
@@ -2613,12 +2631,25 @@ class Core(Handler):
     def compileCondition(self):
         condition = Condition()
 
-        if self.getToken() == 'not':
+        token = self.getToken()
+
+        if token == 'not':
             condition.type = 'not'
             condition.value = self.nextValue()
             return condition
 
-        if self.getToken() == 'file':
+        elif token == 'error':
+            self.nextToken()
+            self.skip('in')
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                if record['keyword'] == 'ssh':
+                    condition.type = 'sshError'
+                    condition.target = record['name']
+                    return condition
+            return None
+
+        elif token == 'file':
             path = self.nextValue()
             condition.path = path
             condition.type = 'exists'
@@ -2798,6 +2829,13 @@ class Core(Handler):
 
     def c_odd(self, condition):
         return self.getRuntimeValue(condition.value1) % 2 == 1
+    
+    def c_sshError(self, condition):
+        target = self.getVariable(condition.target)
+        errormsg = target['error'] if 'error' in target else None
+        condition.errormsg = errormsg
+        test = errormsg != None
+        return not test if condition.negate else test
 
     def c_starts(self, condition):
         value1 = self.getRuntimeValue(condition.value1)

{easycoder-250826.2 → easycoder-250920.1}/easycoder/ec_pyside.py

@@ -81,6 +81,7 @@ class Graphics(Handler):
         def __init__(self):
             super().__init__()
             self.multiline = False
+            self.container = None
         
         def setContainer(self, container):
             self.container = container
@@ -96,6 +97,7 @@ class Graphics(Handler):
         def __init__(self):
             super().__init__()
             self.multiline = True
+            self.container = None
         
         def setContainer(self, container):
             self.container = container

easycoder-250920.1/scripts/test.ecs

@@ -0,0 +1,11 @@
+! test.ecs
+
+    script Test
+    
+    variable TS
+    variable Now
+    
+    put the timestamp of `17:00` format `%H:%M` into TS
+    put now into Now
+    print TS cat ` ` cat Now
+

easycoder-250920.1/test.py

@@ -0,0 +1,5 @@
+#!/bin/python3
+
+from easycoder import Program
+
+Program('/home/graham/dev/easycoder/easycoder-py/test.ecs').start()

easycoder-250826.2/scripts/test.ecs

@@ -1,3 +0,0 @@
-variable X
-print X
-

easycoder-250826.2/test.py

@@ -1,5 +0,0 @@
-#!/bin/python3
-
-from easycoder import Program
-
-Program('test.ecs').start()