From b6a1c38353b2a6c9e318c5abee55dd07fad70252 Mon Sep 17 00:00:00 2001 From: Jannik Date: Wed, 7 Mar 2018 23:51:02 +0100 Subject: [PATCH] code cleanup * renamed a few objects for improved their description --- .../HomeFlix/application/Main.java | 2 +- .../application/MainWindowController.java | 91 +++++++++---------- .../HomeFlix/controller/DBController.java | 20 ++-- .../HomeFlix/controller/apiQuery.java | 4 +- src/main/resources/fxml/MainWindow.fxml | 2 +- 5 files changed, 58 insertions(+), 61 deletions(-) diff --git a/src/main/java/kellerkinder/HomeFlix/application/Main.java b/src/main/java/kellerkinder/HomeFlix/application/Main.java index 104fded..7158afe 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/Main.java +++ b/src/main/java/kellerkinder/HomeFlix/application/Main.java @@ -132,7 +132,7 @@ public class Main extends Application { // init here as it loads the games to the mwc and the gui, therefore the window must exist mainWindowController.init(); - mainWindowController.dbController.init(); + mainWindowController.getDbController().init(); } catch (IOException e) { LOGGER.error(e); } diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java index ddc27f5..081795e 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java +++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java @@ -117,7 +117,7 @@ public class MainWindowController { private VBox sideMenuVBox; @FXML - private TreeTableView treeTableViewfilm; + private TreeTableView filmsTreeTable; @FXML private TableView sourcesTable; @@ -201,25 +201,24 @@ public class MainWindowController { private Label versionLbl; @FXML - private ImageView image1; - + private ImageView posterImageView; private ImageView imv1; @FXML private TreeItem filmRoot = new TreeItem<>(new FilmTabelDataType("", "", 0, 0, 0, false, imv1)); @FXML - TreeTableColumn columnRating = new TreeTableColumn<>("Rating"); + private TreeTableColumn columnStreamUrl = new TreeTableColumn<>("File Name"); @FXML - TreeTableColumn columnTitle = new TreeTableColumn<>("Title"); + private TreeTableColumn columnTitle = new TreeTableColumn<>("Title"); @FXML - TreeTableColumn columnStreamUrl = new TreeTableColumn<>("File Name"); + private TreeTableColumn columnSeason = new TreeTableColumn<>("Season"); @FXML - TreeTableColumn columnSeason = new TreeTableColumn<>("Season"); + private TreeTableColumn columnEpisode = new TreeTableColumn<>("Episode"); @FXML - TreeTableColumn columnEpisode = new TreeTableColumn<>("Episode"); + private TreeTableColumn columnRating = new TreeTableColumn<>("Rating"); @FXML - private TreeItem streamingRoot =new TreeItem<>(new SourceDataType("", "")); + private TreeItem sourceRoot =new TreeItem<>(new SourceDataType("", "")); @FXML private TableColumn sourceColumn; @FXML @@ -255,10 +254,10 @@ public class MainWindowController { private int next; private ResourceBundle bundle; - private ObservableList filterData = FXCollections.observableArrayList(); private ObservableList languages = FXCollections.observableArrayList("English (en_US)", "Deutsch (de_DE)"); private ObservableList branches = FXCollections.observableArrayList("stable", "beta"); - private ObservableList localFilms = FXCollections.observableArrayList(); + private ObservableList filterData = FXCollections.observableArrayList(); + private ObservableList filmsList = FXCollections.observableArrayList(); private ObservableList sourcesList = FXCollections.observableArrayList(); private ImageView skip_previous_white = new ImageView(new Image("icons/ic_skip_previous_white_18dp_1x.png")); private ImageView skip_previous_black = new ImageView(new Image("icons/ic_skip_previous_black_18dp_1x.png")); @@ -275,7 +274,7 @@ public class MainWindowController { private Main main; private UpdateController updateController; private apiQuery ApiQuery; - DBController dbController; + private DBController dbController; /** * "Main" Method called in Main.java main() when starting @@ -306,9 +305,9 @@ public class MainWindowController { columnEpisode.setMaxWidth(64); columnRating.setStyle("-fx-alignment: CENTER;"); - treeTableViewfilm.setRoot(filmRoot); - treeTableViewfilm.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY); - treeTableViewfilm.setShowRoot(false); + filmsTreeTable.setRoot(filmRoot); + filmsTreeTable.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY); + filmsTreeTable.setShowRoot(false); // write content into cell columnTitle.setCellValueFactory(cellData -> cellData.getValue().getValue().titleProperty()); @@ -318,15 +317,15 @@ public class MainWindowController { columnEpisode.setCellValueFactory(cellData -> cellData.getValue().getValue().episodeProperty().asObject()); // add columns to treeTableViewfilm - treeTableViewfilm.getColumns().add(columnStreamUrl); - treeTableViewfilm.getColumns().add(columnTitle); - treeTableViewfilm.getColumns().add(columnRating); - treeTableViewfilm.getColumns().add(columnSeason); - treeTableViewfilm.getColumns().add(columnEpisode); - treeTableViewfilm.getColumns().get(0).setVisible(false); //hide columnStreamUrl (column with file URL, important for opening a file/stream) + filmsTreeTable.getColumns().add(columnStreamUrl); + filmsTreeTable.getColumns().add(columnTitle); + filmsTreeTable.getColumns().add(columnRating); + filmsTreeTable.getColumns().add(columnSeason); + filmsTreeTable.getColumns().add(columnEpisode); + filmsTreeTable.getColumns().get(0).setVisible(false); //hide columnStreamUrl (column with file URL, important for opening a file/stream) // context menu for treeTableViewfilm - treeTableViewfilm.setContextMenu(menu); + filmsTreeTable.setContextMenu(menu); // sourcesTreeTable sourceColumn.setCellValueFactory(cellData -> cellData.getValue().pathProperty()); @@ -364,7 +363,7 @@ public class MainWindowController { filterData.removeAll(filterData); filmRoot.getChildren().removeAll(filmRoot.getChildren()); - helpData = localFilms; + helpData = filmsList; for (int i = 0; i < helpData.size(); i++) { @@ -450,7 +449,7 @@ public class MainWindowController { // treeTableViewfilm.getSelectionModel().clearSelection(selected); filmRoot.getChildren().removeAll(filmRoot.getChildren()); - helpData = localFilms; + helpData = filmsList; for (int i = 0; i < helpData.size(); i++) { if (helpData.get(i).getRating() == 1.0) { @@ -486,17 +485,17 @@ public class MainWindowController { }); // Change-listener for treeTableViewfilm - treeTableViewfilm.getSelectionModel().selectedItemProperty().addListener(new ChangeListener() { + filmsTreeTable.getSelectionModel().selectedItemProperty().addListener(new ChangeListener() { @Override public void changed(ObservableValue observable, Object oldVal, Object newVal) { // last = selected; //for auto-play - selected = treeTableViewfilm.getSelectionModel().getSelectedIndex(); // get selected item + selected = filmsTreeTable.getSelectionModel().getSelectedIndex(); // get selected item last = selected - 1; next = selected + 1; title = columnTitle.getCellData(selected); // get name of selected item streamUrl = columnStreamUrl.getCellData(selected); // get file path of selected item - if (localFilms.get(selected).getCached() == true) { + if (filmsList.get(selected).getCached() == true) { LOGGER.info("loading from cache: " + title); dbController.readCache(streamUrl); } else { @@ -585,12 +584,12 @@ public class MainWindowController { @FXML private void returnBtnclicked(){ - treeTableViewfilm.getSelectionModel().select(last); + filmsTreeTable.getSelectionModel().select(last); } @FXML private void forwardBtnclicked(){ - treeTableViewfilm.getSelectionModel().select(next); + filmsTreeTable.getSelectionModel().select(next); } @FXML @@ -668,13 +667,15 @@ public class MainWindowController { // refresh the selected child of the root node private void refreshTable() { - filmRoot.getChildren().get(selected).setValue(localFilms.get(selected)); + filmRoot.getChildren().get(selected).setValue(filmsList.get(selected)); } - // TODO rework + /** + * add data from films-list to films-table + */ public void addDataUI() { - for (FilmTabelDataType element : localFilms) { + for (FilmTabelDataType element : filmsList) { if (element.getSeason() != 0) { // System.out.println("Found Series: " + element.getTitle()); // check if there is a series node to add the item @@ -703,7 +704,7 @@ public class MainWindowController { // add a source to the sources table on the settings pane public void addSourceToTable(String path, String mode) { sourcesList.add(new SourceDataType(path, mode)); - streamingRoot.getChildren().add(new TreeItem(sourcesList.get(sourcesList.size() - 1))); // adds data to root-node + sourceRoot.getChildren().add(new TreeItem(sourcesList.get(sourcesList.size() - 1))); // adds data to root-node } // add a source to the newsources list @@ -963,6 +964,10 @@ public class MainWindowController { } // getter and setter + public DBController getDbController() { + return dbController; + } + public void setColor(String input) { this.color = input; } @@ -1003,22 +1008,14 @@ public class MainWindowController { return local; } - public ObservableList getLocalFilms() { - return localFilms; - } - - public void setLocalFilms(ObservableList localFilms) { - this.localFilms = localFilms; + public ObservableList getFilmsList() { + return filmsList; } public ObservableList getSourcesList() { return sourcesList; } - public void setSourcesList(ObservableList sourcesList) { - this.sourcesList = sourcesList; - } - public String getRatingSortType() { return ratingSortType; } @@ -1039,8 +1036,8 @@ public class MainWindowController { return textFlow; } - public ImageView getImage1() { - return image1; + public ImageView getPosterImageView() { + return posterImageView; } public JFXButton getUpdateBtn() { @@ -1051,7 +1048,7 @@ public class MainWindowController { return filmRoot; } - public TreeItem getStreamingRoot() { - return streamingRoot; + public TreeItem getSourceRoot() { + return sourceRoot; } } diff --git a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java index 48b99ad..bc8515d 100644 --- a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java +++ b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java @@ -135,7 +135,7 @@ public class DBController { private void loadSources() { // remove sources from table mainWindowController.getSourcesList().removeAll(mainWindowController.getSourcesList()); - mainWindowController.getStreamingRoot().getChildren().removeAll(mainWindowController.getStreamingRoot().getChildren()); + mainWindowController.getSourceRoot().getChildren().removeAll(mainWindowController.getSourceRoot().getChildren()); try { JsonArray sources = Json.parse(new FileReader(main.getDirectory() + "/sources.json")).asArray(); @@ -190,11 +190,11 @@ public class DBController { ResultSet rs = stmt.executeQuery("SELECT * FROM films ORDER BY title"); while (rs.next()) { if (rs.getInt("rating") == 1) { - mainWindowController.getLocalFilms().add(new FilmTabelDataType(rs.getString("streamUrl"), + mainWindowController.getFilmsList().add(new FilmTabelDataType(rs.getString("streamUrl"), rs.getString("title"), rs.getInt("season"), rs.getInt("episode") ,rs.getDouble("rating"), rs.getBoolean("cached"), new ImageView(favorite_black))); } else { - mainWindowController.getLocalFilms().add(new FilmTabelDataType(rs.getString("streamUrl"), + mainWindowController.getFilmsList().add(new FilmTabelDataType(rs.getString("streamUrl"), rs.getString("title"), rs.getInt("season"), rs.getInt("episode"), rs.getDouble("rating"), rs.getBoolean("cached"), new ImageView(favorite_border_black))); } @@ -221,11 +221,11 @@ public class DBController { ResultSet rs = stmt.executeQuery("SELECT * FROM films WHERE streamUrl = \"" + streamUrl + "\";"); if (rs.getInt("rating") == 1) { - mainWindowController.getLocalFilms().set(index, new FilmTabelDataType(rs.getString("streamUrl"), + mainWindowController.getFilmsList().set(index, new FilmTabelDataType(rs.getString("streamUrl"), rs.getString("title"), rs.getInt("season"), rs.getInt("episode") ,rs.getDouble("rating"), rs.getBoolean("cached"), new ImageView(favorite_black))); } else { - mainWindowController.getLocalFilms().set(index, new FilmTabelDataType(rs.getString("streamUrl"), + mainWindowController.getFilmsList().set(index, new FilmTabelDataType(rs.getString("streamUrl"), rs.getString("title"), rs.getInt("season"), rs.getInt("episode"), rs.getDouble("rating"), rs.getBoolean("cached"), new ImageView(favorite_border_black))); } @@ -262,7 +262,7 @@ public class DBController { } // remove all films from the mwc lists - mainWindowController.getLocalFilms().removeAll(mainWindowController.getLocalFilms()); + mainWindowController.getFilmsList().removeAll(mainWindowController.getFilmsList()); mainWindowController.getFilmRoot().getChildren().removeAll(mainWindowController.getFilmRoot().getChildren()); loadDataToMWC(); // load the new data to the mwc @@ -347,7 +347,7 @@ public class DBController { } } else { - // if it's a streaming source check the file for new films // TODO implement series support + // if it's a streaming source check the file for new films for (String entry : filmsStreamURL) { if (!filmsdbStreamURL.contains(entry)) { JsonArray items = Json.parse(new FileReader(source.getPath())).asObject().get("entries").asArray(); @@ -562,12 +562,12 @@ public class DBController { } try { - mainWindowController.getImage1().setImage(im); + mainWindowController.getPosterImageView().setImage(im); } catch (Exception e) { - mainWindowController.getImage1().setImage(new Image("resources/icons/close_black_2048x2048.png")); + mainWindowController.getPosterImageView().setImage(new Image("resources/icons/close_black_2048x2048.png")); LOGGER.error(e); } - mainWindowController.getImage1().setImage(im); + mainWindowController.getPosterImageView().setImage(im); } catch (SQLException e) { LOGGER.error("Ups! an error occured!", e); diff --git a/src/main/java/kellerkinder/HomeFlix/controller/apiQuery.java b/src/main/java/kellerkinder/HomeFlix/controller/apiQuery.java index d0bf937..3af0bad 100644 --- a/src/main/java/kellerkinder/HomeFlix/controller/apiQuery.java +++ b/src/main/java/kellerkinder/HomeFlix/controller/apiQuery.java @@ -164,7 +164,7 @@ public class apiQuery{ if (retdata.contains("\"Response\":\"False\"")) { // TODO + FIXME mainWindowController.getTextFlow().getChildren().add(new Text(mainWindowController.getBundle().getString("noFilmFound"))); im = new Image("resources/icons/close_black_2048x2048.png"); - mainWindowController.getImage1().setImage(im); + mainWindowController.getPosterImageView().setImage(im); } else { nameText.add(0, new Text(mainWindowController.getBundle().getString("title") + ": ")); nameText.add(1, new Text(mainWindowController.getBundle().getString("year") + ": ")); @@ -200,7 +200,7 @@ public class apiQuery{ } else { im = new Image(responseString[18]); } - mainWindowController.getImage1().setImage(im); + mainWindowController.getPosterImageView().setImage(im); } } diff --git a/src/main/resources/fxml/MainWindow.fxml b/src/main/resources/fxml/MainWindow.fxml index d85176f..8f6f9b7 100644 --- a/src/main/resources/fxml/MainWindow.fxml +++ b/src/main/resources/fxml/MainWindow.fxml @@ -29,7 +29,7 @@ - +