Merge pull request #7 from madeyoga/fix-search

Fix search

Author: Shiroechi

src/main/java/YouTubeSearchApi/YoutubeClient.java

@@ -1,6 +1,7 @@
 package YouTubeSearchApi;
 
 import YouTubeSearchApi.entity.YoutubeVideo;
+import YouTubeSearchApi.exception.NoResultFoundException;
 import YouTubeSearchApi.utility.Utils;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -21,13 +22,26 @@ public YoutubeClient() {
         this.YOUTUBE_BASE_URL = "https://www.youtube.com/";
     }
 
-    public List<YoutubeVideo> search(String keywords, int maxResults) throws IOException {
+    public List<YoutubeVideo> search(String keywords, int maxResults) throws IOException, NoResultFoundException {
+        String startFeature = "window[\"ytInitialData\"]";
         String encodedKeywords = URLEncoder.encode(keywords, StandardCharsets.UTF_8.toString());
         String searchUrl = this.YOUTUBE_BASE_URL + "results?search_query=" + encodedKeywords;
 
-        String pageContent = Utils.httpRequest(searchUrl);
+        // try get feature 3 times
+        String pageContent = "";
+        boolean foundFeatureFlag = false;
+        for (int i = 0; i < 3; i++) {
+            pageContent = Utils.httpRequest(searchUrl);
+            if (pageContent.contains(startFeature)) {
+                foundFeatureFlag = true;
+                break;
+            }
+        }
+
+        if (!foundFeatureFlag) {
+            throw new NoResultFoundException("what you searched was unfortunately not found or doesn't exist. keywords: " + keywords);
+        }
 
-        String startFeature = "window[\"ytInitialData\"]";
 
         // + startFeature.length() + 3. because we want to get rid of the startFeature and " = ".
         // And get only the Json data

src/main/java/YouTubeSearchApi/exception/NoResultFoundException.java

@@ -0,0 +1,23 @@
+package YouTubeSearchApi.exception;
+
+public class NoResultFoundException extends Exception {
+    public NoResultFoundException() {
+        super();
+    }
+
+    public NoResultFoundException(String message) {
+        super(message);
+    }
+
+    public NoResultFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public NoResultFoundException(Throwable cause) {
+        super(cause);
+    }
+
+    protected NoResultFoundException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}

src/test/java/YouTubeSearchApi/TestYoutubeClientSearch.java

@@ -2,6 +2,7 @@
 
 
 import YouTubeSearchApi.entity.YoutubeVideo;
+import YouTubeSearchApi.exception.NoResultFoundException;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -19,7 +20,7 @@ public static void main(String[] args) {
             videos = client.search("CHiCO Love Letter", 5);
             System.out.println(videos.size());
             System.out.println(videos.toString());
-        } catch (IOException e) {
+        } catch (IOException | NoResultFoundException e) {
             e.printStackTrace();
         }