read_file, delete_file, and write_file

Deprecated some uses of load_app_data and store_app_data

src/main/java/carpet/script/CarpetExpression.java

@@ -2476,6 +2476,18 @@ public class CarpetExpression
 
     }
 
+    public static String recognizeResource(Value value)
+    {
+        String origfile = value.getString();
+        String file = origfile.toLowerCase(Locale.ROOT).replaceAll("[^A-Za-z0-9/]", "");
+        file = Arrays.stream(file.split("/+")).filter(s -> !s.isEmpty()).collect(Collectors.joining("/"));
+        if (file.isEmpty())
+        {
+            throw new InternalExpressionException("Cannot use "+origfile+" as resource name - must have some letters and numbers");
+        }
+        return file;
+    }
+
     private void API_AuxiliaryAspects()
     {
         this.expr.addLazyFunction("sound", -1, (c, t, lv) -> {
@@ -2864,13 +2876,6 @@ public class CarpetExpression
             // implmenetation should dock the task on the main thread.
         });
 
-        this.expr.addLazyFunction("logger", 1, (c, t, lv) ->
-        {
-            Value res = lv.get(0).evalValue(c);
-            CarpetSettings.LOG.error(res.getString());
-            return (_c, _t) -> res; // pass through for variables
-        });
-
         this.expr.addLazyFunction("run", 1, (c, t, lv) -> {
             BlockPos target = ((CarpetContext)c).origin;
             Vec3d posf = new Vec3d((double)target.getX()+0.5D,(double)target.getY(),(double)target.getZ()+0.5D);
@@ -3057,25 +3062,108 @@ public class CarpetExpression
             return (c_, t_) -> Value.TRUE;
         });
 
+        this.expr.addLazyFunction("logger", 1, (c, t, lv) ->
+        {
+            Value res = lv.get(0).evalValue(c);
+            CarpetSettings.LOG.error(res.getString());
+            return (_c, _t) -> res; // pass through for variables
+        });
+
+        this.expr.addLazyFunction("read_file", 2, (c, t, lv) -> {
+            String resource = recognizeResource(lv.get(0).evalValue(c));
+            String origtype = lv.get(1).evalValue(c).getString().toLowerCase(Locale.ROOT);
+            boolean shared = origtype.startsWith("shared_");
+            String type = shared ? origtype.substring(7) : origtype; //len(shared_)
+            if (!type.equals("raw") && !type.equals("text") && !type.equals("nbt"))
+                throw new InternalExpressionException("Unsupported file type: "+origtype);
+            Value retVal;
+            if (type.equals("nbt"))
+            {
+                Tag state = ((CarpetScriptHost)((CarpetContext)c).host).readFileTag(resource, shared);
+                if (state == null) return LazyValue.NULL;
+                retVal = new NBTSerializableValue(state);
+            }
+            else
+            {
+                List<String> content = ((CarpetScriptHost) ((CarpetContext) c).host).readTextResource(resource, shared);
+                if (content == null) return LazyValue.NULL;
+                retVal = ListValue.wrap(content.stream().map(StringValue::new).collect(Collectors.toList()));
+            }
+            return (cc, tt) -> retVal;
+        });
+
+        this.expr.addLazyFunction("delete_file", 2, (c, t, lv) -> {
+            String resource = recognizeResource(lv.get(0).evalValue(c));
+            String origtype = lv.get(1).evalValue(c).getString().toLowerCase(Locale.ROOT);
+            boolean shared = origtype.startsWith("shared_");
+            String type = shared ? origtype.substring(7) : origtype; //len(shared_)
+            if (!type.equals("raw") && !type.equals("text") && !type.equals("nbt"))
+                throw new InternalExpressionException("Unsupported file type: "+origtype);
+            boolean success = ((CarpetScriptHost)((CarpetContext)c).host).removeResourceFile(resource, shared, type);
+            return success?LazyValue.TRUE:LazyValue.FALSE;
+        });
+
+        this.expr.addLazyFunction("write_file", -1, (c, t, lv) -> {
+            if (lv.size() < 3) throw new InternalExpressionException("'write_file' requires three or more arguments");
+            String resource = recognizeResource(lv.get(0).evalValue(c));
+            String origtype = lv.get(1).evalValue(c).getString().toLowerCase(Locale.ROOT);
+            boolean shared = origtype.startsWith("shared_");
+            String type = shared ? origtype.substring(7) : origtype; //len(shared_)
+            if (!type.equals("raw") && !type.equals("text") && !type.equals("nbt"))
+                throw new InternalExpressionException("Unsupported file type: "+origtype);
+            boolean success;
+            if (type.equals("nbt"))
+            {
+                Value val = lv.get(2).evalValue(c);
+                NBTSerializableValue tagValue =  (val instanceof NBTSerializableValue)
+                        ? (NBTSerializableValue) val
+                        : new NBTSerializableValue(val.getString());
+                Tag tag = tagValue.getTag();
+                success = ((CarpetScriptHost)((CarpetContext)c).host).writeTagFile(tag, resource, shared);
+            }
+            else
+            {
+                List<String> data = new ArrayList<>();
+                if (lv.size()==3)
+                {
+                    Value val = lv.get(2).evalValue(c);
+                    if (val instanceof ListValue)
+                    {
+                        List<Value> lval = ((ListValue) val).getItems();
+                        lval.forEach(v -> data.add(v.getString()));
+                    }
+                    else
+                    {
+                        data.add(val.getString());
+                    }
+                }
+                else
+                {
+                    for(int i = 2; i < lv.size(); i++)
+                    {
+                        data.add(lv.get(i).evalValue(c).getString());
+                    }
+                }
+                success = ((CarpetScriptHost) ((CarpetContext) c).host).appendLogFile(resource, shared, type, data);
+            }
+            return success?LazyValue.TRUE:LazyValue.FALSE;
+        });
+
+        //write_file
+
         this.expr.addLazyFunction("load_app_data", -1, (c, t, lv) ->
         {
             String file = null;
             boolean shared = false;
             if (lv.size()>0)
             {
-                String origfile = lv.get(0).evalValue(c).getString();
-                file = origfile.toLowerCase(Locale.ROOT).replaceAll("[^A-Za-z0-9/]", "");
-                file = Arrays.stream(file.split("/+")).filter(s -> !s.isEmpty()).collect(Collectors.joining("/"));
-                if (file.isEmpty())
-                {
-                    throw new InternalExpressionException("Cannot use "+origfile+" as resource name - must have at least some letters and numbers");
-                }
+                file = recognizeResource(lv.get(0).evalValue(c));
                 if (lv.size() > 1)
                 {
                     shared = lv.get(1).evalValue(c).getBoolean();
                 }
             }
-            Tag state = ((CarpetScriptHost)((CarpetContext)c).host).getGlobalState(file, shared);
+            Tag state = ((CarpetScriptHost)((CarpetContext)c).host).readFileTag(file, shared);
             if (state == null)
                 return (cc, tt) -> Value.NULL;
             Value retVal = new NBTSerializableValue(state);
@@ -3091,13 +3179,7 @@ public class CarpetExpression
             boolean shared = false;
             if (lv.size()>1)
             {
-                String origfile = lv.get(1).evalValue(c).getString();
-                file = origfile.toLowerCase(Locale.ROOT).replaceAll("[^A-Za-z0-9/]", "");
-                file = Arrays.stream(file.split("/+")).filter(s -> !s.isEmpty()).collect(Collectors.joining("/"));
-                if (file.isEmpty())
-                {
-                    throw new InternalExpressionException("Cannot use "+origfile+" as resource name - must have some letters and numbers");
-                }
+                file = recognizeResource(lv.get(1).evalValue(c));
                 if (lv.size() > 2)
                 {
                     shared = lv.get(2).evalValue(c).getBoolean();
@@ -3107,7 +3189,7 @@ public class CarpetExpression
                     ? (NBTSerializableValue) val
                     : new NBTSerializableValue(val.getString());
             Tag tag = tagValue.getTag();
-            boolean success = ((CarpetScriptHost)((CarpetContext)c).host).setGlobalState(tag, file, shared);
+            boolean success = ((CarpetScriptHost)((CarpetContext)c).host).writeTagFile(tag, file, shared);
             return success?LazyValue.TRUE:LazyValue.FALSE;
         });
 

src/main/java/carpet/script/CarpetScriptHost.java

@@ -369,7 +369,7 @@ public class CarpetScriptHost extends ScriptHost
         return Module.getData(main, null, false);
     }
 
-    public Tag getGlobalState(String file, boolean isShared)
+    public Tag readFileTag(String file, boolean isShared)
     {
         if (getName() == null && !isShared) return null;
         if (file != null)
@@ -379,7 +379,7 @@ public class CarpetScriptHost extends ScriptHost
         return ((CarpetScriptHost)parent).globalState;
     }
 
-    public boolean setGlobalState(Tag tag, String file, boolean isShared)
+    public boolean writeTagFile(Tag tag, String file, boolean isShared)
     {
         if (getName() == null && !isShared) return false; // if belongs to an app, cannot be default host.
 
@@ -398,6 +398,25 @@ public class CarpetScriptHost extends ScriptHost
         return true;
     }
 
+    public boolean removeResourceFile(String resource, boolean isShared, String type)
+    {
+        if (getName() == null && !isShared) return false; //
+        return Module.dropExistingFile(main, resource, type.equals("nbt")?"nbt":"txt", isShared);
+    }
+
+    public boolean appendLogFile(String resource, boolean isShared, String type, List<String> data)
+    {
+        if (getName() == null && !isShared) return false; // if belongs to an app, cannot be default host.
+        return Module.appendToTextFile(main, resource, type, isShared, data);
+    }
+
+    public List<String> readTextResource(String resource, boolean isShared)
+    {
+        if (getName() == null && !isShared) return null; //
+        return Module.listFile(main, resource, "txt", isShared);
+    }
+
+
     public void tick()
     {
         if (this.saveTimeout > 0)

src/main/java/carpet/script/Tokenizer.java

@@ -173,9 +173,9 @@ public class Tokenizer implements Iterator<Tokenizer.Token>
                     }
                     else if (nextChar == 't')
                     {
-                        throw new ExpressionException(context, this.expression, token,
-                                "Tab character is not supported");
-                        //token.append('\t');
+                        //throw new ExpressionException(context, this.expression, token,
+                        //        "Tab character is not supported");
+                        token.append('\t');
                     }
                     else if (nextChar == 'r')
                     {

src/main/java/carpet/script/bundled/FileModule.java

@@ -1,17 +1,24 @@
 package carpet.script.bundled;
 
-import carpet.CarpetServer;
 import net.minecraft.nbt.PositionTracker;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.TagReaders;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
 public class FileModule extends Module
@@ -96,4 +103,44 @@ public class FileModule extends Module
         if (!file.exists()) file_2.renameTo(file);
         return true;
     }
+
+    public static boolean appendText(File filePath, boolean addNewLines, List<String> data)
+    {
+        try
+        {
+            OutputStream out = Files.newOutputStream(filePath.toPath(), StandardOpenOption.APPEND, StandardOpenOption.CREATE);
+            try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8)))
+            {
+                for (String line: data)
+                {
+                    writer.append(line);
+                    if (addNewLines) writer.newLine();
+                }
+            }
+        }
+        catch (IOException e)
+        {
+            return false;
+        }
+        return true;
+    }
+
+
+    public static List<String> listFileContent(File filePath)
+    {
+        try (BufferedReader reader = Files.newBufferedReader(filePath.toPath(), StandardCharsets.UTF_8)) {
+            List<String> result = new ArrayList<>();
+            for (;;) {
+                String line = reader.readLine();
+                if (line == null)
+                    break;
+                result.add(line.replaceAll("[\n\r]+",""));
+            }
+            return result;
+        }
+        catch (IOException e)
+        {
+            return null;
+        }
+    }
 }

