diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java index 4c8eb0c..ec20f68 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java +++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java @@ -158,6 +158,7 @@ public class MainWindowController { // general actions HamburgerBackArrowBasicTransition burgerTask = new HamburgerBackArrowBasicTransition(menuHam); menuHam.addEventHandler(MouseEvent.MOUSE_PRESSED, (e) -> { + if (menuTrue) { sideMenuSlideOut(); burgerTask.setRate(-1.0); @@ -173,8 +174,7 @@ public class MainWindowController { if (settingsViewController.isVisible()) { settingsViewController.setVisible(false); } - });primaryStage.setMinHeight(600.00 + 34); // 34 -> window decoration - primaryStage.setMinWidth(1130.00); + }); } // general fxml actions @@ -296,7 +296,6 @@ public class MainWindowController { // slide in in 400ms private void sideMenuSlideIn() { - sideMenuVBox.setVisible(true); TranslateTransition translateTransition = new TranslateTransition(Duration.millis(400), sideMenuVBox); translateTransition.setFromX(-150); translateTransition.setToX(0); @@ -374,7 +373,7 @@ public class MainWindowController { ExecutorService executor = Executors.newFixedThreadPool(5); for (FilmTabelDataType entry : dbController.getAllNotCachedEntries()) { - System.out.println(entry.getStreamUrl() + " is NOT cached!"); +// System.out.println(entry.getStreamUrl() + " is NOT cached!"); Runnable OMDbAPIWorker = new OMDbAPIController(entry); executor.execute(OMDbAPIWorker); @@ -432,7 +431,7 @@ public class MainWindowController { for(FilmTabelDataType entry : dbController.getStreamsList()) { if (dbController.getCacheDate(entry.getStreamUrl()).isBefore(lastValidCache)) { - System.out.println(entry.getTitle() + " chached on: " + dbController.getCacheDate(entry.getStreamUrl())); +// System.out.println(entry.getTitle() + " chached on: " + dbController.getCacheDate(entry.getStreamUrl())); Runnable OMDbAPIWorker = new OMDbAPIController(entry); executor.execute(OMDbAPIWorker); } diff --git a/src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java b/src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java index e017ede..54b0852 100644 --- a/src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java +++ b/src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java @@ -165,10 +165,11 @@ public class OMDbAPIController implements Runnable { apiUrl = new URL(URL + omdbAPIKey + "&t=" + title.replace(" ", "%20") + "&Season=" + currentTableFilm.getSeason() - + "&Episode=" + currentTableFilm.getEpisode()); + + "&Episode=" + currentTableFilm.getEpisode() + + "&plot=full"); } else { apiUrl = new URL(URL + omdbAPIKey + "&t=" - + title.replace(" ", "%20")); + + title.replace(" ", "%20") + "&plot=full"); } BufferedReader ina = new BufferedReader(new InputStreamReader(apiUrl.openStream())); diff --git a/src/main/resources/fxml/MainWindow.fxml b/src/main/resources/fxml/MainWindow.fxml index 9a243b2..a8b5461 100644 --- a/src/main/resources/fxml/MainWindow.fxml +++ b/src/main/resources/fxml/MainWindow.fxml @@ -33,7 +33,7 @@ - +