6.6.2 - Alpha7 - 优化 files.path 及相关方法传入空值路径参数时的兼容性

Author: SuperMonster003

.changelog/lang_zh-Hans.json

@@ -16,7 +16,7 @@
         "notice 模块缺失 getBuilder 等扩展方法的问题 _[`issue #301`](http://issues.autojs6.com/301)_",
         "shizuku/shell 等方法无法接受字符串参数的问题 _[`issue #310`](http://issues.autojs6.com/310)_",
         "colors.pixel 方法无法接受单通道图像参数的问题 _[`issue #350`](http://issues.autojs6.com/350)_",
-        "engines.execScript/execScriptFile 等方法执行脚本时默认工作路径异常 _[`issue #340`](http://issues.autojs6.com/340)_ _[`issue #339`](http://issues.autojs6.com/339)_",
+        "engines.execScript/execScriptFile 等方法执行脚本时默认工作路径异常 _[`issue #358`](http://issues.autojs6.com/358)_ _[`issue #340`](http://issues.autojs6.com/340)_ _[`issue #339`](http://issues.autojs6.com/339)_",
         "floaty.window/floaty.rawWindow 无法在子线程执行的问题",
         "floaty.getClip 可能无法正常获取剪切板内容的问题 _[`issue #341`](http://issues.autojs6.com/341)_",
         "ui.inflate 返回值丢失 attr/on/click 等原型方法的问题",
@@ -49,6 +49,7 @@
         "尝试恢复 com.stardust 前缀包以便提升代码兼容性 _[`issue #290`](http://issues.autojs6.com/290)_",
         "floaty.window/floaty.rawWindow 同时支持主线程和子线程执行",
         "getClip 全局方法适时借助 floaty.getClip 方法以提升兼容性",
+        "files.path 及相关方法传入空值路径参数时的兼容性",
         "同步最新的 Rhino 引擎官方上游代码并进行必要的代码适配",
         "README.md 完善项目构建与运行相关内容 _[`issue #344`](http://issues.autojs6.com/344)_"
       ],

app/src/main/java/org/autojs/autojs/core/database/Database.java

