From 1f02277f726f0cc00377ae02e34d9cae05e07466 Mon Sep 17 00:00:00 2001 From: Jannik Date: Thu, 20 Jul 2017 14:23:50 +0200 Subject: [PATCH] minor fixes * fixed streaming not working under linux * minor text fixes --- bin/.gitignore | 1 - bin/application/MainWindowController$1.class | Bin 3402 -> 3402 bytes bin/application/MainWindowController$2.class | Bin 3056 -> 3056 bytes bin/application/MainWindowController$3.class | Bin 2002 -> 2002 bytes bin/application/MainWindowController$4.class | Bin 1946 -> 1946 bytes bin/application/MainWindowController$5.class | Bin 2511 -> 2511 bytes bin/application/MainWindowController$6.class | Bin 2471 -> 2467 bytes bin/application/MainWindowController$7.class | Bin 4098 -> 4098 bytes bin/application/MainWindowController.class | Bin 36408 -> 36957 bytes src/application/MainWindowController.java | 126 ++++++++++--------- 10 files changed, 70 insertions(+), 57 deletions(-) diff --git a/bin/.gitignore b/bin/.gitignore index 925b114..b42b859 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1 @@ /application/ -/resources/ diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index 83f39ab48e238eb32e265592d37b4ecdde2d51f3..019d1fe828fc82bc92ef28c98221a7cd365fb16a 100644 GIT binary patch delta 92 zcmV-i0HgoP8p;~5*Q?l>#RK yu>vRn!U8D(#R4h--2yBC-~ufG@&Yaa4gxO$DgrP8I|4BQJ_0fURsuDX#0-YR2@^;F delta 92 zcmV-i0HgoP8p;~5)*!l>!+6 yu>u+Z!U7ur#R41v-2xr}-~t~2@&X_M4gw(oDgq(_I|3sCJ^~~GRstuJ#0-X$*Ag%Q diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index 05989309eab0d8625e93ea82dad2b762439a5aa7..8f84c0c1ca503a62c81ea4dfb2ee2c387bbce5e5 100644 GIT binary patch delta 85 zcmew${y}_07$;-m=5WqnM#oeJ5vDW-W2OuSC#FmWZ>B5;Kc;MkaHc$lSf+f2CZ+<0 m*+BLxrV@q?Or;Drfb<)tazdmjYSQ!D89u$}W delta 85 zcmew${y}_07$;-U=5WqnM#nG)5vFhkW2Q(3C#EO{Z>DGlKc*OlaHe>MSf&JqCZQ?ArnCfC|X~ delta 39 ucmcb_e~EuX6&qvz?Arn5X$oKf diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index 805fc8428c9736ad7f744769281c867b52607167..bcc0deaa98997faab378c6c28e5f5b43cee540ff 100644 GIT binary patch delta 35 rcmbQmKZ}1u3>#y|#zRvd|r4%J*!w+X-R2Os)9yNW_GG>K~a8EPHL{E-sBmqO8iP-vE0;>jQo^TCB@Ch zSoN3~r%nFK{@ZjW13%L&21};d3^q)27}A*LF_becVCZLB$S|2{5yL#D#SBZBmN2Yh XTFS72X&J*7rWFjknO06#vd|r4%J*#9%Myf(uX-R2Os)9yNW_GGVK~a8EPHL{^+|-hc{FKzq z$5{247~3a*W&ds3#lX+h&0xvY!(hYI%aF#@&rr@Zk)fYy62oMs$qe(DrZ6mFn#!<> XX&S=@rs)h@m}WBUW|}owm2(vUpVuc$ diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class index e7f5c3dd0dc5b7152625d50b53449ea4c7f9a224..a125619fc06c89dc7493523f1cc1727ead2acf97 100644 GIT binary patch delta 82 zcmV-Y0ImP06QdKbT?GL=lU@ZRvxWsm0s*X(%?JB6uK*7MumCv%u>d>*vH)fRv;cPk owg8U;w*Zp@xB#94xd5aBx&W#Iy8y5Pya2QUz5u%dzmxq4syC$@kN^Mx delta 86 zcmV-c0IC0@6Q>ifT?GL^lU@ZR19WI*vw;Oi0s)FOu#@=+s)GF+>i_@% diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class index 0fed8760b5510f08befb0789eb487cffd666dc09..c0d7f662464719a95f265ae4b902dd6479a9f8ef 100644 GIT binary patch delta 158 zcmZotXj0g)iJS50=FQxJO!X%iErtzDw;6T=#ZEEZW4Ok2pWz+yJEaGQDR!&-8)uDi_ly#=lG-m;{-= KZ0_YNWds1Sc{djT delta 158 zcmWN_y{dr$9LMqB|2v5~WiS~St*+oqHYI~Qa0e&DDWwcD;3Dkm$y17_Cpiob%1d4& z5iUb{rcZsU$!gN+My%($kvx^Y5)72WQyO0xhAJ}B4}U5%R)vY`Ox5CFZD#5)m%~C{ za5I+Lv(lBdo@^|{+G1=i&d$CAvm7kP(F&aGH?YRp8eGf?^tsuRyY0d}?9H7hFSq$s FvJVgqH2VMm diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 9aca2d14f8b72ba3b52e17799079b151211136ab..874457b9423d74c608e287d4c8fa4c8efb94fa7e 100644 GIT binary patch delta 15857 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 { + try { + Desktop.getDesktop().browse(new URI(datPath)); //open the streaming URL in browser + } catch (IOException | URISyntaxException e) { + e.printStackTrace(); + showErrorMsg(errorOpenStream, (IOException) e); + } + }).start(); + } else { + System.out.println("Desktop not supported"); } - if(output.contains("which: no vlc")||output == ""){ - Alert alert = new Alert(AlertType.INFORMATION); - alert.setHeaderText(""); - alert.setTitle("Info"); - alert.setContentText(vlcNotInstalled); - alert.showAndWait(); - }else{ + }else if (mode.equals("local")) { + if(System.getProperty("os.name").contains("Linux")){ + System.out.println("This is "+System.getProperty("os.name")); + String line; + String output = ""; + Process p; try { - Runtime.getRuntime().exec(new String[] { "vlc", getPath()+"/"+ datPath}); - } catch (IOException e) { - showErrorMsg(errorPlay,e); + p = Runtime.getRuntime().exec("which vlc"); + BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream())); + while ((line = input.readLine()) != null) { + output = line; + } + System.out.println(output); + input.close(); + } catch (IOException e1) { + e1.printStackTrace(); } - } - }else if(System.getProperty("os.name").contains("Windows") || System.getProperty("os.name").contains("Mac OS X")){ - System.out.println("This is "+System.getProperty("os.name")); - if(mode.equals("local")){ - try { - Desktop.getDesktop().open(new File(getPath()+"\\"+ datPath)); - } catch (IOException e) { - showErrorMsg(errorPlay,e); + if(output.contains("which: no vlc")||output == ""){ + Alert alert = new Alert(AlertType.INFORMATION); + alert.setHeaderText(""); + alert.setTitle("Info"); + alert.setContentText(vlcNotInstalled); + alert.showAndWait(); + }else{ + try { + Runtime.getRuntime().exec(new String[] { "vlc", getPath()+"/"+ datPath}); + } catch (IOException e) { + showErrorMsg(errorPlay,e); + } } - }else if(mode.equals("streaming")){ - try { - Desktop.getDesktop().browse(new URI(datPath)); //open the streaming URL in browser - } catch (URISyntaxException | IOException e) { - showErrorMsg(errorOpenStream, (IOException) e); - } - }else{ - IOException e = new IOException("error"); - showErrorMsg(errorMode, e); - - } + }else if(System.getProperty("os.name").contains("Windows") || System.getProperty("os.name").contains("Mac OS X")){ + System.out.println("This is "+System.getProperty("os.name")); + try { + Desktop.getDesktop().open(new File(getPath()+"\\"+ datPath)); + } catch (IOException e) { + showErrorMsg(errorPlay,e); + } + } else { + System.out.println("It seems like your operating system is not supported, please contact a developer!"); + System.out.println("Error code is: nsos; OS is: " + System.getProperty("os.name")); + } + } else { + IOException e = new IOException("error"); + showErrorMsg(errorMode, e); } } @@ -495,7 +502,6 @@ public class MainWindowController { } //Initialize the tables (treeTableViewfilm and tableViewStreamingdata) - @SuppressWarnings({ "unchecked"}) //TODO void initTabel(){ //film Table @@ -519,10 +525,17 @@ public class MainWindowController { columnSeason.setCellValueFactory(cellData -> cellData.getValue().getValue().seasonProperty().asObject()); columnEpisode.setCellValueFactory(cellData -> cellData.getValue().getValue().episodeProperty().asObject()); - treeTableViewfilm.getColumns().addAll(columnTitel, columnRating, columnStreamUrl, columnResolution, columnYear, columnSeason, columnEpisode); - treeTableViewfilm.getColumns().get(2).setVisible(false); //hide columnStreamUrl (column with file path important for the player) + //add columns to treeTableViewfilm + treeTableViewfilm.getColumns().add(columnTitel); + treeTableViewfilm.getColumns().add(columnRating); + treeTableViewfilm.getColumns().add(columnStreamUrl); + treeTableViewfilm.getColumns().add(columnResolution); + treeTableViewfilm.getColumns().add(columnYear); + treeTableViewfilm.getColumns().add(columnSeason); + treeTableViewfilm.getColumns().add(columnEpisode); + treeTableViewfilm.getColumns().get(2).setVisible(false); //hide columnStreamUrl (column with file URL, important for opening a file/stream) - //Change-listener for TreeTable + //Change-listener for treeTableViewfilm treeTableViewfilm.getSelectionModel().selectedItemProperty().addListener(new ChangeListener() { @Override public void changed(ObservableValue observable, Object oldVal, Object newVal){ @@ -552,14 +565,15 @@ public class MainWindowController { } }); - //context menu for treetableview + //context menu for treeTableViewfilm treeTableViewfilm.setContextMenu(menu); //Streaming-Settings Table dataNameColumn.setCellValueFactory(cellData -> cellData.getValue().titleProperty()); dataNameEndColumn.setCellValueFactory(cellData -> cellData.getValue().streamUrlProperty()); - tableViewStreamingdata.getColumns().addAll(dataNameColumn, dataNameEndColumn); + tableViewStreamingdata.getColumns().add(dataNameColumn); + tableViewStreamingdata.getColumns().add(dataNameEndColumn); tableViewStreamingdata.setItems(streamingData); } @@ -660,7 +674,7 @@ public class MainWindowController { Alert alert = new Alert(AlertType.ERROR); alert.setTitle("Error"); alert.setHeaderText(""); - alert.setContentText("There should be an error message in the future (like problem)\nIt seems as a cat has stolen the like-methode"); + alert.setContentText("There should be an error message in future (like-problem).\nIt seems as a cat has stolen the \"like-methode\"!"); e.printStackTrace(); } refreshTable(); @@ -682,7 +696,7 @@ public class MainWindowController { Alert alert = new Alert(AlertType.ERROR); alert.setTitle("Error"); alert.setHeaderText(""); - alert.setContentText("There should be an error message in the future (dislike problem)"); + alert.setContentText("There should be an error message in future (dislike problem)"); e.printStackTrace(); } refreshTable(); @@ -700,7 +714,7 @@ public class MainWindowController { ArrayList fav_false = new ArrayList(); ObservableList helpData; filterData.removeAll(filterData); -// treeTableViewfilm.getSelectionModel().clearSelection(selected); +// treeTableViewfilm.getSelectionModel().clearSelection(selected); root.getChildren().remove(0,root.getChildren().size()); if(mode.equals("local")){