github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-09 01:09:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate RemoteFile.moveTo(String) for ambiguous behavior (#1180)

Browse Source
This commit is contained in:
Him188 2021-04-09 18:33:12 +08:00 committed by GitHub
parent da2e7f5b47
commit 8d3a4fbf5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binary-compatibility-validator/android/api/binary-compatibility-validator-android.api
View File

@ -6071,7 +6071,7 @@ public abstract interface class net/mamoe/mirai/utils/RemoteFile {
public fun mkdir ()Z
public abstract fun mkdir (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public fun moveTo (Ljava/lang/String;)Z
public abstract fun moveTo (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public fun moveTo (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public fun moveTo (Lnet/mamoe/mirai/utils/RemoteFile;)Z
public abstract fun moveTo (Lnet/mamoe/mirai/utils/RemoteFile;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public fun renameTo (Ljava/lang/String;)Z

2
binary-compatibility-validator/api/binary-compatibility-validator.api
View File

@ -6100,7 +6100,7 @@ public abstract interface class net/mamoe/mirai/utils/RemoteFile {
public fun mkdir ()Z
public abstract fun mkdir (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public fun moveTo (Ljava/lang/String;)Z
public abstract fun moveTo (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public fun moveTo (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public fun moveTo (Lnet/mamoe/mirai/utils/RemoteFile;)Z
public abstract fun moveTo (Lnet/mamoe/mirai/utils/RemoteFile;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public fun renameTo (Ljava/lang/String;)Z

23
mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt
View File

@ -266,9 +266,11 @@ public interface RemoteFile {
public suspend fun renameTo(name: String): Boolean
/**
* 将这个目录或文件移动到另一个位置. 操作目录或非 Bot 自己上传的文件时需要管理员权限, 无管理员权限时返回 `false`.
* 将这个目录或文件移动到 [target] 位置. 操作目录或非 Bot 自己上传的文件时需要管理员权限, 无管理员权限时返回 `false`.
*
* [moveTo] 只会操作远程文件, 而不会修改当前 [RemoteFile.path].
*
* @param target 目标文件位置.
*/
public suspend fun moveTo(target: RemoteFile): Boolean
@ -276,8 +278,25 @@ public interface RemoteFile {
* 将这个目录或文件移动到另一个位置. 操作目录或非 Bot 自己上传的文件时需要管理员权限, 无管理员权限时返回 `false`.
*
* [moveTo] 只会操作远程文件, 而不会修改当前 [RemoteFile.path].
*
* **已弃用:** 当 [path] 是绝对路径时, 这个函数运行正常;
* 当它是相对路径时, 将会尝试把当前文件移动到 [RemoteFile.path] 下的子路径 [path], 因此总是失败.
*
* 使用参数为 [RemoteFile] 的 [moveTo] 代替.
*
* @suppress 在 2.6 弃用. 请使用 [moveTo]
*/
public suspend fun moveTo(path: String): Boolean
@Deprecated(
"Use moveTo(RemoteFile) instead.",
replaceWith = ReplaceWith("this.moveTo(this.resolveSibling(path))"),
level = DeprecationLevel.WARNING
)
public suspend fun moveTo(path: String): Boolean {
// Impl notes:
// if `path` is absolute, this works as intended.
// if not, `resolve(path)` will be a child path from this dir and fails always.
return moveTo(resolve(path))
}
/**
* 创建目录. 目录已经存在或无管理员权限时返回 `false`.

1
mirai-core/src/commonMain/kotlin/utils/RemoteFileImpl.kt
View File

@ -418,7 +418,6 @@ internal class RemoteFileImpl(
}
override suspend fun moveTo(path: String): Boolean = moveTo(resolve(path))
override suspend fun mkdir(): Boolean {
if (path == ROOT_PATH) return false
if (!isBotOperator()) return false