From c395bfbdc91fa8d2f1bfbbd14bb767a833dcad19 Mon Sep 17 00:00:00 2001
From: daneren2005 <daneren2005@gmail.com>
Date: Mon, 19 May 2014 15:19:21 -0700
Subject: Fix sync adapters when server is tag browsing

Sync adapters were always expecting to use getMusicDirectory, but both getStarred and getAlbumList will be returning id's for getArtist/getAlbum if the user is browsing by tags on that server.
---
 .../dsub/service/sync/SubsonicSyncAdapter.java         | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/github/daneren2005/dsub/service/sync/SubsonicSyncAdapter.java b/src/github/daneren2005/dsub/service/sync/SubsonicSyncAdapter.java
index eccdaee2..c08dab2e 100644
--- a/src/github/daneren2005/dsub/service/sync/SubsonicSyncAdapter.java
+++ b/src/github/daneren2005/dsub/service/sync/SubsonicSyncAdapter.java
@@ -50,6 +50,7 @@ import github.daneren2005.dsub.util.Util;
 public class SubsonicSyncAdapter extends AbstractThreadedSyncAdapter {
 	private static final String TAG = SubsonicSyncAdapter.class.getSimpleName();
 	protected CachedMusicService musicService = new CachedMusicService(new RESTMusicService());
+	protected boolean tagBrowsing;
 	private Context context;
 
 	public SubsonicSyncAdapter(Context context, boolean autoInitialize) {
@@ -108,6 +109,7 @@ public class SubsonicSyncAdapter extends AbstractThreadedSyncAdapter {
 		for(int i = 1; i <= servers; i++) {
 			try {
 				if(isValidServer(context, i)) {
+					tagBrowsing = Util.isTagBrowsing(context, instance);
 					musicService.setInstance(i);
 					onExecuteSync(context, i);
 				}
@@ -139,7 +141,21 @@ public class SubsonicSyncAdapter extends AbstractThreadedSyncAdapter {
 		}
 		
 		for (MusicDirectory.Entry dir: parent.getChildren(true, false)) {
-			if(downloadRecursively(paths, musicService.getMusicDirectory(dir.getId(), dir.getTitle(), true, context, null), context, save)) {
+			String id = dir.getId();
+			String name = dir.getTitle();
+			
+			MusicDirectory contents;
+			if(tagBrowsing) {
+				if(dir.getParent() == null || dir.getArtist() == null) {
+					contents = musicService.getArtist(id, name, true, context, null);
+				} else {
+					contents = musicService.getAlbum(id, name, true, context, null);
+				}
+			} else {
+				contents = musicService.getMusicDirectory(id name, true, context, null);
+			}
+			
+			if(downloadRecursively(paths, contents, context, save)) {
 				downloaded = true;
 			}
 		}
-- 
cgit v1.2.3