Merge pull request #122 from Diegopyl1209/master

torrent changes from aniyomi

.gitattributes

@@ -22,5 +22,3 @@
 *.woff binary
 *.pyc binary
 *.swp binary
-
-*.aar binary

app/build.gradle.kts

@@ -281,7 +281,7 @@ dependencies {
  // true type parser
  implementation(libs.truetypeparser)
  // torrserver
- implementation(files("libs/server.aar"))
+ implementation(libs.torrentserver)
 }
 
 androidComponents {

app/src/main/java/eu/kanade/presentation/more/settings/Preference.kt

@@ -6,8 +6,8 @@ import android.os.Environment
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.vector.ImageVector
-import eu.kanade.tachiyomi.data.connections.ConnectionsService
 import eu.kanade.core.preference.asState
+import eu.kanade.tachiyomi.data.connections.ConnectionsService
 import eu.kanade.tachiyomi.data.track.Tracker
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap

app/src/main/java/eu/kanade/tachiyomi/data/torrentServer/service/TorrentServerService.kt

@@ -8,8 +8,6 @@ import android.content.Intent
 import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.IBinder
-import android.util.Log
-import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.torrentServer.TorrentServerApi
@@ -58,7 +56,6 @@ class TorrentServerService : Service() {
  private fun startServer() {
  serviceScope.launch {
  if (TorrentServerApi.echo() == "") {
- if (BuildConfig.DEBUG) Log.d("TorrentService", "startServer()")
  torrServer.TorrServer.startTorrentServer(filesDir.absolutePath)
  wait(10)
  TorrentServerUtils.setTrackersList()
@@ -68,7 +65,6 @@ class TorrentServerService : Service() {
 
  private fun stopServer() {
  serviceScope.launch {
- if (BuildConfig.DEBUG) Log.d("TorrentService", "stopServer()")
  torrServer.TorrServer.stopTorrentServer()
  TorrentServerApi.shutdown()
  applicationContext.cancelNotification(Notifications.ID_TORRENT_SERVER)
@@ -96,7 +92,7 @@ class TorrentServerService : Service() {
  )
  val builder = context.notificationBuilder(Notifications.CHANNEL_TORRENT_SERVER) {
  setSmallIcon(R.drawable.ic_sua)
- setContentText(stringResource(MR.strings.torrentserver_isrunning))
+ setContentText(stringResource(MR.strings.torrentserver_is_running))
  setContentTitle(stringResource(MR.strings.app_name))
  setAutoCancel(false)
  setOngoing(true)
@@ -134,7 +130,6 @@ class TorrentServerService : Service() {
  }
  applicationContext.startService(intent)
  } catch (e: Exception) {
- if (BuildConfig.DEBUG) Log.d("TorrentService", "start() error: ${e.message}")
  println(e.stackTrace)
  }
  }
@@ -148,7 +143,6 @@ class TorrentServerService : Service() {
  }
  applicationContext.startService(intent)
  } catch (e: Exception) {
- if (BuildConfig.DEBUG) Log.d("TorrentService", "stop() error: ${e.message}")
  println(e.stackTrace)
  }
  }

app/src/main/java/eu/kanade/tachiyomi/torrentutils/TorrentUtils.kt

@@ -1,34 +1,34 @@
 package eu.kanade.tachiyomi.torrentutils
 
 import eu.kanade.tachiyomi.data.torrentServer.TorrentServerApi
+import eu.kanade.tachiyomi.torrentutils.model.DeadTorrentException
 import eu.kanade.tachiyomi.torrentutils.model.TorrentFile
 import eu.kanade.tachiyomi.torrentutils.model.TorrentInfo
+import java.net.SocketTimeoutException
 
 /**
  * Used by extensions.
  */
 @Suppress("UNUSED")
 object TorrentUtils {
- fun getTorrentInfo(
+ suspend fun getTorrentInfo(
  url: String,
  title: String,
  ): TorrentInfo {
- val torrent = TorrentServerApi.addTorrent(url, title, "", "", false)
- return TorrentInfo(
- torrent.title,
- torrent.file_stats?.map { file ->
- TorrentFile(file.path, file.id ?: 0, file.length, torrent.hash!!)
- } ?: emptyList(),
- torrent.hash!!,
- torrent.torrent_size!!,
- torrent.trackers ?: emptyList(),
- )
- }
-
- fun getTorrentPlayUrl(
- torrent: TorrentInfo,
- indexFile: Int = 0,
- ): String {
- return torrent.files[indexFile].toVideoUrl()
+ @Suppress("SwallowedException")
+ try {
+ val torrent = TorrentServerApi.addTorrent(url, title, "", "", false)
+ return TorrentInfo(
+ torrent.title,
+ torrent.file_stats?.map { file ->
+ TorrentFile(file.path, file.id ?: 0, file.length, torrent.hash!!, torrent.trackers ?: emptyList())
+ } ?: emptyList(),
+ torrent.hash!!,
+ torrent.torrent_size!!,
+ torrent.trackers ?: emptyList(),
+ )
+ } catch (e: SocketTimeoutException) {
+ throw DeadTorrentException()
+ }
  }
 }

app/src/main/java/eu/kanade/tachiyomi/torrentutils/model/TorrentFile.kt

@@ -1,25 +1,16 @@
 package eu.kanade.tachiyomi.torrentutils.model
 
-import eu.kanade.tachiyomi.data.torrentServer.TorrentServerUtils
-import java.io.File
 import java.net.URLEncoder
 
 data class TorrentFile(
  val path: String,
  val indexFile: Int,
  val size: Long,
  private val torrentHash: String,
+ private val trackers: List<String> = emptyList(),
 ) {
- override fun toString(): String {
- return path
- }
-
- private fun getFileName(): String {
- return File(path).name
- }
-
- fun toVideoUrl(): String {
- val encodedName = URLEncoder.encode(getFileName(), "utf8")
- return "${TorrentServerUtils.hostUrl}/stream/$encodedName?link=$torrentHash&index=$indexFile&play"
+ fun toMagnetURI(): String {
+ val trackers = trackers.joinToString("&tr=") { URLEncoder.encode(it, "UTF-8") }
+ return "magnet:?xt=urn:btih:$torrentHash${if (trackers.isNotEmpty()) "&tr=$trackers" else ""}&index=$indexFile"
  }
 }

app/src/main/java/eu/kanade/tachiyomi/torrentutils/model/TorrentInfo.kt

@@ -6,4 +6,10 @@ data class TorrentInfo(
  val hash: String,
  val size: Long,
  val trackers: List<String> = emptyList(),
-)
+) {
+ fun setTrackers(trackers: List<String>): TorrentInfo {
+ return TorrentInfo(title, files, hash, size, trackers)
+ }
+}
+
+class DeadTorrentException : Exception()