Remove old and slow simplePath from SAF, also autoformatted

android/app/src/main/java/com/audiobookshelf/app/data/DeviceClasses.kt

@@ -11,27 +11,41 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo
 import java.io.File
 
 enum class LockOrientationSetting {
-  NONE, PORTRAIT, LANDSCAPE
+  NONE,
+  PORTRAIT,
+  LANDSCAPE
 }
 
 enum class HapticFeedbackSetting {
-  OFF, LIGHT, MEDIUM, HEAVY
+  OFF,
+  LIGHT,
+  MEDIUM,
+  HEAVY
 }
 
 enum class ShakeSensitivitySetting {
-  VERY_LOW, LOW, MEDIUM, HIGH, VERY_HIGH
+  VERY_LOW,
+  LOW,
+  MEDIUM,
+  HIGH,
+  VERY_HIGH
 }
 
 enum class DownloadUsingCellularSetting {
-  ASK, ALWAYS, NEVER
+  ASK,
+  ALWAYS,
+  NEVER
 }
 
 enum class StreamingUsingCellularSetting {
-  ASK, ALWAYS, NEVER
+  ASK,
+  ALWAYS,
+  NEVER
 }
 
 enum class AndroidAutoBrowseSeriesSequenceOrderSetting {
-  ASC, DESC
+  ASC,
+  DESC
 }
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -55,7 +69,6 @@ data class LocalFile(
         var contentUrl: String,
         var basePath: String,
         var absolutePath: String,
-  var simplePath:String,
         var mimeType: String?,
         var size: Long
 ) {
@@ -101,19 +114,20 @@ data class LocalFolder(
         var contentUrl: String,
         var basePath: String,
         var absolutePath: String,
-  var simplePath:String,
         var storageType: String,
         var mediaType: String
 )
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
-@JsonSubTypes(
+@JsonSubTypes(JsonSubTypes.Type(LibraryItem::class), JsonSubTypes.Type(LocalLibraryItem::class))
-  JsonSubTypes.Type(LibraryItem::class),
-  JsonSubTypes.Type(LocalLibraryItem::class)
-)
 open class LibraryItemWrapper(var id: String) {
   @JsonIgnore
-  open fun getMediaDescription(progress:MediaProgressWrapper?, ctx: Context): MediaDescriptionCompat { return MediaDescriptionCompat.Builder().build() }
+  open fun getMediaDescription(
+          progress: MediaProgressWrapper?,
+          ctx: Context
+  ): MediaDescriptionCompat {
+    return MediaDescriptionCompat.Builder().build()
+  }
 }
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -193,18 +207,23 @@ data class DeviceSettings(
   }
 
   @get:JsonIgnore
-  val jumpBackwardsTimeMs get() = jumpBackwardsTime * 1000L
+  val jumpBackwardsTimeMs
+    get() = jumpBackwardsTime * 1000L
   @get:JsonIgnore
-  val jumpForwardTimeMs get() = jumpForwardTime * 1000L
+  val jumpForwardTimeMs
+    get() = jumpForwardTime * 1000L
   @get:JsonIgnore
-  val autoSleepTimerStartHour get() = autoSleepTimerStartTime.split(":")[0].toInt()
+  val autoSleepTimerStartHour
+    get() = autoSleepTimerStartTime.split(":")[0].toInt()
   @get:JsonIgnore
-  val autoSleepTimerStartMinute get() = autoSleepTimerStartTime.split(":")[1].toInt()
+  val autoSleepTimerStartMinute
+    get() = autoSleepTimerStartTime.split(":")[1].toInt()
   @get:JsonIgnore
-  val autoSleepTimerEndHour get() = autoSleepTimerEndTime.split(":")[0].toInt()
+  val autoSleepTimerEndHour
+    get() = autoSleepTimerEndTime.split(":")[0].toInt()
   @get:JsonIgnore
-  val autoSleepTimerEndMinute get() = autoSleepTimerEndTime.split(":")[1].toInt()
+  val autoSleepTimerEndMinute
-
+    get() = autoSleepTimerEndTime.split(":")[1].toInt()
 
   @JsonIgnore
   fun getShakeThresholdGravity(): Float { // Used in ShakeDetector

android/app/src/main/java/com/audiobookshelf/app/data/LocalLibraryItem.kt

@@ -100,7 +100,7 @@ class LocalLibraryItem(
 
   @JsonIgnore
   private fun trackExists(ctx: Context, contentUrl: String?, path: String): Boolean {
-    return LocalFile("", null, contentUrl ?: "", "", path, "", null, 0).exists(ctx)
+    return LocalFile("", null, contentUrl ?: "", "", path, null, 0).exists(ctx)
   }
 
   @JsonIgnore

android/app/src/main/java/com/audiobookshelf/app/data/LocalMediaItem.kt

@@ -14,7 +14,6 @@ data class LocalMediaItem(
         var mediaType: String,
         var folderId: String,
         var contentUrl: String,
-        var simplePath: String,
         var basePath: String,
         var absolutePath: String,
         var audioTracks: MutableList<AudioTrack>,

android/app/src/main/java/com/audiobookshelf/app/device/FolderScanner.kt

@@ -35,7 +35,6 @@ class FolderScanner(private val ctx: Context) {
               Uri.fromFile(file).toString(),
               file.getBasePath(ctx),
               file.absolutePath,
-              file.getSimplePath(ctx),
               file.mimeType,
               file.length()
       )
@@ -61,7 +60,6 @@ class FolderScanner(private val ctx: Context) {
               contentUrl,
               part.localFolderName,
               part.finalDestinationPath,
-              part.finalDestinationPath,
               mimeTypeFor(part),
               size
       )
@@ -81,7 +79,6 @@ class FolderScanner(private val ctx: Context) {
             document.uri.toString(),
             document.getBasePath(ctx),
             document.getAbsolutePath(ctx),
-            document.getSimplePath(ctx),
             document.mimeType,
             document.length()
     )

android/app/src/main/java/com/audiobookshelf/app/plugins/AbsFileSystem.kt

@@ -23,14 +23,17 @@ import java.io.File
 class AbsFileSystem : Plugin() {
   private val TAG = "AbsFileSystem"
   private val tag = "AbsFileSystem"
-  private var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())
+  private var jacksonMapper =
+          jacksonObjectMapper()
+                  .enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())
 
   lateinit var mainActivity: MainActivity
 
   override fun load() {
     mainActivity = (activity as MainActivity)
 
-    mainActivity.storage.storageAccessCallback = object : StorageAccessCallback {
+    mainActivity.storage.storageAccessCallback =
+            object : StorageAccessCallback {
               override fun onRootPathNotSelected(
                       requestCode: Int,
                       rootPath: String,
@@ -45,7 +48,13 @@ class AbsFileSystem : Plugin() {
                 Log.d(TAG, "STORAGE ACCESS CALLBACK")
               }
 
-      override fun onExpectedStorageNotSelected(requestCode: Int, selectedFolder: DocumentFile, selectedStorageType: StorageType, expectedBasePath: String, expectedStorageType: StorageType) {
+              override fun onExpectedStorageNotSelected(
+                      requestCode: Int,
+                      selectedFolder: DocumentFile,
+                      selectedStorageType: StorageType,
+                      expectedBasePath: String,
+                      expectedStorageType: StorageType
+              ) {
                 Log.d(TAG, "STORAGE ACCESS CALLBACK")
               }
 
@@ -65,16 +74,29 @@ class AbsFileSystem : Plugin() {
     val REQUEST_CODE_SELECT_FOLDER = 6
     val REQUEST_CODE_SDCARD_ACCESS = 7
 
-    mainActivity.storage.folderPickerCallback = object : FolderPickerCallback {
+    mainActivity.storage.folderPickerCallback =
+            object : FolderPickerCallback {
               override fun onFolderSelected(requestCode: Int, folder: DocumentFile) {
                 Log.d(TAG, "ON FOLDER SELECTED ${folder.uri} ${folder.name}")
                 val absolutePath = folder.getAbsolutePath(activity)
                 val storageType = folder.getStorageType(activity)
-        val simplePath = folder.getSimplePath(activity)
                 val basePath = folder.getBasePath(activity)
-        val folderId = android.util.Base64.encodeToString(folder.id.toByteArray(), android.util.Base64.DEFAULT)
+                val folderId =
+                        android.util.Base64.encodeToString(
+                                folder.id.toByteArray(),
+                                android.util.Base64.DEFAULT
+                        )
 
-        val localFolder = LocalFolder(folderId, folder.name ?: "", folder.uri.toString(),basePath,absolutePath, simplePath, storageType.toString(), mediaType)
+                val localFolder =
+                        LocalFolder(
+                                folderId,
+                                folder.name ?: "",
+                                folder.uri.toString(),
+                                basePath,
+                                absolutePath,
+                                storageType.toString(),
+                                mediaType
+                        )
 
                 DeviceManager.dbManager.saveLocalFolder(localFolder)
                 call.resolve(JSObject(jacksonMapper.writeValueAsString(localFolder)))
@@ -94,14 +116,20 @@ class AbsFileSystem : Plugin() {
                   val builder: AlertDialog.Builder = AlertDialog.Builder(mainActivity)
                   builder.setMessage(
                           "You have no write access to this storage, thus selecting this folder is useless." +
-              "\nWould you like to grant access to this folder?")
+                                  "\nWould you like to grant access to this folder?"
+                  )
                   builder.setNegativeButton("Dont Allow") { _, _ ->
                     run {
                       jsobj.put("error", "User Canceled, Access Denied")
                       call.resolve(jsobj)
                     }
                   }
-          builder.setPositiveButton("Allow.") { _, _ -> mainActivity.storageHelper.requestStorageAccess(REQUEST_CODE_SDCARD_ACCESS, initialPath = FileFullPath(mainActivity, storageId, "")) }
+                  builder.setPositiveButton("Allow.") { _, _ ->
+                    mainActivity.storageHelper.requestStorageAccess(
+                            REQUEST_CODE_SDCARD_ACCESS,
+                            initialPath = FileFullPath(mainActivity, storageId, "")
+                    )
+                  }
                   builder.show()
                 } else {
                   Log.d(TAG, "STORAGE ACCESS DENIED $requestCode")
@@ -110,14 +138,12 @@ class AbsFileSystem : Plugin() {
                 }
               }
 
-
               override fun onStoragePermissionDenied(requestCode: Int) {
                 Log.d(TAG, "STORAGE PERMISSION DENIED $requestCode")
                 val jsobj = JSObject()
                 jsobj.put("error", "Permission Denied")
                 call.resolve(jsobj)
               }
-
             }
 
     mainActivity.storage.openFolderPicker(REQUEST_CODE_SELECT_FOLDER)
@@ -196,7 +222,8 @@ class AbsFileSystem : Plugin() {
     if (localLibraryItem?.folderId?.startsWith("internal-") == true) {
       Log.d(tag, "Deleting internal library item at absolutePath $absolutePath")
       val file = File(absolutePath)
-      success = if (file.exists()) {
+      success =
+              if (file.exists()) {
                 file.deleteRecursively()
               } else {
                 true
@@ -207,9 +234,11 @@ class AbsFileSystem : Plugin() {
         val folder = DeviceManager.dbManager.getLocalFolder(folderId)
         folder?.absolutePath?.let { folderPath ->
           val splitAbsolutePath = absolutePath.split("/")
-          val fullSubDir = splitAbsolutePath.subList(0, splitAbsolutePath.size - 1).joinToString("/")
+          val fullSubDir =
+                  splitAbsolutePath.subList(0, splitAbsolutePath.size - 1).joinToString("/")
           if (fullSubDir != folderPath) {
-            val subdirHasAnItem = DeviceManager.dbManager.getLocalLibraryItems().any { _localLibraryItem ->
+            val subdirHasAnItem =
+                    DeviceManager.dbManager.getLocalLibraryItems().any { _localLibraryItem ->
                       if (_localLibraryItem.id == localLibraryItemId) {
                         false
                       } else {

plugins/capacitor/AbsDatabase.js

@@ -119,7 +119,6 @@ class AbsDatabaseWeb extends WebPlugin {
           name: 'Audiobooks',
           contentUrl: 'test',
           absolutePath: '/audiobooks',
-          simplePath: 'audiobooks',
           storageType: 'primary',
           mediaType: 'book'
         }
@@ -196,7 +195,6 @@ class AbsDatabaseWeb extends WebPlugin {
               filename: 'lf1.mp3',
               contentUrl: 'test',
               absolutePath: 'test',
-              simplePath: 'test',
               mimeType: 'audio/mpeg',
               size: 39048290
             }