From 7a4eb33245818cde4f00a8f718d9a10a99a48d01 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Fri, 30 Mar 2018 17:51:11 +0800
Subject: [PATCH] opt(dev_plugin): add require path to remote script; optimize
 saved remote script's name

---
 .../java/com/stardust/scriptdroid/model/script/Scripts.java | 3 ++-
 .../scriptdroid/pluginclient/DevPluginResponseHandler.java  | 6 ++----
 common/src/main/java/com/stardust/pio/PFiles.java           | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/stardust/scriptdroid/model/script/Scripts.java b/app/src/main/java/com/stardust/scriptdroid/model/script/Scripts.java
index 89c40a4d..45a28613 100644
--- a/app/src/main/java/com/stardust/scriptdroid/model/script/Scripts.java
+++ b/app/src/main/java/com/stardust/scriptdroid/model/script/Scripts.java
@@ -100,7 +100,8 @@ public class Scripts {
 
     public static ScriptExecution run(ScriptSource source) {
         return AutoJs.getInstance().getScriptEngineService().execute(source, new ExecutionConfig()
-                .executePath(StorageFileProvider.DEFAULT_DIRECTORY_PATH));
+                .executePath(StorageFileProvider.DEFAULT_DIRECTORY_PATH)
+                .requirePath(StorageFileProvider.DEFAULT_DIRECTORY_PATH));
     }
 
     public static ScriptExecution runWithBroadcastSender(File file) {
diff --git a/app/src/main/java/com/stardust/scriptdroid/pluginclient/DevPluginResponseHandler.java b/app/src/main/java/com/stardust/scriptdroid/pluginclient/DevPluginResponseHandler.java
index 101d0b74..890d9747 100644
--- a/app/src/main/java/com/stardust/scriptdroid/pluginclient/DevPluginResponseHandler.java
+++ b/app/src/main/java/com/stardust/scriptdroid/pluginclient/DevPluginResponseHandler.java
@@ -71,7 +71,7 @@ public class DevPluginResponseHandler implements Handler {
         } else {
             name = PFiles.getNameWithoutExtension(name);
         }
-        mScriptExecutions.put(viewId, Scripts.run(new StringScriptSource("<remote>:" + name, script)));
+        mScriptExecutions.put(viewId, Scripts.run(new StringScriptSource("[remote]" + name, script)));
     }
 
     private void stopScript(String viewId) {
@@ -96,9 +96,7 @@ public class DevPluginResponseHandler implements Handler {
         }
         name = PFiles.getNameWithoutExtension(name);
         if (!name.endsWith(".js")) {
-            name = "<remote>" + name + ".js";
-        } else {
-            name = "<remote>" + name;
+            name = name + ".js";
         }
         PFiles.write(StorageFileProvider.DEFAULT_DIRECTORY_PATH + name, script);
         GlobalAppContext.toast(R.string.text_script_save_successfully);
diff --git a/common/src/main/java/com/stardust/pio/PFiles.java b/common/src/main/java/com/stardust/pio/PFiles.java
index ca2ec4cb..9ad1a4d0 100644
--- a/common/src/main/java/com/stardust/pio/PFiles.java
+++ b/common/src/main/java/com/stardust/pio/PFiles.java
@@ -349,6 +349,7 @@ public class PFiles {
     }
 
     public static String getName(String filePath) {
+        filePath = filePath.replace('\\', '/');
         return new File(filePath).getName();
     }