tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt(dev_plugin): add require path to remote script; optimize saved remote script's name

Browse Source
This commit is contained in:
hyb1996
2018-03-30 17:51:11 +08:00
parent af5bf8ecf2
commit 7a4eb33245
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/stardust/scriptdroid/model/script/Scripts.java
View File

@@ -100,7 +100,8 @@ public class Scripts {
public static ScriptExecution run(ScriptSource source) { public static ScriptExecution run(ScriptSource source) {
return AutoJs.getInstance().getScriptEngineService().execute(source, new ExecutionConfig() 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) { public static ScriptExecution runWithBroadcastSender(File file) {

6
app/src/main/java/com/stardust/scriptdroid/pluginclient/DevPluginResponseHandler.java
View File

@@ -71,7 +71,7 @@ public class DevPluginResponseHandler implements Handler {
} else { } else {
name = PFiles.getNameWithoutExtension(name); 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) { private void stopScript(String viewId) {
@@ -96,9 +96,7 @@ public class DevPluginResponseHandler implements Handler {
} }
name = PFiles.getNameWithoutExtension(name); name = PFiles.getNameWithoutExtension(name);
if (!name.endsWith(".js")) { if (!name.endsWith(".js")) {
name = "<remote>" + name + ".js"; name = name + ".js";
} else {
name = "<remote>" + name;
} }
PFiles.write(StorageFileProvider.DEFAULT_DIRECTORY_PATH + name, script); PFiles.write(StorageFileProvider.DEFAULT_DIRECTORY_PATH + name, script);
GlobalAppContext.toast(R.string.text_script_save_successfully); GlobalAppContext.toast(R.string.text_script_save_successfully);

1
common/src/main/java/com/stardust/pio/PFiles.java
View File

@@ -349,6 +349,7 @@ public class PFiles {
} }
public static String getName(String filePath) { public static String getName(String filePath) {
filePath = filePath.replace('\\', '/');
return new File(filePath).getName(); return new File(filePath).getName();
} }