Implementing download percentage

mateusjdev · Jul 15, 2019 · 80223ba · 80223ba
1 parent 3e23d95
commit 80223ba
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.d3coding.gmusicapi"
         minSdkVersion 28
         targetSdkVersion 28
-        versionCode 25
-        versionName "0.23"
+        versionCode 26
+        versionName "0.24"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/com/d3coding/gmusicapi/GMusicFile.java b/app/src/main/java/com/d3coding/gmusicapi/GMusicFile.java
@@ -62,15 +62,15 @@ int getQueue(String uuid) {
         if (scan(uuid)) {
 
             new GMusicDB(context).insertUUIDbyDownloads(uuid);
-            Log.i("Download ALREADY completed:", uuid);
+            Log.i("Download ALREADY completed", uuid);
             return 1;
 
         } else {
             boolean t = false;
             for (Progress progress : ProgressList)
                 if (progress.UUID.equals(uuid)) {
                     t = true;
-                    Log.i("Download ALREADY in queue:", uuid);
+                    Log.i("Download ALREADY in queue", uuid);
                     break;
                 }
 
@@ -88,7 +88,7 @@ int getQueue(String uuid) {
                 ProgressList.get(taskId).percentage = 0.0f;
 
                 try {
-                    Log.i("Download STARTED:", uuid);
+                    Log.i("Download STARTED", uuid);
                     ProgressList.get(taskId).doing = Doing.inProgress;
 
                     AuthToken authToken = TokenProvider.provideToken(context.getSharedPreferences(context.getString(R.string.preferences_user)
@@ -116,7 +116,7 @@ int getQueue(String uuid) {
 
                     // Success
                     new GMusicDB(context).insertUUIDbyDownloads(trackMetadata.uuid);
-                    Log.i("Download FINISHED:", uuid);
+                    Log.i("Download FINISHED", uuid);
                     ProgressList.get(taskId).doing = Doing.completed;
                     ProgressList.get(taskId).percentage = 100f;
                     return 1;
@@ -142,6 +142,13 @@ int getQueue(String uuid) {
         }
     }
 
+    public Progress getQueueStatus(String uuid) {
+        for (Progress progress : ProgressList)
+            if (progress.UUID.equals(uuid))
+                return progress;
+        return null;
+    }
+
     public Bitmap getThumbBitmap(String uuid) {
         File thumbFile = new File(getPathJPG(uuid));
         if (thumbFile.exists())
@@ -155,7 +162,8 @@ public Bitmap getThumbBitmap(String uuid) {
 
                     if (!thumbFile.exists()) {
                         Files.copy(url.openStream(), Paths.get(thumbFile.getAbsolutePath()), StandardCopyOption.REPLACE_EXISTING);
-                        return Bitmap.createScaledBitmap(BitmapFactory.decodeFile(thumbFile.getAbsolutePath()), 200, 200, false);
+                        //return Bitmap.createScaledBitmap(BitmapFactory.decodeFile(thumbFile.getAbsolutePath()), 200, 200, false);
+                        return BitmapFactory.decodeFile(thumbFile.getAbsolutePath());
                     }
 
                 } catch (MalformedURLException e) {

diff --git a/app/src/main/java/com/d3coding/gmusicapi/HomeFragment.java b/app/src/main/java/com/d3coding/gmusicapi/HomeFragment.java
@@ -38,7 +38,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 public class HomeFragment extends Fragment {
 
@@ -169,16 +171,23 @@ public void onViewCreated(@NonNull View layoutView, @Nullable Bundle savedInstan
                 });
 
                 // TODO: getDownloadStatus
-                if (gmusicFile.getQueue(musicItem.getUUID()) != 0)
-                    synchronized (this) {
-                        ((Activity) getContext()).runOnUiThread(() -> {
-                            linearComplete.setVisibility(View.VISIBLE);
-                            linearDownloading.setVisibility(View.GONE);
-                            mAdapter.notifyItemChanged(position);
-                        });
-                    }
+
+                final ScheduledExecutorService exec = Executors.newScheduledThreadPool(1);
+
+                exec.scheduleAtFixedRate(() -> {
+                    GMusicFile.Progress progress = gmusicFile.getQueueStatus(musicItem.getUUID());
+
+                    if (progress.percentage <= 100)
+                        Log.i("Progress:", String.valueOf(progress.percentage));
+
+                    if (progress.doing == GMusicFile.Doing.completed)
+                        exec.shutdown();
+                }, 100, 100, TimeUnit.MILLISECONDS);
+
+                builder.setOnCancelListener((dialog) -> exec.shutdown());
             }
 
+
             vView.findViewById(R.id.opt_bt_play).setOnClickListener((view2) -> {
                 Uri uri = FileProvider.getUriForFile(getContext(), getContext().getPackageName() + ".fileprovider",
                         new File(new File(Environment.getExternalStorageDirectory(), "Gmusicapi"), musicItem.getUUID() + ".mp3"));