From 60adc118484b597cd733754e666f7a6aa605c01e Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Thu, 2 Sep 2021 14:18:10 +0200
Subject: [PATCH] Set track number in downloaded tracks

---
 .../play/database/AppDatabase.java             |  2 +-
 .../cappielloantonio/play/model/Download.java  | 18 ++++++++++++++++--
 .../com/cappielloantonio/play/model/Song.java  |  1 +
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java b/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
index e5bb46d8..9efb034c 100644
--- a/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
+++ b/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
@@ -15,7 +15,7 @@ import com.cappielloantonio.play.model.Queue;
 import com.cappielloantonio.play.model.RecentSearch;
 import com.cappielloantonio.play.model.Server;
 
-@Database(entities = {Queue.class, Server.class, RecentSearch.class, Download.class}, version = 16, exportSchema = false)
+@Database(entities = {Queue.class, Server.class, RecentSearch.class, Download.class}, version = 17, exportSchema = false)
 public abstract class AppDatabase extends RoomDatabase {
     private static final String TAG = "AppDatabase";
 
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Download.java b/app/src/main/java/com/cappielloantonio/play/model/Download.java
index f719fa67..5e2cfe43 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Download.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Download.java
@@ -31,6 +31,9 @@ public class Download {
     @ColumnInfo(name = "artistName")
     private String artistName;
 
+    @ColumnInfo(name = "trackNumber")
+    private int trackNumber;
+
     @ColumnInfo(name = "primary")
     private String primary;
 
@@ -40,13 +43,14 @@ public class Download {
     @ColumnInfo(name = "server")
     private String server;
 
-    public Download(String songID, String title, String albumId, String albumName, String artistId, String artistName, String primary, long duration, String server) {
+    public Download(@NonNull String songID, String title, String albumId, String albumName, String artistId, String artistName, int trackNumber, String primary, long duration, String server) {
         this.songID = songID;
         this.title = title;
         this.albumId = albumId;
         this.albumName = albumName;
         this.artistId = artistId;
         this.artistName = artistName;
+        this.trackNumber = trackNumber;
         this.primary = primary;
         this.duration = duration;
         this.server = server;
@@ -59,16 +63,18 @@ public class Download {
         this.albumName = song.getAlbumName();
         this.artistId = song.getArtistId();
         this.artistName = MusicUtil.normalizedArtistName(song.getArtistName());
+        this.trackNumber = song.getTrackNumber();
         this.primary = song.getPrimary();
         this.duration = song.getDuration();
         this.server = PreferenceUtil.getInstance(App.getInstance()).getServerId();
     }
 
+    @NonNull
     public String getSongID() {
         return songID;
     }
 
-    public void setSongID(String songID) {
+    public void setSongID(@NonNull String songID) {
         this.songID = songID;
     }
 
@@ -112,6 +118,14 @@ public class Download {
         this.artistName = artistName;
     }
 
+    public int getTrackNumber() {
+        return trackNumber;
+    }
+
+    public void setTrackNumber(int trackNumber) {
+        this.trackNumber = trackNumber;
+    }
+
     public String getPrimary() {
         return primary;
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Song.java b/app/src/main/java/com/cappielloantonio/play/model/Song.java
index aee409e3..7bddf66d 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Song.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Song.java
@@ -89,6 +89,7 @@ public class Song implements Parcelable {
         this.albumName = download.getAlbumName();
         this.artistId = download.getArtistId();
         this.artistName = download.getArtistName();
+        this.trackNumber = download.getTrackNumber();
         this.primary = download.getPrimary();
         this.duration = download.getDuration();
     }