Use audiobooks 13.0.0-beta0016, correct LCP book deletion.

ThePalaceProject · Jun 10, 2024 · b5954f7 · b5954f7
1 parent 005a505
commit b5954f7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/org.thepalaceproject.android.platform b/org.thepalaceproject.android.platform
diff --git a/...se/src/main/java/org/nypl/simplified/books/book_database/DatabaseFormatHandleAudioBook.kt b/...se/src/main/java/org/nypl/simplified/books/book_database/DatabaseFormatHandleAudioBook.kt
@@ -147,23 +147,6 @@ internal class DatabaseFormatHandleAudioBook internal constructor(
   }
 
   override fun deleteBookData() {
-    val newFormat = synchronized(this.dataLock) {
-      FileUtilities.fileDelete(this.filePosition)
-
-      if (this.fileBook.isDirectory) {
-        DirectoryUtilities.directoryDelete(this.fileBook)
-      } else {
-        FileUtilities.fileDelete(this.fileBook)
-      }
-
-      this.formatRef = this.formatRef.copy(
-        file = null,
-        lastReadLocation = null
-      )
-
-      this.formatRef
-    }
-
     val briefID = this.parameters.bookID.brief()
 
     this.log.debug("[{}]: deleting audio book data", briefID)
@@ -237,11 +220,25 @@ internal class DatabaseFormatHandleAudioBook internal constructor(
         }
       }
     } catch (ex: Exception) {
-      this.log.error("[{}]: failed to delete audio book: ", briefID, ex)
-      throw ex
+      this.log.error("[{}]: Problem deleting audio book: ", briefID, ex)
     }
 
-    this.parameters.onUpdated.invoke(newFormat)
+    this.parameters.onUpdated.invoke(synchronized(dataLock) {
+      FileUtilities.fileDelete(filePosition)
+
+      if (fileBook.isDirectory) {
+        DirectoryUtilities.directoryDelete(fileBook)
+      } else {
+        FileUtilities.fileDelete(fileBook)
+      }
+
+      formatRef = formatRef.copy(
+        file = null,
+        lastReadLocation = null
+      )
+
+      formatRef
+    })
   }
 
   override fun deleteBookmark(bookmarkId: BookmarkID) {