From 2d5887db4fe99682c382fac88567a6a126380cbe Mon Sep 17 00:00:00 2001 From: Jannik Date: Wed, 28 Mar 2018 21:58:01 +0200 Subject: [PATCH] windows 10 & sql fixes * fixed files wit ' in the name causing a crash *fixed windows 10 is not detected --- src/main/java/kellerkinder/HomeFlix/application/Main.java | 2 +- .../java/kellerkinder/HomeFlix/controller/DBController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/kellerkinder/HomeFlix/application/Main.java b/src/main/java/kellerkinder/HomeFlix/application/Main.java index e2acd3a..ae797af 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/Main.java +++ b/src/main/java/kellerkinder/HomeFlix/application/Main.java @@ -93,7 +93,7 @@ public class Main extends Application { // get OS and the specific paths - if (osName.equals("Windows")) { + if (osName.contains("Windows")) { directory = new File(dirWin); configFile = new File(dirWin + "/config.xml"); posterCache = new File(dirWin + "/posterCache"); diff --git a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java index 36fd8fc..7ca7306 100644 --- a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java +++ b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java @@ -333,7 +333,7 @@ public class DBController { if (!filmsdbStreamURL.contains(episode.getPath())) { LOGGER.info("Added \"" + file.getName() + "\", Episode: " + episode.getName() + " to database"); stmt.executeUpdate("insert into films values (" - + "'" + episode.getPath() + "'," + + "'" + episode.getPath().replace("'", "''") + "'," + "'" + cutOffEnd(file.getName()) + "','" + sn + "','" + ep + "', 0, 0)"); connection.commit(); stmt.close();