fix goolge

Author: RageCoke1466

src/js/reverseImageSearch.js

@@ -176,53 +176,20 @@ export const reverseImageSearch = {
       const tagA = singleItem.getElementsByTagName("a");
       singleResult.sourceUrl = tagA[0].getAttribute("href");
       singleResult.title = tagA[0].innerText;
-      // console.log(tagA.length);
-      // console.log(tagA[0]);
-      // console.log(tagA[1]);
-      // console.log(tagA[2]);
-      // console.log(tagA[3]);
-      // console.log(tagA[4]);
-      // console.log("----------");
-      if(tagA[4]){
-        let link = tagA[4].getAttribute("href");
-        link = parseGoogleImageLink(link);
-        singleResult.imageUrl = link;
-        singleResult.thumbUrl = link;
+      //new method to dig the image Source
+      for(let i = 2; i < tagA.length;i++){
+        if(tagA[i]){
+          let link = tagA[i].getAttribute("href");
+          //console.log(tagA[i]);
+          link = parseGoogleImageLink(link);
+          if(link) {
+            console.log(link);
+            singleResult.imageUrl = link;
+            singleResult.thumbUrl = link;
+            break;
+          }
+        }
       }
-      //console.log({a:tagA[1],b:tagA[2],c:tagA[3],d:tagA[0]});
-      //console.log(tagA[1]);
-      //console.log(tagA[2]);
-        //console.log(singleResult.sourceUrl );
-      //console.log(tagA.length);
-      // let test = tagA[2].getAttribute("href");
-      // console.log(test);
-      // console.log(parseGoogleImageLink(test));
-      //let link = tagA[1].getAttribute("href");
-
-      //singleResult.imageUrl = link.substring(link.indexOf("=") + 1, link.indexOf("&imgre"));
-      //console.log(singleResult.imageUrl);
-
-      // // if (!singleResult.imageUrl) {
-      // //   let tempImgLink = tagA[3].getAttribute("href");
-      // //   //console.log('----------------');
-      // //   //console.log(tempImgLink);
-      // //   tempImgLink = tempImgLink.substr(tempImgLink.indexOf("imgurl=") + "imgurl=".length);
-      // //   tempImgLink = tempImgLink.substr(0, tempImgLink.indexOf("&"));
-      // //   //console.log(tempImgLink);
-      // //   if (tempImgLink.match(/\:s$/)) {
-      // //     tempImgLink = tempImgLink.substr(0, tempImgLink.length - 2);
-      // //     console.log(tempImgLink);
-      // //   }
-      // //   else if(tempImgLink.indexOf("%3") !== -1) {
-      // //     tempImgLink = tempImgLink.substr(0, tempImgLink.indexOf("%3"));
-      // //     //console.log(tempImgLink);
-      // //   }
-      // //   singleResult.imageUrl = tempImgLink;
-      // // }
-      // singleResult.thumbUrl = singleResult.imageUrl;
-      //process description
-      //class st span contain N child, first child is size info
-      //behind children are description,conbine them
       const tagSpan = singleItem.getElementsByClassName("st")[0].childNodes;
       let description = "";
       for (let i = 0; i < tagSpan.length; i++) {

src/utils/imageUtils.js

@@ -51,8 +51,15 @@ export const checkUrlOrBase64 = function(item){
   }
 }
 export const parseGoogleImageLink = function(link){
-  let pareseString = /(http|https).*(\.jpg|\.jpeg|\.png|\.gif|\.svg)/g;
-  return link.match(pareseString);
+  let parseReg = /(http|https).*(\.jpg&imgrefurl|\.jpeg&imgrefurl|\.png&imgrefurl|\.gif&imgrefurl|\.svg&imgrefurl|&imgrefurl)/g;
+  let parseResult = link.match(parseReg);
+  if(parseResult){
+    let resultLink = parseResult[0];
+    //console.log(resultLink.substring(0,resultLink.length-10));
+    return resultLink.substring(0,resultLink.length-10);
+  }else{
+    return null;
+  }
 }
 export const sortImageByRelevance = function(data){
   data.sort(function(a,b){