Seil0/Project-HomeFlix
Seil0
/
Project-HomeFlix
1
0
Fork 0
Code Issues 7 Pull Requests Releases 4 Wiki Activity

code cleanup

This commit is contained in:
Jannik 2018-04-06 20:33:56 +02:00
parent d6554b9acd
commit 3afc836df7
5 changed files with 64 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.classpath
View File

@ -17,12 +17,13 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9">
<attributes> <attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>

8
.settings/org.eclipse.jdt.core.prefs
View File

@ -1,5 +1,13 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=9 org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=9 org.eclipse.jdt.core.compiler.compliance=9
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=9 org.eclipse.jdt.core.compiler.source=9

118
src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
View File

@ -1,6 +1,6 @@
/** /**
* Project-HomeFlix * Project-HomeFlix
* *
* Copyright 2016-2018 <@Seil0> * Copyright 2016-2018 <@Seil0>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -37,7 +37,6 @@ import java.io.StringWriter;
import java.io.Writer; import java.io.Writer;
import java.math.BigInteger; import java.math.BigInteger;
import java.net.URLConnection; import java.net.URLConnection;
import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
import java.util.Properties; import java.util.Properties;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@ -237,8 +236,6 @@ public class MainWindowController {
private String versionName = "glowing vampire"; private String versionName = "glowing vampire";
private String dialogBtnStyle; private String dialogBtnStyle;
private String color; private String color;
private String title;
private String streamUrl;
private String ratingSortType; private String ratingSortType;
private String local; private String local;
private String omdbAPIKey; private String omdbAPIKey;
@ -256,7 +253,7 @@ public class MainWindowController {
private int indexList; private int indexList;
private int next; private int next;
private ResourceBundle bundle; private ResourceBundle bundle;
private FilmTabelDataType currentFilm; private FilmTabelDataType currentTableFilm = new FilmTabelDataType("", "", "", "", false, false, null);
private ObservableList<String> languages = FXCollections.observableArrayList("English (en_US)", "Deutsch (de_DE)"); private ObservableList<String> languages = FXCollections.observableArrayList("English (en_US)", "Deutsch (de_DE)");
private ObservableList<String> branches = FXCollections.observableArrayList("stable", "beta"); private ObservableList<String> branches = FXCollections.observableArrayList("stable", "beta");
@ -296,8 +293,8 @@ public class MainWindowController {
loadSettings(); loadSettings();
checkAutoUpdate(); checkAutoUpdate();
initTabel(); initTabel();
initActions();
initUI(); initUI();
initActions();
} }
// Initialize the tables (treeTableViewfilm and sourcesTable) // Initialize the tables (treeTableViewfilm and sourcesTable)
@ -415,8 +412,8 @@ public class MainWindowController {
@Override @Override
public void changed(ObservableValue<? extends Number> ov, Number old_val, Number new_val) { public void changed(ObservableValue<? extends Number> ov, Number old_val, Number new_val) {
setSize(fontsizeSlider.getValue()); setSize(fontsizeSlider.getValue());
if (title != null) { if (!getCurrentTitle().isEmpty()) {
dbController.readCache(streamUrl); dbController.readCache(getCurrentStreamUrl());
} }
// ta1.setFont(Font.font("System", size)); // ta1.setFont(Font.font("System", size));
saveSettings(); saveSettings();
@ -426,8 +423,8 @@ public class MainWindowController {
like.setOnAction(new EventHandler<ActionEvent>() { like.setOnAction(new EventHandler<ActionEvent>() {
@Override @Override
public void handle(ActionEvent event) { public void handle(ActionEvent event) {
dbController.like(streamUrl); dbController.like(getCurrentStreamUrl());
dbController.refresh(streamUrl, indexList); dbController.refresh(getCurrentStreamUrl(), indexList);
refreshTable(); refreshTable();
} }
}); });
@ -435,8 +432,8 @@ public class MainWindowController {
dislike.setOnAction(new EventHandler<ActionEvent>() { dislike.setOnAction(new EventHandler<ActionEvent>() {
@Override @Override
public void handle(ActionEvent event) { public void handle(ActionEvent event) {
dbController.dislike(streamUrl); dbController.dislike(getCurrentStreamUrl());
dbController.refresh(streamUrl, indexList); dbController.refresh(getCurrentStreamUrl(), indexList);
refreshTable(); refreshTable();
} }
}); });
@ -448,45 +445,25 @@ public class MainWindowController {
columnFavorite.sortTypeProperty().addListener(new ChangeListener<SortType>() { columnFavorite.sortTypeProperty().addListener(new ChangeListener<SortType>() {
@Override @Override
public void changed(ObservableValue<? extends SortType> paramObservableValue, SortType paramT1, SortType paramT2) { public void changed(ObservableValue<? extends SortType> paramObservableValue, SortType paramT1, SortType paramT2) {
LOGGER.info("NAME Clicked -- sortType = " + paramT1 + ", SortType=" + paramT2); filmRoot.getChildren().clear();
ArrayList<Integer> fav_true = new ArrayList<Integer>();
ArrayList<Integer> fav_false = new ArrayList<Integer>(); if (paramT2.equals(SortType.DESCENDING)) {
ObservableList<FilmTabelDataType> helpData; for (FilmTabelDataType film : filmsList) {
filterData.removeAll(filterData); if (film.getFavorite()) {
// treeTableViewfilm.getSelectionModel().clearSelection(selected); filmRoot.getChildren().add(0, new TreeItem<FilmTabelDataType>(film));
filmRoot.getChildren().removeAll(filmRoot.getChildren()); } else {
filmRoot.getChildren().add(new TreeItem<FilmTabelDataType>(film));
helpData = filmsList; }
for (int i = 0; i < helpData.size(); i++) {
if (helpData.get(i).getFavorite() == true) {
fav_true.add(i);
} else {
fav_false.add(i);
}
}
if (paramT2.toString().equals("DESCENDING")) {
LOGGER.info("Absteigend"); // Debug, delete?
for (int i = 0; i < fav_true.size(); i++) {
filterData.add(helpData.get(fav_true.get(i)));
}
for (int i = 0; i < fav_false.size(); i++) {
filterData.add(helpData.get(fav_false.get(i)));
} }
} else { } else {
for (int i = 0; i < fav_false.size(); i++) { System.out.println("ascending");
filterData.add(helpData.get(fav_false.get(i))); for (FilmTabelDataType film : filmsList) {
if (!film.getFavorite()) {
filmRoot.getChildren().add(new TreeItem<FilmTabelDataType>(film));
} else {
filmRoot.getChildren().add(new TreeItem<FilmTabelDataType>(film));
}
} }
for (int i = 0; i < fav_true.size(); i++) {
filterData.add(helpData.get(fav_true.get(i)));
}
}
LOGGER.info(filterData.size()); // Debug, delete?
for (int i = 0; i < filterData.size(); i++) {
// LOGGER.info(filterData.get(i).getTitle()+"; "+filterData.get(i).getRating()); // Debugging
// add filtered data to root node after search
filmRoot.getChildren().add(new TreeItem<FilmTabelDataType>(filterData.get(i)));
} }
} }
}); });
@ -495,23 +472,16 @@ public class MainWindowController {
filmsTreeTable.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Object>() { filmsTreeTable.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Object>() {
@Override @Override
public void changed(ObservableValue<?> observable, Object oldVal, Object newVal) { public void changed(ObservableValue<?> observable, Object oldVal, Object newVal) {
indexTable = filmsTreeTable.getSelectionModel().getSelectedIndex(); // get selected item currentTableFilm = filmsTreeTable.getSelectionModel().getSelectedItem().getValue(); // set the current film object
indexList = filmsList.indexOf(currentTableFilm); // get selected items list index
indexTable = filmsTreeTable.getSelectionModel().getSelectedIndex(); // get selected items table index
last = indexTable - 1; last = indexTable - 1;
next = indexTable + 1; next = indexTable + 1;
title = columnTitle.getCellData(indexTable); // get name of selected item
streamUrl = columnStreamUrl.getCellData(indexTable); // get file path of selected item
for (FilmTabelDataType helpData : filmsList) { if (currentTableFilm.getCached()) {
if (helpData.getStreamUrl().equals(streamUrl)) { LOGGER.info("loading from cache: " + getCurrentTitle());
indexList = filmsList.indexOf(helpData); dbController.readCache(getCurrentStreamUrl());
}
}
currentFilm = filmsList.get(indexList);
if (filmsList.get(indexList).getCached()) {
LOGGER.info("loading from cache: " + title);
dbController.readCache(streamUrl);
} else { } else {
omdbAPIController = new OMDbAPIController(mainWindowController, dbController, main); omdbAPIController = new OMDbAPIController(mainWindowController, dbController, main);
Thread omdbAPIThread = new Thread(omdbAPIController); Thread omdbAPIThread = new Thread(omdbAPIController);
@ -548,8 +518,8 @@ public class MainWindowController {
@FXML @FXML
private void playbtnclicked() { private void playbtnclicked() {
if (isSupportedFormat(currentFilm)) { if (isSupportedFormat(currentTableFilm)) {
new Player(currentFilm, dbController); new Player(currentTableFilm, dbController);
} else { } else {
LOGGER.error("using fallback player!"); LOGGER.error("using fallback player!");
@ -573,7 +543,7 @@ public class MainWindowController {
vlcInfoAlert.showAndWait(); vlcInfoAlert.showAndWait();
} else { } else {
try { try {
new ProcessBuilder("vlc", streamUrl).start(); new ProcessBuilder("vlc", getCurrentStreamUrl()).start();
} catch (IOException e1) { } catch (IOException e1) {
showErrorMsg(errorPlay, e1); showErrorMsg(errorPlay, e1);
} }
@ -581,7 +551,7 @@ public class MainWindowController {
} else if (System.getProperty("os.name").contains("Windows") || System.getProperty("os.name").contains("Mac OS X")) { } else if (System.getProperty("os.name").contains("Windows") || System.getProperty("os.name").contains("Mac OS X")) {
try { try {
Desktop.getDesktop().open(new File(streamUrl)); Desktop.getDesktop().open(new File(getCurrentStreamUrl()));
} catch (IOException e1) { } catch (IOException e1) {
showErrorMsg(errorPlay, e1); showErrorMsg(errorPlay, e1);
} }
@ -603,7 +573,7 @@ public class MainWindowController {
@FXML @FXML
private void openfolderbtnclicked() { private void openfolderbtnclicked() {
String dest = new File(streamUrl).getParentFile().getAbsolutePath(); String dest = new File(getCurrentStreamUrl()).getParentFile().getAbsolutePath();
if (!System.getProperty("os.name").contains("Linux")) { if (!System.getProperty("os.name").contains("Linux")) {
try { try {
Desktop.getDesktop().open(new File(dest)); Desktop.getDesktop().open(new File(dest));
@ -699,6 +669,12 @@ public class MainWindowController {
// refresh the selected child of the root node // refresh the selected child of the root node
private void refreshTable() { private void refreshTable() {
System.out.println("refresh");
System.out.println(filmRoot.getChildren().get(indexTable).getValue());
System.out.println(currentTableFilm);
// filmRoot.getChildren().get()
filmRoot.getChildren().get(indexTable).setValue(filmsList.get(indexList)); filmRoot.getChildren().get(indexTable).setValue(filmsList.get(indexList));
} }
@ -1047,12 +1023,12 @@ public class MainWindowController {
return color; return color;
} }
public String getTitle() { public String getCurrentTitle() {
return title; return currentTableFilm.getTitle();
} }
public String getStreamUrl() { public String getCurrentStreamUrl() {
return streamUrl; return currentTableFilm.getStreamUrl();
} }
public void setSize(Double input) { public void setSize(Double input) {

10
src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java
View File

@ -64,7 +64,7 @@ public class OMDbAPIController implements Runnable {
// get by title, TODO implement search FIXME set correct info if film dosen't exist // get by title, TODO implement search FIXME set correct info if film dosen't exist
try { try {
URL apiUrl = new URL(URL + mainWindowController.getOmdbAPIKey() + "&t=" URL apiUrl = new URL(URL + mainWindowController.getOmdbAPIKey() + "&t="
+ mainWindowController.getTitle().replace(" ", "%20")); + mainWindowController.getCurrentTitle().replace(" ", "%20"));
BufferedReader ina = new BufferedReader(new InputStreamReader(apiUrl.openStream())); BufferedReader ina = new BufferedReader(new InputStreamReader(apiUrl.openStream()));
output = ina.readLine(); output = ina.readLine();
ina.close(); ina.close();
@ -102,7 +102,7 @@ public class OMDbAPIController implements Runnable {
//resize the image to fit in the posterImageView and add it to the cache //resize the image to fit in the posterImageView and add it to the cache
try { try {
BufferedImage originalImage = ImageIO.read(new URL(responseString[18])); //change path to where file is located BufferedImage originalImage = ImageIO.read(new URL(responseString[18])); //change path to where file is located
posterPath = main.getPosterCache() + "/" + mainWindowController.getTitle() + ".png"; posterPath = main.getPosterCache() + "/" + mainWindowController.getCurrentTitle() + ".png";
ImageIO.write(originalImage, "png", new File(posterPath)); ImageIO.write(originalImage, "png", new File(posterPath));
LOGGER.info("adding poster to cache: "+posterPath); LOGGER.info("adding poster to cache: "+posterPath);
} catch (Exception e) { } catch (Exception e) {
@ -110,16 +110,16 @@ public class OMDbAPIController implements Runnable {
} }
// adding strings to the cache // adding strings to the cache
dbController.addCache(mainWindowController.getStreamUrl(), responseString[0], responseString[1], dbController.addCache(mainWindowController.getCurrentStreamUrl(), responseString[0], responseString[1],
responseString[2], responseString[3], responseString[4], responseString[5], responseString[6], responseString[2], responseString[3], responseString[4], responseString[5], responseString[6],
responseString[7], responseString[8], responseString[9], responseString[10], responseString[11], responseString[7], responseString[8], responseString[9], responseString[10], responseString[11],
responseString[12], responseString[13], responseString[14], responseString[15], responseString[16], responseString[12], responseString[13], responseString[14], responseString[15], responseString[16],
responseString[17], posterPath, responseString[19]); responseString[17], posterPath, responseString[19]);
dbController.setCached(mainWindowController.getStreamUrl()); dbController.setCached(mainWindowController.getCurrentStreamUrl());
// load data to the MainWindowController // load data to the MainWindowController
Platform.runLater(() -> { Platform.runLater(() -> {
dbController.readCache(mainWindowController.getStreamUrl()); dbController.readCache(mainWindowController.getCurrentStreamUrl());
}); });
} }
} }

4
src/main/java/kellerkinder/HomeFlix/player/PlayerController.java
View File

@ -137,8 +137,7 @@ public class PlayerController {
@Override @Override
public void changed(ObservableValue<? extends Duration> observable, Duration oldValue, Duration newValue) { public void changed(ObservableValue<? extends Duration> observable, Duration oldValue, Duration newValue) {
currentTime = newValue.toMillis(); currentTime = newValue.toMillis();
int episode = 0; int episode = !film.getEpisode().isEmpty() ? Integer.parseInt(film.getEpisode()) : 0;
if (film.getEpisode().length() != 0) episode = Integer.parseInt(film.getEpisode());
if ((duration - currentTime) < 10000 && episode != 0 && autoplay) { if ((duration - currentTime) < 10000 && episode != 0 && autoplay) {
autoplay = false; autoplay = false;
@ -147,7 +146,6 @@ public class PlayerController {
//start the new film //start the new film
FilmTabelDataType nextFilm = dbController.getNextEpisode(film.getTitle(), episode + 1); FilmTabelDataType nextFilm = dbController.getNextEpisode(film.getTitle(), episode + 1);
if (nextFilm != null) { if (nextFilm != null) {
// System.out.println("next episode is: " + nextFilm.getStreamUrl());
mediaPlayer.stop(); mediaPlayer.stop();
player.playNewFilm(nextFilm); player.playNewFilm(nextFilm);
autoplay = true; autoplay = true;