@@ -26,7 +26,7 @@ public class Database extends SQLiteOpenHelper implements Closeable {
     private final TypeAdapter mTypeAdapter;
 
     public Database(@NonNull Context context, @NonNull ScriptRuntime scriptRuntime, @NonNull String name, int version, boolean readable, @Nullable DatabaseCallback databaseCallback, @NonNull TypeAdapter typeAdapter) {
-        super(context, scriptRuntime.files.path(name), null, version, databaseCallback == null ? null : new DatabaseErrorHandlerWrapper(databaseCallback));
+        super(context, scriptRuntime.files.nonNullPath(name), null, version, databaseCallback == null ? null : new DatabaseErrorHandlerWrapper(databaseCallback));
         mTypeAdapter = typeAdapter;
         mCallback = databaseCallback;
         mScriptRuntime = scriptRuntime;

app/src/main/java/org/autojs/autojs/core/ui/attribute/ImageViewAttributes.kt

@@ -50,11 +50,11 @@ open class ImageViewAttributes(scriptRuntime: ScriptRuntime, resourceParser: Res
     }
 
     private fun ScriptRuntime.getPath(s: String, def: String = s): String {
-        return if (this.files.exists(s)) this.files.path(s) else def
+        return if (this.files.exists(s)) this.files.nonNullPath(s) else def
     }
 
     private fun ScriptRuntime.getPath(s: String, def: (String) -> String): String {
-        return if (this.files.exists(s)) this.files.path(s) else def(s)
+        return if (this.files.exists(s)) this.files.nonNullPath(s) else def(s)
     }
 
     companion object {

app/src/main/java/org/autojs/autojs/core/ui/inflater/util/Drawables.kt

@@ -23,6 +23,7 @@ import java.io.File
 import java.net.URL
 import java.util.concurrent.Executors
 import java.util.regex.Pattern
+import androidx.core.graphics.drawable.toDrawable
 
 /**
  * Created by Stardust on Nov 3, 2017.
@@ -83,7 +84,7 @@ open class Drawables {
     }
 
     open fun decodeImage(context: Context, path: String?): Drawable? {
-        return BitmapDrawable(context.resources, BitmapFactory.decodeFile(path))
+        return BitmapFactory.decodeFile(path)?.toDrawable(context.resources)
     }
 
     fun parse(view: View, name: String) = parse(view.context, name)

app/src/main/java/org/autojs/autojs/extension/AnyExtensions.kt

@@ -133,7 +133,7 @@ object AnyExtensions {
 
     fun Any?.toRuntimePath(scriptRuntime: ScriptRuntime, isStrict: Boolean = false): String {
         if (isStrict && this.isJsNullish()) throw IllegalArgumentException(str(R.string.error_cannot_convert_value_into_a_script_runtime_path, this.jsBrief()))
-        return scriptRuntime.files.path(coerceString(this, "."))
+        return scriptRuntime.files.nonNullPath(coerceString(this, "."))
     }
 
 }

app/src/main/java/org/autojs/autojs/pio/PFiles.kt

@@ -109,7 +109,7 @@ object PFiles {
 
     @JvmOverloads
     @JvmStatic
-    fun read(file: File?, encoding: String? = "utf-8"): String {
+    fun read(file: File?, encoding: String? = DEFAULT_ENCODING): String {
         return try {
             read(FileInputStream(file), encoding)
         } catch (e: FileNotFoundException) {
@@ -118,21 +118,19 @@ object PFiles {
     }
 
     @JvmStatic
-    fun read(stream: InputStream, encoding: String?): String {
+    @JvmOverloads
+    fun read(inputStream: InputStream, encoding: String? = DEFAULT_ENCODING): String {
         return try {
-            val bytes = ByteArray(stream.available())
-            stream.read(bytes)
+            val bytes = ByteArray(inputStream.available())
+            inputStream.read(bytes)
             String(bytes, Charset.forName(encoding))
         } catch (e: IOException) {
             throw UncheckedIOException(e)
         } finally {
-            closeSilently(stream)
+            closeSilently(inputStream)
         }
     }
 
-    @JvmStatic
-    fun read(inputStream: InputStream) = read(inputStream, "utf-8")
-
     fun readBytes(stream: InputStream): ByteArray {
         return try {
             ByteArray(stream.available()).also { stream.read(it) }
@@ -203,7 +201,7 @@ object PFiles {
     }
 
     @JvmStatic
-    fun write(fileOutputStream: OutputStream, text: String) = write(fileOutputStream, text, "utf-8")
+    fun write(fileOutputStream: OutputStream, text: String) = write(fileOutputStream, text, DEFAULT_ENCODING)
 
     fun write(outputStream: OutputStream, text: String, encoding: String?) {
         try {

app/src/main/java/org/autojs/autojs/runtime/ScriptRuntime.kt

@@ -616,7 +616,7 @@ class ScriptRuntime private constructor(builder: Builder) {
 
     private fun doLoad(filter: FileFilter, vararg paths: String) {
         for (path in paths) {
-            val file = File(files.path(path))
+            val file = File(files.nonNullPath(path))
             if (file.isDirectory) {
                 val filtered = file.listFiles(filter)
                 if (filtered != null) {
@@ -636,7 +636,7 @@ class ScriptRuntime private constructor(builder: Builder) {
         try {
             val classLoader = sClassLoader
             for (path in paths) {
-                val file = File(files.path(path))
+                val file = File(files.nonNullPath(path))
                 if (file.isDirectory) {
                     val filtered = file.listFiles(filter)
                     if (filtered != null) {
@@ -657,7 +657,7 @@ class ScriptRuntime private constructor(builder: Builder) {
         try {
             val classLoader = sClassLoader
             for (path in paths) {
-                val file = File(files.path(path))
+                val file = File(files.nonNullPath(path))
                 if (file.isDirectory) {
                     val filtered = file.listFiles(filter)
                     if (filtered != null) {

app/src/main/java/org/autojs/autojs/runtime/api/Engines.kt

@@ -35,12 +35,12 @@ class Engines(private val mScriptRuntime: ScriptRuntime) {
         return execScriptInternal(name, script, config)
     }
 
-    fun execScriptFile(path: String?, config: ExecutionConfig?): ScriptExecution {
-        return AutoJs.instance.scriptEngineService.execute(JavaScriptFileSource(mScriptRuntime.files.path(path)), config)
+    fun execScriptFile(path: String, config: ExecutionConfig?): ScriptExecution {
+        return AutoJs.instance.scriptEngineService.execute(JavaScriptFileSource(mScriptRuntime.files.nonNullPath(path)), config)
     }
 
-    fun execAutoFile(path: String?, config: ExecutionConfig?): ScriptExecution {
-        return AutoJs.instance.scriptEngineService.execute(AutoFileSource(mScriptRuntime.files.path(path)), config)
+    fun execAutoFile(path: String, config: ExecutionConfig?): ScriptExecution {
+        return AutoJs.instance.scriptEngineService.execute(AutoFileSource(mScriptRuntime.files.nonNullPath(path)), config)
     }
 
     fun all(): NativeArray = engines.toNativeArray()