src/main/java/carpet/script/bundled/Module.java

@@ -5,15 +5,14 @@ import net.minecraft.nbt.Tag;
 
 import java.io.File;
 import java.nio.file.Files;
-
-import static carpet.script.bundled.FileModule.read;
-import static carpet.script.bundled.FileModule.write;
+import java.util.List;
 
 public abstract class Module
 {
     public abstract String getName();
     public abstract String getCode();
     public abstract boolean isLibrary();
+    public final static Object writeIOSync = new Object();
 
     private static String getDescriptor(Module module, String file, boolean isShared)
     {
@@ -33,20 +32,48 @@ public abstract class Module
 
     public static Tag getData(Module module, String file, boolean isShared)
     {
-        if (!isShared && (module == null || module.getName() == null)) return null;
-        File dataFile = CarpetServer.minecraft_server.getLevelStorage().resolveFile(
-                CarpetServer.minecraft_server.getLevelName(), "scripts/"+getDescriptor(module, file, isShared)+".nbt");
+        File dataFile = resolveResource(module, file, "nbt", isShared);
+        if (dataFile == null) return null;
         if (!Files.exists(dataFile.toPath()) || !(dataFile.isFile())) return null;
-        return read(dataFile);
+        synchronized (writeIOSync) { return FileModule.read(dataFile); }
     }
 
     public static boolean saveData(Module module, String file, Tag globalState, boolean isShared)
     {
-        if (!isShared && (module == null || module.getName() == null)) return false;
-        File dataFile =CarpetServer.minecraft_server.getLevelStorage().resolveFile(
-                CarpetServer.minecraft_server.getLevelName(), "scripts/"+getDescriptor(module, file, isShared)+".nbt");
+        File dataFile = resolveResource(module, file, "nbt", isShared);
+        if (dataFile == null) return false;
         if (!Files.exists(dataFile.toPath().getParent()) && !dataFile.getParentFile().mkdirs()) return false;
-        return write(globalState, dataFile);
+        synchronized (writeIOSync) { return FileModule.write(globalState, dataFile); }
+    }
+
+    public static boolean appendToTextFile(Module module, String resourceName, String type, boolean isShared, List<String> message)
+    {
+        File dataFile = resolveResource(module, resourceName, "txt", isShared);
+        if (dataFile == null) return false;
+        if (!Files.exists(dataFile.toPath().getParent()) && !dataFile.getParentFile().mkdirs()) return false;
+        synchronized (writeIOSync) { return FileModule.appendText(dataFile, type.equals("text"), message); }
+    }
+
+    public static boolean dropExistingFile(Module module, String resourceName, String ext, boolean isShared)
+    {
+        File dataFile = resolveResource(module, resourceName, ext, isShared);
+        if (dataFile == null) return false;
+        synchronized (writeIOSync) { return dataFile.delete(); }
+    }
+
+    public static List<String> listFile(Module module, String resourceName, String ext, boolean isShared)
+    {
+        File dataFile = resolveResource(module, resourceName, ext, isShared);
+        if (dataFile == null) return null;
+        if (!dataFile.exists()) return null;
+        synchronized (writeIOSync) { return FileModule.listFileContent(dataFile); }
+    }
+
+    private static File resolveResource(Module module, String resourceName, String ext, boolean isShared)
+    {
+        if (!isShared && (module == null || module.getName() == null)) return null;
+        return CarpetServer.minecraft_server.getLevelStorage().resolveFile(
+                CarpetServer.minecraft_server.getLevelName(), "scripts/"+getDescriptor(module, resourceName, isShared)+"."+ext);
     }
 
     @Override