Image support

BobVul · Jun 9, 2016 · 51c7d5b · 51c7d5b
1 parent df594f4
commit 51c7d5b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/Bread/ImageJsonConverter.cs b/Bread/ImageJsonConverter.cs
@@ -1,7 +1,9 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Text;
 
@@ -19,14 +21,14 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
             Image img = (Image)value;
             using (MemoryStream ms = new MemoryStream())
             {
-                img.Save(ms, img.RawFormat);
-                writer.WriteValue(Convert.ToBase64String(ms.ToArray()));
+                img.Save(ms, ImageFormat.Png);
+                (new JValue(Convert.ToBase64String(ms.ToArray()))).WriteTo(writer);
             }
         }
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            using (MemoryStream ms = new MemoryStream(Convert.FromBase64String((string)existingValue)))
+            using (MemoryStream ms = new MemoryStream(Convert.FromBase64String((string)reader.Value)))
             {
                 return Image.FromStream(ms);
             }

diff --git a/Growler/Growler.cs b/Growler/Growler.cs
@@ -27,8 +27,6 @@ protected override void HandleNotification(Notification notification, string dis
                 Silent = this.GetSettingOrDefault<bool>(GrowlerSetting.Silent, false),
                 Image = notification.Image
             };
-            string title = notification.Title;
-            string message = notification.Description;
 
             LaunchToaster(bread);
         }

diff --git a/Toaster/Program.cs b/Toaster/Program.cs
@@ -3,6 +3,8 @@
 using NotificationsExtensions.Toasts;
 using System;
 using System.Collections.Generic;
+using System.Drawing.Imaging;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -16,7 +18,7 @@ static class Program
         private const string APP_ID = "GrowlToToast";
 
         static void Main()
-        {
+        {
             Message bread = JsonConvert.DeserializeObject<Message>(Console.ReadLine());
             switch (bread.Action)
             {
@@ -28,7 +30,9 @@ static void Main()
                     ToastNotificationManager.History.Remove(ToastNotificationManager.History.GetHistory().Last().Tag);
                     break;
 
-                case ActionType.Show:
+                case ActionType.Show:
+                    string imagePath = Path.ChangeExtension(Path.GetTempFileName(), "png");
+                    bread.Image.Save(imagePath, ImageFormat.Png);
                     ToastContent content = new ToastContent()
                     {
                         Visual = new ToastVisual()
@@ -40,6 +44,10 @@ static void Main()
                             BodyTextLine1 = new ToastText()
                             {
                                 Text = bread.Body
+                            },
+                            AppLogoOverride = new ToastAppLogo
+                            {
+                                Source = new ToastImageSource("file:///" + imagePath)
                             }
                         }
                     };