Ensure all channel logs are fetched

Author: kiall

app/src/main/java/ie/macinnes/tvheadend/TvContractUtils.java

@@ -27,6 +27,8 @@
 public class TvContractUtils {
     private static final String TAG = TvContractUtils.class.getName();
 
+    public static final long INVALID_CHANNEL_ID = -1;
+
     public static String getInputId() {
         ComponentName componentName = new ComponentName(
                 "ie.macinnes.tvheadend",
@@ -35,7 +37,7 @@ public static String getInputId() {
         return TvContract.buildInputId(componentName);
     }
 
-    public static Long getChannelId(Context context, int channelId) {
+    public static long getChannelId(Context context, int channelId) {
         ContentResolver resolver = context.getContentResolver();
 
         Uri channelsUri = TvContract.buildChannelsUriForInput(TvContractUtils.getInputId());
@@ -50,13 +52,13 @@ public static Long getChannelId(Context context, int channelId) {
             }
         }
 
-        return null;
+        return INVALID_CHANNEL_ID;
     }
 
     public static Uri getChannelUri(Context context, int channelId) {
-        Long androidChannelId = getChannelId(context, channelId);
+        long androidChannelId = getChannelId(context, channelId);
 
-        if (androidChannelId != null) {
+        if (androidChannelId != INVALID_CHANNEL_ID) {
             return TvContract.buildChannelUri(androidChannelId);
         }
 
@@ -117,9 +119,9 @@ public static Uri getProgramUri(Context context, int channelId, int eventId) {
         // TODO: Cache results...
         ContentResolver resolver = context.getContentResolver();
 
-        Long androidChannelId = getChannelId(context, channelId);
+        long androidChannelId = getChannelId(context, channelId);
 
-        if (androidChannelId == null) {
+        if (androidChannelId == INVALID_CHANNEL_ID) {
             Log.w(TAG, "Failed to fetch programUri, unknown channel");
             return null;
         }

app/src/main/java/ie/macinnes/tvheadend/sync/EpgSyncTask.java

@@ -40,8 +40,11 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Queue;
 import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 import ie.macinnes.htsp.HtspFileInputStream;
 import ie.macinnes.htsp.HtspMessage;
@@ -98,11 +101,21 @@ public interface Listener {
     private final SparseArray<ContentProviderOperation> mPendingChannelOps = new SparseArray<>();
     private final SparseArray<ContentProviderOperation> mPendingProgramOps = new SparseArray<>();
 
-    private final SparseArray<Uri> mPendingChannelLogoFetches = new SparseArray<>();
+    private final Queue<PendingChannelLogoFetch> mPendingChannelLogoFetches = new ConcurrentLinkedQueue<>();
 
     private Set<Integer> mSeenChannels = new HashSet<>();
     private Set<Integer> mSeenPrograms = new HashSet<>();
 
+    private final class PendingChannelLogoFetch {
+        public int channelId;
+        public Uri logoUri;
+
+        public PendingChannelLogoFetch(int channelId, Uri logoUri) {
+            this.channelId = channelId;
+            this.logoUri = logoUri;
+        }
+    }
+
     public EpgSyncTask(Context context, @NonNull HtspMessage.Dispatcher dispatcher, boolean quickSync) {
         this(context, dispatcher);
 
@@ -286,7 +299,7 @@ private void handleChannelAddUpdate(@NonNull HtspMessage message) {
         }
 
         if (message.containsKey("channelIcon")) {
-            mPendingChannelLogoFetches.put(channelId, Uri.parse(message.getString("channelIcon")));
+            mPendingChannelLogoFetches.add(new PendingChannelLogoFetch(channelId, Uri.parse(message.getString("channelIcon"))));
         }
 
         mSeenChannels.add(channelId);
@@ -343,10 +356,17 @@ private void flushPendingChannelLogoFetches() {
 
         Log.d(TAG, "Flushing " + mPendingChannelLogoFetches.size() + " channel logo fetches");
 
-        for (int i = 0; i < mPendingChannelLogoFetches.size(); i++) {
-            final int channelId = mPendingChannelLogoFetches.keyAt(i);
-            final Uri channelLogoSourceUri = mPendingChannelLogoFetches.valueAt(i);
-            final Uri channelLogoDestUri = TvContract.buildChannelLogoUri(TvContractUtils.getChannelUri(mContext, channelId));
+        for (PendingChannelLogoFetch pendingChannelLogoFetch : mPendingChannelLogoFetches) {
+            final int channelId = pendingChannelLogoFetch.channelId;
+            final long androidChannelId = TvContractUtils.getChannelId(mContext, channelId);
+
+            if (androidChannelId == TvContractUtils.INVALID_CHANNEL_ID) {
+                Log.e(TAG, "Failed to final channel in android DB, channel ID: " + channelId);
+                continue;
+            }
+
+            final Uri channelLogoSourceUri = pendingChannelLogoFetch.logoUri;
+            final Uri channelLogoDestUri = TvContract.buildChannelLogoUri(androidChannelId);
 
             InputStream is = null;
             OutputStream os = null;