From b8e1a579d931e274785f865889b1e395415cb10f Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sat, 23 Nov 2013 15:20:22 -0800
Subject: Fix web commits

---
 .../dsub/service/sync/PlaylistSyncAdapter.java     | 32 ++++++++++++--------
 .../dsub/service/sync/PodcastSyncAdapter.java      | 35 +++++++++++++---------
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/src/github/daneren2005/dsub/service/sync/PlaylistSyncAdapter.java b/src/github/daneren2005/dsub/service/sync/PlaylistSyncAdapter.java
index 0047b997..54c21f75 100644
--- a/src/github/daneren2005/dsub/service/sync/PlaylistSyncAdapter.java
+++ b/src/github/daneren2005/dsub/service/sync/PlaylistSyncAdapter.java
@@ -19,16 +19,16 @@
 
 package github.daneren2005.dsub.service.sync;
 
-import android.accounts.Account;
 import android.annotation.TargetApi;
-import android.content.AbstractThreadedSyncAdapter;
-import android.content.ContentProviderClient;
 import android.content.Context;
-import android.content.SyncResult;
-import android.os.Bundle;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.Playlist;
 import github.daneren2005.dsub.service.DownloadFile;
+import github.daneren2005.dsub.util.FileUtil;
 import github.daneren2005.dsub.util.Util;
 
 /**
@@ -36,6 +36,8 @@ import github.daneren2005.dsub.util.Util;
 */
 
 public class PlaylistSyncAdapter extends SubsonicSyncAdapter {
+	private static String TAG = PlaylistSyncAdapter.class.getSimpleName();
+
 	public PlaylistSyncAdapter(Context context, boolean autoInitialize) {
 		super(context, autoInitialize);
 	}
@@ -47,17 +49,21 @@ public class PlaylistSyncAdapter extends SubsonicSyncAdapter {
 	@Override
 	public void onExecuteSync(Context context, int instance) {
 		String serverName = Util.getServerName(context, instance);
-		String playlistListFile = "sync-playlist-" + (Util.getRestUrl(context, null, instance)).hasCode() + ".ser";
+		String playlistListFile = "sync-playlist-" + (Util.getRestUrl(context, null, instance)).hashCode() + ".ser";
 		List<Integer> playlistList = FileUtil.deserialize(context, playlistListFile, ArrayList.class);
 		for(int i = 0; i < playlistList.size(); i++) {
 			String id = Integer.toString(playlistList.get(i));
-			MusicDirectory playlist = musicService.getPlaylist(true, id, serverName, context, null);
-			
-			for(MusicDirectory.Entry entry: playlist.getChildren()) {
-				DownloadFile file = new DownloadFile(context, entry, true);
-				while(!file.isSaved() && !file.isFailedMax()) {
-					file.downloadNow();
+			try {
+				MusicDirectory playlist = musicService.getPlaylist(true, id, serverName, context, null);
+
+				for(MusicDirectory.Entry entry: playlist.getChildren()) {
+					DownloadFile file = new DownloadFile(context, entry, true);
+					while(!file.isSaved() && !file.isFailedMax()) {
+						file.downloadNow();
+					}
 				}
+			} catch(Exception e) {
+				Log.e(TAG, "Failed to get playlist for " + serverName);
 			}
 		}
 	}
diff --git a/src/github/daneren2005/dsub/service/sync/PodcastSyncAdapter.java b/src/github/daneren2005/dsub/service/sync/PodcastSyncAdapter.java
index 6de7c74e..c5779c48 100644
--- a/src/github/daneren2005/dsub/service/sync/PodcastSyncAdapter.java
+++ b/src/github/daneren2005/dsub/service/sync/PodcastSyncAdapter.java
@@ -19,16 +19,17 @@
 
 package github.daneren2005.dsub.service.sync;
 
-import android.accounts.Account;
 import android.annotation.TargetApi;
-import android.content.AbstractThreadedSyncAdapter;
-import android.content.ContentProviderClient;
 import android.content.Context;
-import android.content.SyncResult;
-import android.os.Bundle;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.Playlist;
+import github.daneren2005.dsub.domain.PodcastEpisode;
 import github.daneren2005.dsub.service.DownloadFile;
+import github.daneren2005.dsub.util.FileUtil;
 import github.daneren2005.dsub.util.Util;
 
 /**
@@ -36,6 +37,8 @@ import github.daneren2005.dsub.util.Util;
  */
 
 public class PodcastSyncAdapter extends SubsonicSyncAdapter {
+	private static String TAG = PodcastSyncAdapter.class.getSimpleName();
+
 	public PodcastSyncAdapter(Context context, boolean autoInitialize) {
 		super(context, autoInitialize);
 	}
@@ -47,18 +50,22 @@ public class PodcastSyncAdapter extends SubsonicSyncAdapter {
 	@Override
 	public void onExecuteSync(Context context, int instance) {
 		String serverName = Util.getServerName(context, instance);
-		String podcastListFile = "sync-podcast-" + (Util.getRestUrl(context, null, instance)).hasCode() + ".ser";
+		String podcastListFile = "sync-podcast-" + (Util.getRestUrl(context, null, instance)).hashCode() + ".ser";
 		List<Integer> podcastList = FileUtil.deserialize(context, podcastListFile, ArrayList.class);
 		for(int i = 0; i < podcastList.size(); i++) {
 			String id = Integer.toString(podcastList.get(i));
-			List<PodcastChannel> podcasts = musicService.getPodcastEpisodes(true, id, context, null);
-			
-			// TODO: Only grab most recent podcasts!
-			for(PodcastChannel entry: podcasts) {
-				DownloadFile file = new DownloadFile(context, entry, true);
-				while(!file.isSaved() && !file.isFailedMax()) {
-					file.downloadNow();
+			try {
+				MusicDirectory podcasts = musicService.getPodcastEpisodes(true, id, context, null);
+
+				// TODO: Only grab most recent podcasts!
+				for(MusicDirectory.Entry entry: podcasts.getChildren()) {
+					DownloadFile file = new DownloadFile(context, entry, true);
+					while(!file.isSaved() && !file.isFailedMax()) {
+						file.downloadNow();
+					}
 				}
+			} catch(Exception e) {
+				Log.e(TAG, "Failed to get playlist for " + serverName);
 			}
 		}
 	}
-- 
cgit v1.2.3