Removed depracted net code

cairthenn · Jul 13, 2019 · 4536d24 · 4536d24
1 parent 8b15ebb
commit 4536d24
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/TwitchChatVideo/Colors.cs b/TwitchChatVideo/Colors.cs
@@ -105,8 +105,8 @@ public static Color GetCorrected(Color color, Color background, string name)
             var darkMode = IsDark(background);
 
             var hsl = HSL.FromRGB(color.R, color.G, color.B);
-
-            if(darkMode)
+            // Color correction concept from: https://github.com/fourtf/chatterino
+            if (darkMode)
             {
                 hsl.L = Math.Max(hsl.L, .5);
                 if(hsl.L < .6 && hsl.H > 196 && hsl.H < 300)

diff --git a/TwitchChatVideo/TwitchDownloader.cs b/TwitchChatVideo/TwitchDownloader.cs
@@ -22,15 +22,30 @@ class TwitchDownloader
 
         public static Image GetImage(string local_path, string url)
         {
-            if (!File.Exists(local_path))
+            var image = DownloadImageFromURL(url);
+
+            image?.Save(local_path);
+
+            return image;
+        }
+
+        public static Image DownloadImageFromURL(string url)
+        {
+
+            try
             {
-                using (var client = new WebClient())
-                {
-                    client.DownloadFile(url, local_path);
-                }
+                var request = WebRequest.Create(url);
+                request.Timeout = 10000;
+                var response = request.GetResponse();
+                var stream = response.GetResponseStream();
+                var image = Image.FromStream(stream);
+                response.Close();
+                return image;
+            }
+            catch (WebException ex)
+            {
+                return null;
             }
-
-            return Image.FromFile(local_path);
         }
 
         public static async Task<VodInfo> DownloadVideoInfoAsync(string id, IProgress<VideoProgress> progress = null, CancellationToken ct = default(CancellationToken))