From 2b615a51fbe555bba72d94499ff92e208677de3a Mon Sep 17 00:00:00 2001 From: Nicholas Wallace Date: Sat, 8 Feb 2025 12:45:05 -0700 Subject: [PATCH] Remove: unused `AudioProbeResult.kt` --- .../app/data/AudioProbeResult.kt | 74 ------------------- .../com/audiobookshelf/app/data/AudioTrack.kt | 37 +++++----- .../app/device/FolderScanner.kt | 2 - 3 files changed, 20 insertions(+), 93 deletions(-) delete mode 100644 android/app/src/main/java/com/audiobookshelf/app/data/AudioProbeResult.kt diff --git a/android/app/src/main/java/com/audiobookshelf/app/data/AudioProbeResult.kt b/android/app/src/main/java/com/audiobookshelf/app/data/AudioProbeResult.kt deleted file mode 100644 index 7e3ed63b..00000000 --- a/android/app/src/main/java/com/audiobookshelf/app/data/AudioProbeResult.kt +++ /dev/null @@ -1,74 +0,0 @@ -package com.audiobookshelf.app.data - -import com.fasterxml.jackson.annotation.JsonIgnore -import com.fasterxml.jackson.annotation.JsonIgnoreProperties - -@JsonIgnoreProperties(ignoreUnknown = true) -data class AudioProbeStream( - val index:Int, - val codec_name:String, - val codec_long_name:String, - val channels:Int, - val channel_layout:String, - val duration:Double, - val bit_rate:Double -) - -@JsonIgnoreProperties(ignoreUnknown = true) -data class AudioProbeChapterTags( - val title:String -) - -@JsonIgnoreProperties(ignoreUnknown = true) -data class AudioProbeChapter( - val id:Int, - val start:Long, - val end:Long, - val tags:AudioProbeChapterTags? -) { - @JsonIgnore - fun getBookChapter():BookChapter { - val startS = start / 1000.0 - val endS = end / 1000.0 - val title = tags?.title ?: "Chapter $id" - return BookChapter(id, startS, endS, title) - } -} - -@JsonIgnoreProperties(ignoreUnknown = true) -data class AudioProbeFormatTags( - val artist:String?, - val album:String?, - val comment:String?, - val date:String?, - val genre:String?, - val title:String? -) - -@JsonIgnoreProperties(ignoreUnknown = true) -data class AudioProbeFormat( - val filename:String, - val format_name:String, - val duration:Double, - val size:Long, - val bit_rate:Double, - val tags:AudioProbeFormatTags? -) - -@JsonIgnoreProperties(ignoreUnknown = true) -class AudioProbeResult ( - val streams:MutableList, - val chapters:MutableList, - val format:AudioProbeFormat) { - - val duration get() = format.duration - val size get() = format.size - val title get() = format.tags?.title ?: format.filename.split("/").last() - val artist get() = format.tags?.artist ?: "" - - @JsonIgnore - fun getBookChapters(): List { - if (chapters.isEmpty()) return mutableListOf() - return chapters.map { it.getBookChapter() } - } -} diff --git a/android/app/src/main/java/com/audiobookshelf/app/data/AudioTrack.kt b/android/app/src/main/java/com/audiobookshelf/app/data/AudioTrack.kt index ca83aeac..f77adbf6 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/data/AudioTrack.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/data/AudioTrack.kt @@ -5,30 +5,33 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties @JsonIgnoreProperties(ignoreUnknown = true) data class AudioTrack( - var index:Int, - var startOffset:Double, - var duration:Double, - var title:String, - var contentUrl:String, - var mimeType:String, - var metadata:FileMetadata?, - var isLocal:Boolean, - var localFileId:String?, - var audioProbeResult:AudioProbeResult?, - var serverIndex:Int? // Need to know if server track index is different + var index: Int, + var startOffset: Double, + var duration: Double, + var title: String, + var contentUrl: String, + var mimeType: String, + var metadata: FileMetadata?, + var isLocal: Boolean, + var localFileId: String?, + var serverIndex: Int? // Need to know if server track index is different ) { @get:JsonIgnore - val startOffsetMs get() = (startOffset * 1000L).toLong() + val startOffsetMs + get() = (startOffset * 1000L).toLong() @get:JsonIgnore - val durationMs get() = (duration * 1000L).toLong() + val durationMs + get() = (duration * 1000L).toLong() @get:JsonIgnore - val endOffsetMs get() = startOffsetMs + durationMs + val endOffsetMs + get() = startOffsetMs + durationMs @get:JsonIgnore - val relPath get() = metadata?.relPath ?: "" + val relPath + get() = metadata?.relPath ?: "" @JsonIgnore - fun getBookChapter():BookChapter { - return BookChapter(index + 1,startOffset, startOffset + duration, title) + fun getBookChapter(): BookChapter { + return BookChapter(index + 1, startOffset, startOffset + duration, title) } } diff --git a/android/app/src/main/java/com/audiobookshelf/app/device/FolderScanner.kt b/android/app/src/main/java/com/audiobookshelf/app/device/FolderScanner.kt index 1bdd6b62..951b6a3b 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/device/FolderScanner.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/device/FolderScanner.kt @@ -144,7 +144,6 @@ class FolderScanner(var ctx: Context) { trackFileMetadata, true, localFileId, - null, audioTrackFromServer.index ) audioTracks.add(track) @@ -440,7 +439,6 @@ class FolderScanner(var ctx: Context) { trackFileMetadata, true, localFileId, - null, audioTrackFromServer.index ) audioTracks.add(track)