Fix #4, add preload mechanics, fix #4 downloading/buffering progress …

…bars of local tracks

common/build.gradle

@@ -83,11 +83,13 @@ dependencies {
  implementation 'com.mattskala:itemadapter:0.3'
 
  // BitTorrent
- api files('libs/jlibtorrent-1.2.10.0.jar')
- api files('libs/jlibtorrent-android-arm64-1.2.10.0.jar')
- api files('libs/jlibtorrent-android-arm-1.2.10.0.jar')
- api files('libs/jlibtorrent-android-x86-1.2.10.0.jar')
- api files('libs/jlibtorrent-android-x86_64-1.2.10.0.jar')
+ api files('libs/jlibtorrent-1.2.5.0.jar')
+ api files('libs/jlibtorrent-android-arm64-1.2.5.0.jar')
+ api files('libs/jlibtorrent-android-arm-1.2.5.0.jar')
+ api files('libs/jlibtorrent-android-x86-1.2.5.0.jar')
+ api files('libs/jlibtorrent-android-x86_64-1.2.5.0.jar')
+
+// implementation 'com.github.TorrentStream:TorrentStream-Android:07f97b8'
 
  //This AAR dependency also contains jlibtorrent
  api files('libs/torrentstream-android.jar')

musicdao/src/main/java/com/example/musicdao/MusicService.kt

@@ -140,9 +140,10 @@ class MusicService : AppCompatActivity() {
  * Show libtorrent connectivity stats
  */
  fun getStatsOverview(): String {
- val startingMessage = "Starting libtorrent session..."
- if (!::torrentStream.isInitialized) return startingMessage
- val sessionManager = torrentStream.sessionManager ?: return startingMessage
+ if (!::torrentStream.isInitialized) return "Starting up torrent client..."
+ if (torrentStream.sessionManager == null) return "Starting up torrent client..."
+ if (!torrentStream.sessionManager.isRunning) return "Starting up torrent client..."
+ val sessionManager = torrentStream.sessionManager
  return "up: ${Util.readableBytes(sessionManager.uploadRate())}, down: ${
  Util.readableBytes(
  sessionManager.downloadRate()

musicdao/src/main/java/com/example/musicdao/net/ContentSeeder.kt

@@ -1,5 +1,6 @@
 package com.example.musicdao.net
 
+import com.example.musicdao.util.Util
 import com.frostwire.jlibtorrent.SessionManager
 import com.frostwire.jlibtorrent.TorrentInfo
 import org.apache.commons.io.FileUtils
@@ -32,9 +33,11 @@ class ContentSeeder(private val sessionManager: SessionManager, private val save
  count += 1
  // 'Downloading' the torrent file also starts seeding it after download has
  // already been completed
- // TODO enable seeding of all files that you have locally. Currently doing this
- // clashes with the TorrentStreaming library somehow
- // sessionManager.download(torrentInfo, saveDir)
+ // We only seed torrents that have previously already been fully downloaded,
+ // so that this does not clash with the TorrentStream library
+ if (Util.isTorrentCompleted(torrentInfo, saveDir)) {
+ sessionManager.download(torrentInfo, saveDir)
+ }
  }
  }
  }
@@ -52,7 +55,7 @@ class ContentSeeder(private val sessionManager: SessionManager, private val save
  }
  // TODO enable seeding of all files that you have locally. Currently doing this
  // clashes with the TorrentStreaming library somehow
- // sessionManager.download(torrentInfo, saveDir)
+ sessionManager.download(torrentInfo, saveDir)
  return true
  }
  return false

musicdao/src/main/java/com/example/musicdao/playlist/ReleaseFragment.kt

@@ -46,14 +46,32 @@ class ReleaseFragment(
  private var currentFileIndex = -1
  private var prevFileIndex = -1
  private var prevProgress = -1.0f
- private var localTorrent: Torrent? = null
+ private var streamingTorrent: Torrent? = null
+ private var downloadedTorrent: TorrentInfo? = null
 
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)
  setHasOptionsMenu(true)
- val torrentUrl = resolveTorrentUrl(magnet)
- if ((activity as MusicService).torrentStream.isStreaming) {
- (activity as MusicService).torrentStream.stopStream()
+ var torrentUrl = magnet
+ if (torrentInfoName != null) {
+ val torrentFileName =
+ "${context?.cacheDir}/$torrentInfoName.torrent"
+ val torrentFile = File(torrentFileName)
+ val saveDir = context?.cacheDir
+ if (torrentFile.isFile && TorrentInfo(torrentFile).isValid) {
+ // This means we have the torrent file already locally and we can skip the step of
+ // obtaining the TorrentInfo from magnet link
+ torrentUrl = torrentFile.toURI().toURL().toString()
+ if (saveDir != null &&
+ Util.isTorrentCompleted(TorrentInfo(torrentFile), saveDir)
+ ) {
+ // All files are already downloaded so we do not need to use TorrentStream
+ val torrentInfo = TorrentInfo(torrentFile)
+ setMetadata(torrentInfo.files(), preloaded = true)
+ downloadedTorrent = torrentInfo
+ return
+ }
+ }
  }
  (activity as MusicService).torrentStream.addListener(this)
  (activity as MusicService).torrentStream.startStream(torrentUrl)
@@ -79,16 +97,6 @@ class ReleaseFragment(
  }
  }
 
- override fun onResume() {
- super.onResume()
-
- if (release_table_layout.childCount == 0) {
- loadingTracks.visibility = View.VISIBLE
- } else {
- loadingTracks.visibility = View.GONE
- }
- }
-
  override fun onOptionsItemSelected(item: MenuItem): Boolean {
  return when (item.itemId) {
  // Debug button is a simple toggle for a connectivity stats display
@@ -112,9 +120,6 @@ class ReleaseFragment(
 
  override fun onDestroy() {
  (activity as MusicService).torrentStream.removeListener(this)
- if ((activity as MusicService).torrentStream.isStreaming) {
- (activity as MusicService).torrentStream.stopStream()
- }
  super.onDestroy()
  }
 
@@ -143,21 +148,26 @@ class ReleaseFragment(
  * This sets the metadata of the TorrentInfo in the UI, it renders the file list and other
  * metadata
  */
- private fun setMetadata(metadata: FileStorage) {
- loadingTracks.visibility = View.GONE
+ private fun setMetadata(metadata: FileStorage, preloaded: Boolean = false) {
+ loadingTracks?.visibility = View.GONE
  this.metadata = metadata
  val num = metadata.numFiles()
  val filestorage = metadata
 
  for (index in 0 until num) {
  var fileName = filestorage.fileName(index)
  fileName = Util.checkAndSanitizeTrackNames(fileName)
+ var progress: Int? = null
+ if (preloaded) {
+ progress = 100
+ }
  if (fileName != null) {
  val track = TrackFragment(
  fileName,
  index,
  this,
- Util.readableBytes(filestorage.fileSize(index))
+ Util.readableBytes(filestorage.fileSize(index)),
+ progress
  )
 
  // Add a table row (Track) to the table (Release)
@@ -187,7 +197,8 @@ class ReleaseFragment(
  val audioPlayer = AudioPlayer.getInstance()
  audioPlayer?.prepareNextTrack()
 
- val tor = localTorrent
+ val tor = streamingTorrent
+ val localTorrent = downloadedTorrent
  if (tor != null) {
  (activity as MusicService).torrentStream.removeListener(this)
  tor.setSelectedFileIndex(currentFileIndex)
@@ -201,6 +212,14 @@ class ReleaseFragment(
  AudioPlayer.getInstance()
  ?.setTrackInfo("Buffering track: " + tor.videoFile.nameWithoutExtension)
  }
+ } else if (localTorrent != null) {
+ val fileToPlay =
+ File("${context?.cacheDir}/${localTorrent.files().filePath(currentFileIndex)}")
+ // It is not a streaming torrent, and therefore we can conclude we already have
+ // it locally so we can just start playing it
+ if (fileToPlay.isFile && fileToPlay.length() > 1024 * 512) {
+ startPlaying(fileToPlay, currentFileIndex)
+ }
  }
  }
 
@@ -223,7 +242,9 @@ class ReleaseFragment(
  private fun startPlaying(file: File, index: Int) {
  val audioPlayer = AudioPlayer.getInstance()
  audioPlayer?.setAudioResource(file, index)
- audioPlayer?.setTrackInfo(file.nameWithoutExtension)
+ audioPlayer?.setTrackInfo(
+ Util.checkAndSanitizeTrackNames(file.name) ?: ""
+ )
  }
 
  fun resolveTorrentUrl(magnet: String): String {
@@ -232,7 +253,7 @@ class ReleaseFragment(
  val torrentFileName =
  "${context?.cacheDir}/$torrentInfoName.torrent"
  val torrentFile = File(torrentFileName)
- if (torrentFile.isFile) {
+ if (torrentFile.isFile && TorrentInfo(torrentFile).isValid) {
  // This means we have the torrent file already locally and we can skip the step of
  // obtaining the TorrentInfo from magnet link
  torrentUrl = torrentFile.toURI().toURL().toString()
@@ -259,7 +280,7 @@ class ReleaseFragment(
  override fun onStreamPrepared(torrent: Torrent?) {
  val fileProgress = torrent?.torrentHandle?.fileProgress()
  if (fileProgress != null) updateFileProgress(fileProgress)
- localTorrent = torrent
+ streamingTorrent = torrent
  if (torrent == null) return
  torrent.setSelectedFileIndex(0)
  torrent.startDownload()

musicdao/src/main/java/com/example/musicdao/playlist/TrackFragment.kt

@@ -14,13 +14,15 @@ class TrackFragment(
  private val name: String,
  private val index: Int,
  private val release: ReleaseFragment,
- private val size: String
+ private val size: String,
+ private val progress: Int?
 ) : Fragment(R.layout.track_table_row) {
  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
  super.onViewCreated(view, savedInstanceState)
  trackTitle.text = name
  trackArtist.text = size
  trackId.text = "${index + 1}."
+ if (progress != null) progressBar.progress = progress
 
  contentRow.setOnClickListener {
  release.selectTrackAndPlay(index)

musicdao/src/main/java/com/example/musicdao/util/Util.kt

@@ -3,6 +3,8 @@ package com.example.musicdao.util
 import com.frostwire.jlibtorrent.Priority
 import com.frostwire.jlibtorrent.TorrentInfo
 import com.github.se_bastiaan.torrentstream.Torrent
+import java.io.File
+
 
 object Util {
 
@@ -80,4 +82,28 @@ object Util {
  }
  return null
  }
+
+ /**
+ * Check if a torrent file has all its corresponding files downloaded
+ */
+ fun isTorrentCompleted(torrentInfo: TorrentInfo, saveDirectory: File): Boolean {
+ val dir = File(saveDirectory.path + "/" + torrentInfo.name())
+ if (!dir.isDirectory) return false
+ if (folderSize(dir) != torrentInfo.totalSize()) return false
+ return true
+ }
+
+ private fun folderSize(dir: File): Long {
+ var length = 0.toLong()
+ if (!dir.isDirectory) return 0
+ val files = dir.listFiles() ?: return 0
+ for (file in files) {
+ length += if (file.isFile) {
+ file.length()
+ } else {
+ folderSize(file)
+ }
+ }
+ return length
+ }
 }

musicdao/src/test/java/com/example/musicdao/net/ContentSeederTest.kt

@@ -17,7 +17,7 @@ class ContentSeederTest {
  val saveDir = File("./src/test/resources")
  Assert.assertTrue(saveDir.isDirectory)
  // Test whether it reads all local torrent files correctly
- contentSeeder = ContentSeeder.getInstance(sessionManager, saveDir)
+ contentSeeder = ContentSeeder.getInstance(saveDir)
  Assert.assertNotNull(contentSeeder)
  }