From afc51f88f16c68257309a99d97fe618359708ed1 Mon Sep 17 00:00:00 2001
From: kostas214pro <kdoukas2006@gmail.com>
Date: Wed, 10 May 2023 00:53:24 +0300
Subject: [PATCH] Aria2c installed + bug fix

This commit contains the addition of the download library aria2c provided by youtubeDl-android to make download more reliable and fatser. Also a bug has been fixed in the song fragment where sometimes if there was no result for the given crash the app would crash. Also i added a better implementation of the progress bar bacuse using aria2c broke it
---
 .idea/gradle.xml                              |  1 +
 .idea/misc.xml                                |  2 +-
 app/build.gradle                              | 12 ++++++--
 app/src/main/AndroidManifest.xml              |  1 -
 .../example/spotifydownloader/Application.kt  |  2 ++
 .../Fragments/SongDownloadFragment.kt         | 14 ++++++---
 .../Fragments/SongFragment.kt                 | 30 +++++++++++--------
 .../Fragments/downloadFragment.kt             | 27 +++++++++++++----
 build.gradle                                  |  4 +--
 gradle.properties                             |  3 +-
 10 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f01eec3..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,6 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 773fe0f..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 51873f7..445aea5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ android {
         minSdk 24
         targetSdk 33
         versionCode 1
-        versionName "1.1.1"
+        versionName "1.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -51,6 +51,11 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
 }
 
 dependencies {
@@ -68,8 +73,9 @@ dependencies {
 
 
     //YoutubeDl
-    implementation "com.github.yausername.youtubedl-android:library:3a0252d88b4ae573068c63c3d08fc52c66102d55"
-    implementation "com.github.yausername.youtubedl-android:ffmpeg:3a0252d88b4ae573068c63c3d08fc52c66102d55"
+    implementation 'com.github.yausername.youtubedl-android:library:-SNAPSHOT'
+    implementation 'com.github.yausername.youtubedl-android:ffmpeg:-SNAPSHOT' // Optional
+    implementation 'com.github.yausername.youtubedl-android:aria2c:-SNAPSHOT'
 
     //Coroutines
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c62d250..d184238 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,6 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.SpotifyDownloader"
-        android:extractNativeLibs="true"
         tools:targetApi="33"
         android:name=".SpotifyDownloaderApplication">
         <activity
diff --git a/app/src/main/java/com/example/spotifydownloader/Application.kt b/app/src/main/java/com/example/spotifydownloader/Application.kt
index 02b8125..aaac1ae 100644
--- a/app/src/main/java/com/example/spotifydownloader/Application.kt
+++ b/app/src/main/java/com/example/spotifydownloader/Application.kt
@@ -3,6 +3,7 @@ package com.example.spotifydownloader
 import android.app.Application
 import android.widget.Toast
 import com.google.android.material.color.DynamicColors
+import com.yausername.aria2c.Aria2c
 import com.yausername.ffmpeg.FFmpeg
 import com.yausername.youtubedl_android.YoutubeDL
 import kotlinx.coroutines.Dispatchers
@@ -22,6 +23,7 @@ class SpotifyDownloaderApplication : Application(){
                 withContext(Dispatchers.IO) {
                     YoutubeDL.getInstance().init(this@SpotifyDownloaderApplication)
                     FFmpeg.getInstance().init(this@SpotifyDownloaderApplication)
+                    Aria2c.getInstance().init(this@SpotifyDownloaderApplication);
 
                     YoutubeDL.getInstance().updateYoutubeDL(this@SpotifyDownloaderApplication)
                     println(YoutubeDL.getInstance().version(this@SpotifyDownloaderApplication))
diff --git a/app/src/main/java/com/example/spotifydownloader/Fragments/SongDownloadFragment.kt b/app/src/main/java/com/example/spotifydownloader/Fragments/SongDownloadFragment.kt
index ed6c38e..cc987cd 100644
--- a/app/src/main/java/com/example/spotifydownloader/Fragments/SongDownloadFragment.kt
+++ b/app/src/main/java/com/example/spotifydownloader/Fragments/SongDownloadFragment.kt
@@ -223,6 +223,8 @@ class SongDownloadFragment : Fragment(R.layout.fragment_song_download) {
             request.addOption("--audio-format", "mp3")
             request.addOption("-R", "2")
             request.addOption("--socket-timeout", "40")
+            request.addOption("--downloader", "libaria2c.so");
+            request.addOption("--external-downloader-args", "aria2c:\"--summary-interval=1\"");
             println(request.buildCommand())
 
 
@@ -235,14 +237,15 @@ class SongDownloadFragment : Fragment(R.layout.fragment_song_download) {
                 try {
                     YoutubeDL.getInstance().execute(
                         request
-                    ) { progress: Float, _: Long, _: String? ->
+                    ) { _: Float, _: Long, status: String? ->
+                        Log.d(tag,status!!)
+                        if (binding.progressBar.progress<=90) {
 
-                        if(progress>0){
                             runOnUiThread {
-                                binding.progressBar.progress = progress.toInt()
+                                binding.progressBar.incrementProgressBy(6)
                             }
                         }
-                        //Log.d(tag,"Progress is $progress and the song is $songName")
+
 
 
 
@@ -289,6 +292,9 @@ class SongDownloadFragment : Fragment(R.layout.fragment_song_download) {
                 IOUtils.copy(ins, ops)
                 IOUtils.closeQuietly(ops)
                 IOUtils.closeQuietly(ins)
+                runOnUiThread {
+                    binding.progressBar.incrementProgressBy(10)
+                }
 
             }
             else if (!(isDeviceOnline(context as Activity))) {
diff --git a/app/src/main/java/com/example/spotifydownloader/Fragments/SongFragment.kt b/app/src/main/java/com/example/spotifydownloader/Fragments/SongFragment.kt
index 5d8d09b..753a10d 100644
--- a/app/src/main/java/com/example/spotifydownloader/Fragments/SongFragment.kt
+++ b/app/src/main/java/com/example/spotifydownloader/Fragments/SongFragment.kt
@@ -109,18 +109,24 @@ class SongFragment : Fragment(R.layout.fragment_song) {
                     val textInBox = binding.songNameEditText.text.toString()
                     val response =  spotifyApi.getSearch(textInBox)
 
-                    val searchResult = response.tracks.items[0]
-                    val regex = Regex("[^A-Za-z0-9]")
-
-
-                    songName = searchResult.name
-                    imgUrl = searchResult.album.images[0].url
-                    artistName = searchResult.artists[0].name
-                    filename = regex.replace(searchResult.name, "")
-                    albumName = searchResult.album.name
-                    albumArtistName = searchResult.album.artists[0].name
-                    releaseDate = searchResult.album.release_date
-                    succesCode = 0
+
+
+                    if (response.tracks.items.size !=0) {
+                        val searchResult = response.tracks.items[0]
+                        val regex = Regex("[^A-Za-z0-9]")
+                        songName = searchResult.name
+                        imgUrl = searchResult.album.images[0].url
+                        artistName = searchResult.artists[0].name
+                        filename = regex.replace(searchResult.name, "")
+                        albumName = searchResult.album.name
+                        albumArtistName = searchResult.album.artists[0].name
+                        releaseDate = searchResult.album.release_date
+                        succesCode = 0
+                    }
+                    else{
+                        succesCode = 2
+                    }
+                    
 
 
                 }catch (e:IOException){
diff --git a/app/src/main/java/com/example/spotifydownloader/Fragments/downloadFragment.kt b/app/src/main/java/com/example/spotifydownloader/Fragments/downloadFragment.kt
index 8f745f5..0b82963 100644
--- a/app/src/main/java/com/example/spotifydownloader/Fragments/downloadFragment.kt
+++ b/app/src/main/java/com/example/spotifydownloader/Fragments/downloadFragment.kt
@@ -309,6 +309,13 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
             request.addOption("--audio-format", "mp3")
             request.addOption("-R", "2")
             request.addOption("--socket-timeout", "40")
+
+            request.addOption("--downloader", "libaria2c.so")
+            request.addOption("--external-downloader-args", "aria2c:\"--summary-interval=1\"");
+
+
+
+
             println(request.buildCommand())
 
 
@@ -321,17 +328,20 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
                 try {
                     YoutubeDL.getInstance().execute(
                         request
-                    ) { progress: Float, _: Long, _: String? ->
-                        //Log.d(tag,"Progress is $progress and the song is $songName")
-                        if (progress >0){
-                            songItems[position].progress = progress.toInt()
+                    ) { _: Float, _: Long, status: String? ->
+
+                        Log.d(tag,status!!)
+
+                        if (songItems[position].progress<=90) {
+                            songItems[position].progress += 6
                             runOnUiThread {
                                 adapter.notifyItemChanged(position)
                             }
-
                         }
 
 
+
+
                     }
 
                 }
@@ -356,6 +366,7 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
                 }catch (e:IOException){
                     return 1
                 }
+
                 var destUri = data
                 val treeUri = Uri.parse(destUri.toString())
                 val docId = DocumentsContract.getTreeDocumentId(treeUri)
@@ -375,6 +386,12 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
                 IOUtils.copy(ins, ops)
                 IOUtils.closeQuietly(ops)
                 IOUtils.closeQuietly(ins)
+                songItems[position].progress += 10
+                runOnUiThread {
+                    adapter.notifyItemChanged(position)
+                }
+
+
 
                 }
             else if (!(isDeviceOnline(context as Activity))) {
diff --git a/build.gradle b/build.gradle
index 89bb50b..8d4b187 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '8.0.0' apply false
-    id 'com.android.library' version '8.0.0' apply false
+    id 'com.android.application' version '8.0.1' apply false
+    id 'com.android.library' version '8.0.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index a2e90d8..f2b979f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,4 +22,5 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.defaults.buildfeatures.buildconfig=true
-android.nonFinalResIds=false
\ No newline at end of file
+android.nonFinalResIds=false
+org.gradle.unsafe.configuration-cache=true
\ No newline at end of file