Breaks stuff

2 files changed, 21 insertions, 17 deletions

diff --git a/subsonic-android/src/github/daneren2005/dsub/service/OfflineMusicService.java b/subsonic-android/src/github/daneren2005/dsub/service/OfflineMusicService.java
index 606eab88..17afbbcc 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/OfflineMusicService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/OfflineMusicService.java
@@ -166,6 +166,27 @@ public class OfflineMusicService extends RESTMusicService {
 					// Failed parseInt, just means track filled out
 				}
 			}
+			
+			try {
+				MediaMetadataRetriever metadata = new MediaMetadataRetriever();
+				metadata.setDataSource(file.getAbsolutePath());
+				String discNumber = metadata.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DISC_NUMBER);
+				if(discNumber == null) {
+					discNumber = "1/1";
+				}
+				int slashIndex = discNumber.indexOf("/");
+				if(slashIndex > 0) {
+					discNumber = discNumber.substring(0, slashIndex);
+				}
+				entry.setDiscNumber(Integer.parseInt(discNumber));
+				String bitrate = metadata.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE);
+				entry.setBitRate(Integer.parseInt((bitrate != null) ? bitrate : "0") / 1000);
+				String length = metadata.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);
+				entry.setDuration(Integer.parseInt(length) / 1000);
+				metadata.release();
+			} catch(Exception e) {
+				Log.i(TAG, "Device doesn't properly support MediaMetadataRetreiver");
+			}
         }
 		
         entry.setTitle(title);
diff --git a/subsonic-android/src/github/daneren2005/dsub/view/SongView.java b/subsonic-android/src/github/daneren2005/dsub/view/SongView.java
index 51927304..40bedad6 100644
--- a/subsonic-android/src/github/daneren2005/dsub/view/SongView.java
+++ b/subsonic-android/src/github/daneren2005/dsub/view/SongView.java
@@ -72,23 +72,6 @@ public class SongView extends UpdateView implements Checkable {
     public void setSong(MusicDirectory.Entry song, boolean checkable) {
         this.song = song;
 		
-		if(Util.isOffline(context)) {
-			DownloadFile downloadFile = new DownloadFile(context, song, false);
-			File file = downloadFile.getCompleteFile();
-			if(file.exists()) {
-				try {
-					MediaMetadataRetriever metadata = new MediaMetadataRetriever();
-					metadata.setDataSource(file.getAbsolutePath());
-					String bitrate = metadata.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE);
-					song.setBitRate(Integer.parseInt((bitrate != null) ? bitrate : "0") / 1000);
-					String length = metadata.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);
-					song.setDuration(Integer.parseInt(length) / 1000);
-				} catch(Exception e) {
-					Log.i(TAG, "Device doesn't properly support MediaMetadataRetreiver");
-				}
-			}
-		}
-		
         StringBuilder artist = new StringBuilder(40);
 
         String bitRate = null;