Fix for the ImageGooglerForm. Use another way to grab the urls from google.

1 files changed, 16 insertions, 21 deletions

diff --git a/ImageGooglerForm.cs b/ImageGooglerForm.cs
index 33764def..c4035f22 100644
--- a/ImageGooglerForm.cs
+++ b/ImageGooglerForm.cs
@@ -39,25 +39,21 @@ namespace com.clusterrr.hakchi_gui
             request.Credentials = CredentialCache.DefaultCredentials;
             (request as HttpWebRequest).UserAgent = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36";
             request.Timeout = 10000;
-            var response = (HttpWebResponse)request.GetResponse();
-            Stream dataStream = response.GetResponseStream();
-            var pageData = new StringBuilder();
-            int b;
-            var result = new List<byte>();
-            while ((b = dataStream.ReadByte()) >= 0)
-                result.Add((byte)b);
-            dataStream.Close();
-            response.Close();
-            var page = Encoding.UTF8.GetString(result.ToArray());
-
-            var r = new Regex(@"\""ou\""\:\""(?<url>.+?)\""");
-            var mc = r.Matches(page);
-            var urls = new List<string>();
-            for (int i = 0; i < mc.Count && i < 20; i++)
-            {
-                var gr = mc[i].Groups;
-                urls.Add(gr["url"].Value);
-            }
+            var response = request.GetResponse();

+            Stream dataStream = response.GetResponseStream();

+            StreamReader reader = new StreamReader(dataStream);

+            string responseFromServer = reader.ReadToEnd();

+            reader.Close();

+            response.Close();

+            var urls = new List<string>();

+            string search = @"imgurl=(.*?)&";

+            MatchCollection matches = Regex.Matches(responseFromServer, search);

+

+            foreach (Match match in matches)

+            {

+                urls.Add(match.Groups[1].Value);

+            }

+

             return urls.ToArray();
         }
 
@@ -159,8 +155,7 @@ namespace com.clusterrr.hakchi_gui
 
         private void ImageGooglerForm_FormClosing(object sender, FormClosingEventArgs e)
         {
-            if (searchThread != null) searchThread.Abort();
+            if (searchThread != null) searchThread.Abort();

         }
-
     }
 }