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

release 0.8.0 #12

Merged
Seil0 merged 92 commits from dev into master 2019-07-04 12:41:05 +02:00
Conversation 0 Commits 92 Files Changed 63 +639 -382
11 changed files with 639 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 46efa77fce - Show all commits

8
src/main/java/kellerkinder/HomeFlix/controller/DBController.java
View File

@ -592,8 +592,12 @@ public class DBController {
textFlow.addAll(nameText.get(1), new Text(rs.getString("Year") + "\n"));
textFlow.addAll(nameText.get(2), new Text(rs.getString("Rated") + "\n"));
textFlow.addAll(nameText.get(3), new Text(rs.getString("Released") + "\n"));
textFlow.addAll(nameText.get(4), new Text(rs.getString("Season") + "\n"));
textFlow.addAll(nameText.get(5), new Text(rs.getString("Episode") + "\n"));
if (rs.getString("Episode").length() > 0) {
textFlow.addAll(nameText.get(4), new Text(rs.getString("Season") + "\n"));
textFlow.addAll(nameText.get(5), new Text(rs.getString("Episode") + "\n"));
}
textFlow.addAll(nameText.get(6), new Text(rs.getString("Runtime") + "\n"));
textFlow.addAll(nameText.get(7), new Text(rs.getString("Genre") + "\n"));
textFlow.addAll(nameText.get(8), new Text(rs.getString("Director") + "\n"));

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

@ -47,6 +47,7 @@ public class OMDbAPIController implements Runnable {
private DBController dbController;
private Main main;
private String URL = "https://www.omdbapi.com/?apikey=";
private boolean useEpisode = true;
private static final Logger LOGGER = LogManager.getLogger(MainWindowController.class.getName());
/**
@ -74,6 +75,11 @@ public class OMDbAPIController implements Runnable {
String title = searchByTitle(mainWindowController.getCurrentTitle());
if (title.length() > 0) {
object = getByTitle(title);
if(object.getString("Error", "").contains("Series or episode not found!")) {
useEpisode = false;
object = getByTitle(title);
}
} else {
return;
}
@ -133,7 +139,7 @@ public class OMDbAPIController implements Runnable {
String output = null;
URL apiUrl;
try {
if (mainWindowController.getCurrentTableFilm().getSeason().length() > 0) {
if (mainWindowController.getCurrentTableFilm().getSeason().length() > 0 && useEpisode) {
apiUrl = new URL(URL + mainWindowController.getOmdbAPIKey() + "&t="
+ title.replace(" ", "%20")
+ "&Season=" + mainWindowController.getCurrentTableFilm().getSeason()
@ -157,7 +163,7 @@ public class OMDbAPIController implements Runnable {
return Json.parse(output).asObject();
}
/** TODO if responser == false & isSereis, query without series
/**
* search for a movie/series title
* @param title the movie/series title
* @return the correct title if found