fixed autocomplete and search bugs

rnayabed · Jan 4, 2020 · b38f1a8 · b38f1a8
1 parent 014f639
commit b38f1a8
Show file tree

Hide file tree

Showing 25 changed files with 16 additions and 13 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/artifacts/Gramophy_jar/Gramophy.jar b/out/artifacts/Gramophy_jar/Gramophy.jar
diff --git a/out/production/Gramophy/Gramophy/dashController$10.class b/out/production/Gramophy/Gramophy/dashController$10.class
diff --git a/out/production/Gramophy/Gramophy/dashController$11$1.class b/out/production/Gramophy/Gramophy/dashController$11$1.class
diff --git a/out/production/Gramophy/Gramophy/dashController$11.class b/out/production/Gramophy/Gramophy/dashController$11.class
diff --git a/out/production/Gramophy/Gramophy/dashController$12$1.class b/out/production/Gramophy/Gramophy/dashController$12$1.class
diff --git a/out/production/Gramophy/Gramophy/dashController$12.class b/out/production/Gramophy/Gramophy/dashController$12.class
diff --git a/out/production/Gramophy/Gramophy/dashController$13.class b/out/production/Gramophy/Gramophy/dashController$13.class
diff --git a/out/production/Gramophy/Gramophy/dashController$14$1.class b/out/production/Gramophy/Gramophy/dashController$14$1.class
diff --git a/out/production/Gramophy/Gramophy/dashController$14.class b/out/production/Gramophy/Gramophy/dashController$14.class
diff --git a/out/production/Gramophy/Gramophy/dashController$15.class b/out/production/Gramophy/Gramophy/dashController$15.class
diff --git a/out/production/Gramophy/Gramophy/dashController$16.class b/out/production/Gramophy/Gramophy/dashController$16.class
diff --git a/out/production/Gramophy/Gramophy/dashController$17.class b/out/production/Gramophy/Gramophy/dashController$17.class
diff --git a/out/production/Gramophy/Gramophy/dashController$18.class b/out/production/Gramophy/Gramophy/dashController$18.class
diff --git a/out/production/Gramophy/Gramophy/dashController$3.class b/out/production/Gramophy/Gramophy/dashController$3.class
diff --git a/out/production/Gramophy/Gramophy/dashController$4.class b/out/production/Gramophy/Gramophy/dashController$4.class
diff --git a/out/production/Gramophy/Gramophy/dashController$5.class b/out/production/Gramophy/Gramophy/dashController$5.class
diff --git a/out/production/Gramophy/Gramophy/dashController$6.class b/out/production/Gramophy/Gramophy/dashController$6.class
diff --git a/out/production/Gramophy/Gramophy/dashController$7.class b/out/production/Gramophy/Gramophy/dashController$7.class
diff --git a/out/production/Gramophy/Gramophy/dashController$8.class b/out/production/Gramophy/Gramophy/dashController$8.class
diff --git a/out/production/Gramophy/Gramophy/dashController$9$1.class b/out/production/Gramophy/Gramophy/dashController$9$1.class
diff --git a/out/production/Gramophy/Gramophy/dashController$9$2.class b/out/production/Gramophy/Gramophy/dashController$9$2.class
diff --git a/out/production/Gramophy/Gramophy/dashController$9.class b/out/production/Gramophy/Gramophy/dashController$9.class
diff --git a/out/production/Gramophy/Gramophy/dashController.class b/out/production/Gramophy/Gramophy/dashController.class
diff --git a/src/Gramophy/dashController.java b/src/Gramophy/dashController.java
@@ -294,10 +294,11 @@ protected Void call() {
                             Thread.sleep(150);
                             if(newValue.equals(youtubeSearchField.getText()))
                             {
+                                isAlreadySearching = true;
+                                String[] suggestions = getYoutubeSuggestions(newValue);
+
                                 if(!isYouTubeSearching)
                                 {
-                                    isAlreadySearching = true;
-                                    String[] suggestions = getYoutubeSuggestions(newValue);
                                     Platform.runLater(()->{
                                         youtubeAutoComplete.getSuggestions().setAll(suggestions);
                                         youtubeAutoComplete.show(youtubeSearchField);
@@ -904,7 +905,10 @@ protected Void call() {
 
                     JSONObject youtubeResponse = new JSONObject(sb.toString());
 
-                    youtubeNextPageToken = youtubeResponse.getString("nextPageToken");
+                    if(youtubeResponse.has("nextPageToken"))
+                        youtubeNextPageToken = youtubeResponse.getString("nextPageToken");
+                    else
+                        youtubeNextPageToken = "";
 
                     JSONArray resultsArray = youtubeResponse.getJSONArray("items");
 
@@ -1049,9 +1053,8 @@ protected Void call(){
                             loadPlaylist("YouTube");
                     }
 
-                    if(youtubeListView.getItems().size()>0)
+                    if(youtubeListView.getItems().size()>0 && !youtubeNextPageToken.equals(""))
                     {
-                        Thread.sleep(100);
                         JFXButton loadMoreButton = new JFXButton("Load More");
                         loadMoreButton.setCache(true);
                         loadMoreButton.setCacheHint(CacheHint.SPEED);