more error handling

setsumi · May 29, 2023 · f4cd937 · f4cd937
1 parent 83efb58
commit f4cd937
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/src/syosetuDownloaderCore/MessageForm.Designer.cs b/src/syosetuDownloaderCore/MessageForm.Designer.cs
diff --git a/src/syosetuDownloaderCore/MessageForm.cs b/src/syosetuDownloaderCore/MessageForm.cs
@@ -46,5 +46,17 @@ private void MessageForm_FormClosing(object sender, FormClosingEventArgs e)
             e.Cancel = true; // Cancel the closure
             Hide(); // Hide the window
         }
+
+        private void MessageForm_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Control == true && e.KeyCode == Keys.C)
+            {
+                if (listboxLog.SelectedItems.Count > 0)
+                {
+                    string s = listboxLog.SelectedItem.ToString();
+                    Clipboard.SetData(DataFormats.StringFormat, s);
+                }
+            }
+        }
     }
 }
diff --git a/src/syosetuDownloaderCore/Syousetsu.cs b/src/syosetuDownloaderCore/Syousetsu.cs
@@ -103,12 +103,14 @@ public static CancellationTokenSource AddDownloadJob(Syousetsu.Constants details
         }
 
         private static syosetuDownloaderCore.MessageForm _messageForm = null;
-        public static void Error(Exception ex)
+        public static void Error(Exception ex, string prefix = "")
         {
             System.Windows.Application.Current.Dispatcher.InvokeAsync(() =>
             {
                 if (_messageForm == null) _messageForm = new syosetuDownloaderCore.MessageForm();
-                _messageForm.Error($"{DateTime.Now}  ErrorType = {ex.GetType()};  ErrorMessage = {ex.Message}");
+
+                prefix = string.IsNullOrEmpty(prefix) ? "  " : $"  {prefix}  ";
+                _messageForm.Error($"{DateTime.Now}{prefix}ErrorType = {ex.GetType()};  ErrorMessage = {ex.Message}");
             }, System.Windows.Threading.DispatcherPriority.Normal);
         }
 
@@ -215,12 +217,14 @@ public static string GetNovelBody(HtmlDocument doc, Constants details)
                                 img.SetAttributeValue("src", imageSrc);
                             }
                         }
-                        catch (Exception)
+                        catch (Exception ex)
                         {
                             byte[] fileBytes = File.ReadAllBytes(Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "image-error.png"));
                             string base64String = Convert.ToBase64String(fileBytes);
                             string imageSrc = string.Format("data:image/png;base64,{0}", base64String);
                             img.SetAttributeValue("src", imageSrc);
+
+                            Error(ex, $"Can't get image {src}");
                         }
                     }
                 }