fix crash on bad nasa format

wiegell · Nov 26, 2022 · 15f7ca8 · 15f7ca8
1 parent 5f1a4db
commit 15f7ca8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/AstroWall/BusinessLayer/Database.cs b/AstroWall/BusinessLayer/Database.cs
@@ -154,7 +154,7 @@ public async Task LoadImgs(bool forceReload = false)
                 ImgLoadList = new List<Task>();
                 foreach (ImgWrap pw in ImgWrapList)
                 {
-                    if (pw.OnlineDataExceptPicIsLoaded() && pw.Integrity && pw.ImgIsGettable)
+                    if (pw.Integrity && pw.ImgIsGettable)
                         ImgLoadList.Add(Task.Run(() => pw.LoadImg()));
                 }
                 await Task.WhenAll(ImgLoadList);

diff --git a/AstroWall/BusinessLayer/ImgWrap.cs b/AstroWall/BusinessLayer/ImgWrap.cs
@@ -136,6 +136,7 @@ public async Task LoadImg()
 
             try
             {
+                Console.WriteLine("Commencing download of date: " + this.PublishDate);
                 ImgLocalUrl = await FileHelpers.DownloadUrlToImageStorePath(ImgOnlineUrl);
                 await createPreviewFromFullSize();
             }
@@ -191,6 +192,8 @@ public async Task createPostProcessedImages(Dictionary<string, Screen> screens,
             SKBitmap image;
             try
             {
+                Console.WriteLine("Trying to load image at local url: " + ImgLocalUrl);
+                Console.WriteLine(FileHelpers.SerializeNow(this));
                 image = await FileHelpers.LoadImageFromLocalUrl(ImgLocalUrl);
             }
             catch (Exception ex)
@@ -230,8 +233,8 @@ public async Task createPostProcessedImages(Dictionary<string, Screen> screens,
             }
             catch (Exception ex)
             {
-                Console.WriteLine("Error postprocessing image ({0}): {1}", ImgLocalUrl, ex.Message);
-                throw new Exception($"Error postprocessing image ({ImgLocalUrl}): {ex.Message}", ex);
+                Console.WriteLine("Error postprocessing image ({0}): {1}", ImgLocalUrl, ex.Message, ex.StackTrace);
+                throw new Exception("error postprocessing", ex);
             }
 
             //Remove old postprocessed files

diff --git a/AstroWall/BusinessLayer/Wallpaper/PostProcess/AddText.cs b/AstroWall/BusinessLayer/Wallpaper/PostProcess/AddText.cs
@@ -54,7 +54,7 @@ public PostProcess()
                 throw ex;
             }
 
-            if (options.isEnabled)
+            if (options.isEnabled && description != null && description != "" && title != null && title != "" && credit != null && credit != "")
             {
                 // Format description
                 string descriptionFormatted = description.Replace("\n", " ").Replace("Explanation:", "").Replace("   ", " ").Replace("  ", " ").Replace("  ", " ").TrimStart();

diff --git a/AstroWall/BusinessLayer/Wallpaper/Wallpaper.cs b/AstroWall/BusinessLayer/Wallpaper/Wallpaper.cs
@@ -76,7 +76,7 @@ public async Task<bool> RunPostProcessAndSetWallpaperAllScreens(ImgWrap imgWrap)
                 General.RunOnUIThread(() =>
                 {
                     Console.WriteLine("Exception in postProcess task on thread: " + Thread.CurrentThread.ManagedThreadId);
-                    throw newEx;
+                    throw ex;
                 });
 
                 // This will not bubble up

diff --git a/AstroWall/DataLayer/FileHelpers.cs b/AstroWall/DataLayer/FileHelpers.cs
@@ -85,6 +85,10 @@ public async static Task<SKBitmap> LoadImageFromLocalUrl(string path)
             return bitmap;
         }
 
+        public static string SerializeNow(Object c)
+        {
+            return JsonConvert.SerializeObject(c);
+        }
         public static void SerializeNow(Object c, string path)
         {
             string jsonString = JsonConvert.SerializeObject(c);