From 416efab10af847525186f936d98303735fa477ec Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Fri, 23 Aug 2024 00:24:30 +0200 Subject: samba: Style fixes Remove unused imports and shorten lone lines --- .../java/org/the_jk/cleversync/io/samba/SambaLink.kt | 20 ++++++++++++++------ .../org/the_jk/cleversync/samba/SambaTreeTest.kt | 2 -- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/SambaLink.kt b/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/SambaLink.kt index 9d9fd1d..2d0d080 100644 --- a/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/SambaLink.kt +++ b/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/SambaLink.kt @@ -15,9 +15,14 @@ internal class SambaLink( val (newPath, entry) = doResolve() if (entry == null) return ModifiableLink.NoTarget return when (entry.type) { - NativeSamba.DirEntryType.DIR -> ModifiableLink.ModifiableDirectoryTarget(SambaDirectory(conn, newPath, entry.name)) - NativeSamba.DirEntryType.FILE -> ModifiableLink.ModifiableFileTarget(SambaFile(conn, newPath, entry.name, entry.size, entry.lastModified)) - NativeSamba.DirEntryType.LINK -> ModifiableLink.NoTarget + NativeSamba.DirEntryType.DIR -> + ModifiableLink.ModifiableDirectoryTarget(SambaDirectory(conn, newPath, entry.name)) + NativeSamba.DirEntryType.FILE -> + ModifiableLink.ModifiableFileTarget( + SambaFile(conn, newPath, entry.name, entry.size, entry.lastModified), + ) + NativeSamba.DirEntryType.LINK -> + ModifiableLink.NoTarget } } @@ -37,9 +42,12 @@ internal class SambaLink( val (newPath, entry) = doResolve() if (entry == null) return Link.NoTarget return when (entry.type) { - NativeSamba.DirEntryType.DIR -> Link.DirectoryTarget(SambaDirectory(conn, newPath, entry.name)) - NativeSamba.DirEntryType.FILE -> Link.FileTarget(SambaFile(conn, newPath, entry.name, entry.size, entry.lastModified)) - NativeSamba.DirEntryType.LINK -> Link.NoTarget + NativeSamba.DirEntryType.DIR -> + Link.DirectoryTarget(SambaDirectory(conn, newPath, entry.name)) + NativeSamba.DirEntryType.FILE -> + Link.FileTarget(SambaFile(conn, newPath, entry.name, entry.size, entry.lastModified)) + NativeSamba.DirEntryType.LINK -> + Link.NoTarget } } diff --git a/libs/samba/src/test/java/org/the_jk/cleversync/samba/SambaTreeTest.kt b/libs/samba/src/test/java/org/the_jk/cleversync/samba/SambaTreeTest.kt index 5df61da..d2a2e04 100644 --- a/libs/samba/src/test/java/org/the_jk/cleversync/samba/SambaTreeTest.kt +++ b/libs/samba/src/test/java/org/the_jk/cleversync/samba/SambaTreeTest.kt @@ -11,12 +11,10 @@ import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -import org.the_jk.cleversync.io.Link import org.the_jk.cleversync.io.samba.SambaCredentials import java.io.File import java.nio.charset.StandardCharsets import java.nio.file.Files -import kotlin.io.path.createSymbolicLinkPointingTo @Config(manifest=Config.NONE) @RunWith(RobolectricTestRunner::class) -- cgit v1.2.3-70-g09d2