easycoder 250609.2__tar.gz → 250611.2__tar.gz

{easycoder-250609.2 → easycoder-250611.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 250609.2
+Version: 250611.2
 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-250609.2 → easycoder-250611.2}/easycoder/__init__.py

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

{easycoder-250609.2 → easycoder-250611.2}/easycoder/ec_core.py

@@ -751,13 +751,13 @@ class Core(Handler):
             try:
                 with sftp.open(path, 'r') as remote_file: content = remote_file.read().decode()
             except:
-                RuntimeError(self.program, 'Unable to read data')
+                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:
-                content = ''
+                RuntimeError(self.program, f'Unable to read from {filename}')
             try:
                 if filename.endswith('.json'): content = json.loads(content)
             except:
@@ -1055,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()
@@ -1263,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