github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-24 20:43:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
赵怡然 2024-02-19 14:00:34 +08:00
parent 01a943dd0d
commit 160c81e3d0
8 changed files with 18 additions and 13 deletions
mirai-console
backend
integration-test/test
MiraiConsoleIntegrationTestBootstrap.kt
mirai-console
src/com/llamalab/safs
Files.java
kotlin/io/path
PathUtils.kt
test
TestMiraiConosle.kt
testFramework
MockConsoleImplementation.kt
frontend
mirai-console-frontend-base/src/logging
LogRecorder.kt
mirai-console-terminal/src
MiraiConsoleImplementationTerminal.kt
tools/intellij-plugin/src/diagnostics
TaskUtils.kt

3
mirai-console/backend/integration-test/test/MiraiConsoleIntegrationTestBootstrap.kt
View File

@ -17,9 +17,6 @@ import com.llamalab.safs.Files
import com.llamalab.safs.Paths
import java.util.*
import java.util.stream.Collectors
import kotlin.io.path.inputStream
import kotlin.io.path.isDirectory
import kotlin.io.path.name
import kotlin.reflect.KClass
import kotlin.test.Test
import kotlin.test.assertTrue

2
mirai-console/backend/mirai-console/src/com/llamalab/safs/Files.java
View File

@ -551,7 +551,7 @@ public final class Files {
public static File[] walk(@Nullable Path path) {
throw new NotImplementedException("我懒得写");
return path.toFile().listFiles();
}

10
mirai-console/backend/mirai-console/src/com/llamalab/safs/kotlin/io/path/PathUtils.kt
View File

@ -4,6 +4,7 @@ import com.llamalab.safs.Path
import com.llamalab.safs.Files
import com.llamalab.safs.OpenOption
import com.llamalab.safs.attribute.FileAttribute
import java.io.InputStream
import java.nio.charset.Charset
public inline fun Path.isRegularFile(vararg options: LinkOption): Boolean = Files.isRegularFile(this, *options)
@ -25,4 +26,11 @@ public inline fun createTempDirectory(prefix: String? = null, vararg attributes:
public fun Path.writeText(text: CharSequence, charset: Charset = Charsets.UTF_8, vararg options: OpenOption) {
Files.newOutputStream(this, *options).writer(charset).use { it.append(text) }
}
}
public inline fun Path.inputStream(vararg options: OpenOption): InputStream {
return Files.newInputStream(this, *options)
}
public val Path.name: String
get() = fileName?.toString().orEmpty()

2
mirai-console/backend/mirai-console/test/TestMiraiConosle.kt
View File

@ -28,7 +28,7 @@ import com.llamalab.safs.Path
import kotlin.coroutines.Continuation
import kotlin.coroutines.CoroutineContext
import kotlin.coroutines.resume
import kotlin.io.path.createTempDirectory
import com.llamalab.safs.kotlin.io.path.createTempDirectory
import kotlin.test.assertNotNull
internal object Testing {

2
mirai-console/backend/mirai-console/test/testFramework/MockConsoleImplementation.kt
View File

@ -32,7 +32,7 @@ import com.llamalab.safs.Path
import kotlin.contracts.InvocationKind
import kotlin.contracts.contract
import kotlin.coroutines.CoroutineContext
import kotlin.io.path.createTempDirectory
import com.llamalab.safs.kotlin.io.path.createTempDirectory
open class MockConsoleImplementation : MiraiConsoleImplementation {
final override val rootPath: Path = createTempDirectory()

6
mirai-console/frontend/mirai-console-frontend-base/src/logging/LogRecorder.kt
View File

@ -18,9 +18,9 @@ import net.mamoe.mirai.console.frontendbase.FrontendBase
import net.mamoe.mirai.console.util.AnsiMessageBuilder.Companion.dropAnsi
import net.mamoe.mirai.utils.childScope
import java.io.Writer
import com.llamalab.safs.Files
import com.llamalab.safs.Path
import com.llamalab.safs.StandardOpenOption
import compatibilty.java.nio.file.Files
import compatibilty.java.nio.file.Path
import compatibilty.java.nio.file.StandardOpenOption
import java.time.Instant
import java.time.ZoneId
import java.time.format.DateTimeFormatter

4
mirai-console/frontend/mirai-console-terminal/src/MiraiConsoleImplementationTerminal.kt
View File

@ -56,8 +56,8 @@ import org.jline.reader.impl.completer.NullCompleter
import org.jline.terminal.Terminal
import org.jline.terminal.TerminalBuilder
import org.jline.terminal.impl.AbstractWindowsTerminal
import com.llamalab.safs.Path
import com.llamalab.safs.Paths
import compatibilty.java.nio.file.Path
import compatibilty.java.nio.file.Paths
/**
* mirai-console-terminal 后端实现

2
mirai-console/tools/intellij-plugin/src/diagnostics/TaskUtils.kt
View File

@ -15,7 +15,7 @@ import com.intellij.openapi.vfs.VfsUtil
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.util.io.writeChild
import org.intellij.lang.annotations.Language
import com.llamalab.safs.Path
import java.nio.file.Path
val Path.vfOrNull: VirtualFile?
get() = LocalFileSystem.getInstance().refreshAndFindFileByPath(this.toAbsolutePath().toString())