Added 4k videos + error handling for invalid video source

ScreenSaver/AerialEntities.cs

@@ -22,11 +22,16 @@ public static List<Asset> GetMovies()
         }
         public static List<Asset> GetAllMovies()
         {
+            //if no Entries, just return an empty list
+            if (GetAllEntries() == null) { return new List<Asset>(); }
+
             return GetAllEntries().SelectMany(s => s.assets).ToList();
         }
 
         private static List<Asset> FilterEntries(IdAsset[] urls)
         {
+            if (urls == null) { return new List<Asset>(); }; //if no URLS, return an empty list
+
             var time = (DateTime.Now.Hour < 6 || DateTime.Now.Hour > 19) ? "night" : "day";
             var ran = new Random();
             var settings = new RegSettings();
@@ -71,7 +76,17 @@ public static IdAsset[] GetAllEntries()
                 WebClient webClient = new WebClient();
                 entries = webClient.DownloadString(aerialUrl);
             }
-            cachedEntities = new JavaScriptSerializer().Deserialize<IdAsset[]>(entries);
+
+            try
+            {
+                cachedEntities = new JavaScriptSerializer().Deserialize<IdAsset[]>(entries);
+            }
+            catch (ArgumentException e)
+            {
+                //the passed in entities document is invalid.
+                return null;
+            }
+
 
             return cachedEntities;
         }

ScreenSaver/AerialGlobalVars.cs

@@ -19,5 +19,9 @@ static class AerialGlobalVars
         public static string githubAllReleases = "https://github.com/cDima/Aerial/releases";
         //link to the apple videos
         public static string appleVideosURI = "http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/entries.json";
+        //link to the 4k apple videos (hosted by Jonathon Powell)
+        public static string applefourKVideoURI = "https://t27q97zg19.execute-api.us-east-1.amazonaws.com/prod/aerialAltJSON/4kEntites.json";
+        //original link to 4k apple videos, we can't parse this currently so I hosted a modified version
+        //public static string applefourKVideoURI = "https://sylvan.apple.com/Aerials/2x/entries.json";
     }
 }

ScreenSaver/ScreenSaverForm.cs

@@ -314,6 +314,17 @@ private void SetNextVideo()
             var cacheEnabled = new RegSettings().CacheVideos;
             if (showVideo)
             {
+                //If movies is null, when we tried to parse the JSON doc with the movies it
+                //failed or it was empty.
+                if (Movies == null || Movies.Count == 0)
+                {
+                    showVideo = false;
+                    MessageBox.Show("Error finding the video locations.  Please confirm that the video source " +
+                        "is a valid JSON document and can be reached.  Resart after fixing the video source");
+
+                    return;
+                }
+
                 string url = Movies[currentVideoIndex].url;
 
                 if (Caching.IsHit(url))