#361 Add duration, only selectively add track/year to MediaStore

1 files changed, 10 insertions, 3 deletions

diff --git a/src/github/daneren2005/dsub/service/MediaStoreService.java b/src/github/daneren2005/dsub/service/MediaStoreService.java
index 4de77bf2..d9e84515 100644
--- a/src/github/daneren2005/dsub/service/MediaStoreService.java
+++ b/src/github/daneren2005/dsub/service/MediaStoreService.java
@@ -56,10 +56,17 @@ public class MediaStoreService {
         values.put(MediaStore.MediaColumns.TITLE, song.getTitle());
         values.put(MediaStore.Audio.AudioColumns.ARTIST, song.getArtist());
         values.put(MediaStore.Audio.AudioColumns.ALBUM, song.getAlbum());
-        values.put(MediaStore.Audio.AudioColumns.TRACK, song.getTrack());
-        values.put(MediaStore.Audio.AudioColumns.YEAR, song.getYear());
         values.put(MediaStore.MediaColumns.DATA, songFile.getAbsolutePath());
         values.put(MediaStore.MediaColumns.MIME_TYPE, song.getContentType());
+		if(song.getDuration() != null) {
+			values.put(MediaStore.Audio.AudioColumns.DURATION, song.getDuration() * 1000L);
+		}
+		if(song.getTrack() != null) {
+			values.put(MediaStore.Audio.AudioColumns.TRACK, song.getTrack());
+		}
+		if(song.getYear() != null) {
+			values.put(MediaStore.Audio.AudioColumns.YEAR, song.getYear());
+		}
         values.put(MediaStore.Audio.AudioColumns.IS_MUSIC, 1);
 
         Uri uri = contentResolver.insert(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, values);
@@ -106,4 +113,4 @@ public class MediaStoreService {
         cursor.close();
     }
 
-}
\ No newline at end of file
+}