antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made the due distinction based on the server on the most listened to songs of the week

Browse source
This commit is contained in:
antonio 2023-01-06 18:30:07 +01:00
parent 5eed437c5b
commit 1204716a65
6 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
View file

@ -23,13 +23,11 @@ import com.cappielloantonio.play.model.Server;
@SuppressLint("RestrictedApi") @SuppressLint("RestrictedApi")
@Database( @Database(
version = 42, version = 43,
entities = {Queue.class, Server.class, RecentSearch.class, Download.class, Playlist.class, Chronology.class}, entities = {Queue.class, Server.class, RecentSearch.class, Download.class, Playlist.class, Chronology.class},
autoMigrations = {@AutoMigration(from = 41, to = 42)} autoMigrations = {@AutoMigration(from = 42, to = 43)}
) )
public abstract class AppDatabase extends RoomDatabase { public abstract class AppDatabase extends RoomDatabase {
private static final String TAG = "AppDatabase";
private final static String DB_NAME = "play_db"; private final static String DB_NAME = "play_db";
private static AppDatabase instance; private static AppDatabase instance;

4
app/src/main/java/com/cappielloantonio/play/database/dao/ChronologyDao.java
View file

@ -12,8 +12,8 @@ import java.util.List;
@Dao @Dao
public interface ChronologyDao { public interface ChronologyDao {
@Query("SELECT * FROM chronology WHERE timestamp >= :startDate AND timestamp < :endDate GROUP BY id ORDER BY COUNT(id) DESC LIMIT 9") @Query("SELECT * FROM chronology WHERE timestamp >= :startDate AND timestamp < :endDate AND server == :server GROUP BY id ORDER BY COUNT(id) DESC LIMIT 9")
LiveData<List<Chronology>> getAllFrom(long startDate, long endDate); LiveData<List<Chronology>> getAllFrom(long startDate, long endDate, String server);
@Insert(onConflict = OnConflictStrategy.REPLACE) @Insert(onConflict = OnConflictStrategy.REPLACE)
void insert(Chronology chronologyObject); void insert(Chronology chronologyObject);

16
app/src/main/java/com/cappielloantonio/play/model/Chronology.java
View file

@ -49,7 +49,10 @@ public class Chronology implements Parcelable {
@ColumnInfo(name = "timestamp") @ColumnInfo(name = "timestamp")
private Long timestamp; private Long timestamp;
public Chronology(String trackId, String title, String albumId, String albumName, String artistId, String artistName, String coverArtId, long duration, String container, int bitrate, String extension) { @ColumnInfo(name = "server")
private String server;
public Chronology(String trackId, String title, String albumId, String albumName, String artistId, String artistName, String coverArtId, long duration, String container, int bitrate, String extension, String server) {
this.trackId = trackId; this.trackId = trackId;
this.title = title; this.title = title;
this.albumId = albumId; this.albumId = albumId;
@ -62,6 +65,7 @@ public class Chronology implements Parcelable {
this.bitrate = bitrate; this.bitrate = bitrate;
this.extension = extension; this.extension = extension;
this.timestamp = System.currentTimeMillis(); this.timestamp = System.currentTimeMillis();
this.server = server;
} }
public int getUuid() { public int getUuid() {
@ -168,6 +172,14 @@ public class Chronology implements Parcelable {
this.timestamp = timestamp; this.timestamp = timestamp;
} }
public String getServer() {
return server;
}
public void setServer(String server) {
this.server = server;
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
@ -207,6 +219,7 @@ public class Chronology implements Parcelable {
dest.writeInt(this.bitrate); dest.writeInt(this.bitrate);
dest.writeString(this.extension); dest.writeString(this.extension);
dest.writeLong(this.timestamp); dest.writeLong(this.timestamp);
dest.writeString(this.server);
} }
protected Chronology(Parcel in) { protected Chronology(Parcel in) {
@ -222,6 +235,7 @@ public class Chronology implements Parcelable {
this.bitrate = in.readInt(); this.bitrate = in.readInt();
this.extension = in.readString(); this.extension = in.readString();
this.timestamp = in.readLong(); this.timestamp = in.readLong();
this.server = in.readString();
} }
public static final Creator<Chronology> CREATOR = new Creator<Chronology>() { public static final Creator<Chronology> CREATOR = new Creator<Chronology>() {

8
app/src/main/java/com/cappielloantonio/play/repository/ChronologyRepository.java
View file

@ -21,7 +21,7 @@ public class ChronologyRepository {
chronologyDao = database.chronologyDao(); chronologyDao = database.chronologyDao();
} }
public LiveData<List<Chronology>> getThisWeek() { public LiveData<List<Chronology>> getThisWeek(String server) {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
Calendar first = (Calendar) calendar.clone(); Calendar first = (Calendar) calendar.clone();
@ -30,10 +30,10 @@ public class ChronologyRepository {
Calendar last = (Calendar) first.clone(); Calendar last = (Calendar) first.clone();
last.add(Calendar.DAY_OF_YEAR, 6); last.add(Calendar.DAY_OF_YEAR, 6);
return chronologyDao.getAllFrom(first.getTime().getTime(), last.getTime().getTime()); return chronologyDao.getAllFrom(first.getTime().getTime(), last.getTime().getTime(), server);
} }
public LiveData<List<Chronology>> getLastWeek() { public LiveData<List<Chronology>> getLastWeek(String server) {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
Calendar first = (Calendar) calendar.clone(); Calendar first = (Calendar) calendar.clone();
@ -42,7 +42,7 @@ public class ChronologyRepository {
Calendar last = (Calendar) first.clone(); Calendar last = (Calendar) first.clone();
last.add(Calendar.DAY_OF_YEAR, 6); last.add(Calendar.DAY_OF_YEAR, 6);
return chronologyDao.getAllFrom(first.getTime().getTime(), last.getTime().getTime()); return chronologyDao.getAllFrom(first.getTime().getTime(), last.getTime().getTime(), server);
} }
public void insert(Chronology item) { public void insert(Chronology item) {

4
app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java
View file

@ -217,6 +217,7 @@ public class MappingUtil {
bundle.putString("container", media.getContainer()); bundle.putString("container", media.getContainer());
bundle.putInt("bitrate", media.getBitrate()); bundle.putInt("bitrate", media.getBitrate());
bundle.putString("extension", media.getExtension()); bundle.putString("extension", media.getExtension());
bundle.putString("server", PreferenceUtil.getInstance(context).getServerId());
return new MediaItem.Builder() return new MediaItem.Builder()
.setMediaId(media.getId()) .setMediaId(media.getId())
@ -283,7 +284,8 @@ public class MappingUtil {
(long) item.mediaMetadata.extras.get("duration"), (long) item.mediaMetadata.extras.get("duration"),
item.mediaMetadata.extras.get("container").toString(), item.mediaMetadata.extras.get("container").toString(),
(int) item.mediaMetadata.extras.get("bitrate"), (int) item.mediaMetadata.extras.get("bitrate"),
item.mediaMetadata.extras.get("extension").toString() item.mediaMetadata.extras.get("extension").toString(),
item.mediaMetadata.extras.get("server").toString()
); );
} }

5
app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java
View file

@ -80,12 +80,13 @@ public class HomeViewModel extends AndroidViewModel {
public LiveData<List<Chronology>> getGridSongSample(LifecycleOwner owner) { public LiveData<List<Chronology>> getGridSongSample(LifecycleOwner owner) {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
int dayOfMonth = cal.get(Calendar.DAY_OF_MONTH); int dayOfMonth = cal.get(Calendar.DAY_OF_MONTH);
String server = PreferenceUtil.getInstance(App.getInstance()).getServerId();
if (thisGridTopSong.getValue() == null) { if (thisGridTopSong.getValue() == null) {
if (dayOfMonth >= 7) { if (dayOfMonth >= 7) {
chronologyRepository.getThisWeek().observe(owner, thisGridTopSong::postValue); chronologyRepository.getThisWeek(server).observe(owner, thisGridTopSong::postValue);
} else { } else {
chronologyRepository.getLastWeek().observe(owner, thisGridTopSong::postValue); chronologyRepository.getLastWeek(server).observe(owner, thisGridTopSong::postValue);
} }
} }