Compare commits
19 Commits
Author | SHA1 | Date | |
---|---|---|---|
9876ad6212 | |||
a664a9c5c4 | |||
810b4ee957 | |||
026dde43d8 | |||
cac744ce21 | |||
08099488a8 | |||
30aa11efc2 | |||
d425896e87 | |||
596a29c5cd | |||
ee86c9be48 | |||
6304c01b9d | |||
ecceb9010e | |||
b50b1d547d | |||
2c1c39c9d1 | |||
6f067055f0 | |||
4145a09b5d | |||
18f387b4b1 | |||
594c1fbd37 | |||
8e4ef3e087 |
@ -5,5 +5,6 @@
|
||||
<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Jannik/workspace/Project HomeFlix/jfoenix.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Jannik/workspace/Project HomeFlix/minimal-json-0.9.4.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Jannik/workspace/Project HomeFlix/commons-lang3-3.4.jar"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
3
.directory
Normal file
@ -0,0 +1,3 @@
|
||||
[Dolphin]
|
||||
Timestamp=2016,8,15,12,18,4
|
||||
Version=3
|
5
.gitignore
vendored
@ -45,6 +45,9 @@ $RECYCLE.BIN/
|
||||
Network Trash Folder
|
||||
Temporary Items
|
||||
.apdisk
|
||||
ProjectHomeFlix.jar
|
||||
jfoenix.jar
|
||||
minimal-json-0.9.4.jar
|
||||
config.xml
|
||||
|
||||
config.xml
|
||||
commons-lang3-3.4.jar
|
||||
|
15
README.md
@ -1,6 +1,7 @@
|
||||
# Project-HomeFlix
|
||||
|
||||
Project HomeFlix is a Kellerkinder Project. More Information soon ...
|
||||
Project HomeFlix is a Kellerkinder Project. HomeFlix is a Programm that alowes you to sort all your local
|
||||
saved movies in clean UI.
|
||||
|
||||
Librarys used in this Project:
|
||||
JFoenix https://github.com/jfoenixadmin/JFoenix
|
||||
@ -8,17 +9,7 @@ minimal-json https://github.com/ralfstx/minimal-json
|
||||
|
||||
## Installation
|
||||
|
||||
download compiled .jar
|
||||
|
||||
##FAQ
|
||||
- HomeFlix isn't starting after update
|
||||
- delete the config.xml file and start HomeFlix again
|
||||
- can't choos a main color
|
||||
- restart HomeFlix
|
||||
- HomeFlix hangs or dosen't responde
|
||||
- try restarting it and check the movie names
|
||||
- cann't start HomeFlix under Linux
|
||||
- check your Java version. Java 8 update 91 is required
|
||||
read our documentation
|
||||
|
||||
Project HomeFlix © 2016 Software Development Kellerkinder (SDK)
|
||||
www.kellerkinder.xyz
|
||||
|
@ -1,9 +1,9 @@
|
||||
# HomeFlix-Local_de_DE.properties German Local
|
||||
# HomeFlix-Local_de_DE.properties German Local
|
||||
info = Info
|
||||
settings = Einstellungen
|
||||
play = play
|
||||
openFolder = Ordner \u00F6ffnen
|
||||
chooseFolder = Ordner auswählen
|
||||
chooseFolder = Ordner ausw\u00E4hlen
|
||||
fontSize = Schriftgr\u00F6\u00DFe:
|
||||
checkUpdates = Auf Update pr\u00FCfen
|
||||
autoUpdate = beim Start nach Updates suchen:
|
||||
@ -11,5 +11,6 @@ version = Version:
|
||||
columnName = Name
|
||||
columnRating = Bewertung
|
||||
columnDatName = Datei Name
|
||||
errorUpdate = Es ist ein Fehler aufgetreten! \n Um Hilfe zu erhalten besuchen Sie \nwww.kellerkinder.xyz oder support@kellerkinder.xyz
|
||||
errorUpdateV = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not check update version (nvc)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
errorUpdateD = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not download update files (ndf)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
@ -11,5 +11,6 @@ version = Version:
|
||||
columnName = Name
|
||||
columnRating = Rating
|
||||
columnDatName = File Name
|
||||
errorUpdate = An error has occurred! \n To get help, visit \n nwww.kellerkinder.xyz or support@kellerkinder.xyz
|
||||
errorUpdateV = An error has occurred during update! \nError: could not check update version (nvc) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
errorUpdateD = An error has occurred during update! \nError: could not download update files (ndf) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
19
bin/recources/HomeFlix-Local_de_DE.properties
Normal file
@ -0,0 +1,19 @@
|
||||
# HomeFlix-Local_de_DE.properties German Local
|
||||
info = Info
|
||||
settings = Einstellungen
|
||||
play = play
|
||||
openFolder = Ordner \u00F6ffnen
|
||||
chooseFolder = Ordner ausw\u00E4hlen
|
||||
fontSize = Schriftgr\u00F6\u00DFe:
|
||||
checkUpdates = Auf Update pr\u00FCfen
|
||||
autoUpdate = beim Start nach Updates suchen:
|
||||
version = Version:
|
||||
columnName = Name
|
||||
columnRating = Bewertung
|
||||
columnDatName = Datei Name
|
||||
errorUpdateV = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not check update version (nvc)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
errorUpdateD = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not download update files (ndf)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
errorPlay = Beim \u00F6ffnen der Datei ist ein Fehler aufgetreten! \nError: could not open file (nof) \nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
linuxBug = Zurzeit werden unter Linux leider keine Dateien mit Leerzeichen unterst\u00FCtzt!
|
||||
vlcNotInstalled = Um einen Film abspielen wird der VLC Media Player ben\u00F6tigt!
|
||||
infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
19
bin/recources/HomeFlix-Local_en_US.properties
Normal file
@ -0,0 +1,19 @@
|
||||
# HomeFlix-Local_en_US.properties US-English Local and default
|
||||
info = Info
|
||||
settings = Settings
|
||||
play = play
|
||||
openFolder = open Folder
|
||||
chooseFolder = choose Directory
|
||||
fontSize = font size:
|
||||
checkUpdates = check for updates
|
||||
autoUpdate = check at startup for updates:
|
||||
version = Version:
|
||||
columnName = Name
|
||||
columnRating = Rating
|
||||
columnDatName = File Name
|
||||
errorUpdateV = An error has occurred during update! \nError: could not check update version (nvc) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
errorUpdateD = An error has occurred during update! \nError: could not download update files (ndf) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
errorPlay = An error has occurred during opening the file! \nError: could not open file (nof) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
linuxBug = Currently no files are supported with additional space under Linux unfortunately!
|
||||
vlcNotInstalled = VLC Media Player is required to play a movie!
|
||||
infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
BIN
bin/recources/menu_icon_white.png
Normal file
After Width: | Height: | Size: 15 KiB |
10
config.xml
@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
|
||||
<properties>
|
||||
<comment>Project HomeFlix settings</comment>
|
||||
<entry key="color">ee3523</entry>
|
||||
<entry key="autoUpdate">0</entry>
|
||||
<entry key="size">12.0</entry>
|
||||
<entry key="local">1</entry>
|
||||
<entry key="path">C:\Users\Jannik\Videos\Beispielfilme</entry>
|
||||
</properties>
|
@ -1,9 +1,9 @@
|
||||
# HomeFlix-Local_de_DE.properties German Local
|
||||
# HomeFlix-Local_de_DE.properties German Local
|
||||
info = Info
|
||||
settings = Einstellungen
|
||||
play = play
|
||||
openFolder = Ordner \u00F6ffnen
|
||||
chooseFolder = Ordner auswählen
|
||||
chooseFolder = Ordner ausw\u00E4hlen
|
||||
fontSize = Schriftgr\u00F6\u00DFe:
|
||||
checkUpdates = Auf Update pr\u00FCfen
|
||||
autoUpdate = beim Start nach Updates suchen:
|
||||
@ -11,5 +11,6 @@ version = Version:
|
||||
columnName = Name
|
||||
columnRating = Bewertung
|
||||
columnDatName = Datei Name
|
||||
errorUpdate = Es ist ein Fehler aufgetreten! \n Um Hilfe zu erhalten besuchen Sie \nwww.kellerkinder.xyz oder support@kellerkinder.xyz
|
||||
errorUpdateV = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not check update version (nvc)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
errorUpdateD = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not download update files (ndf)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
@ -11,5 +11,6 @@ version = Version:
|
||||
columnName = Name
|
||||
columnRating = Rating
|
||||
columnDatName = File Name
|
||||
errorUpdate = An error has occurred! \n To get help, visit \n nwww.kellerkinder.xyz or support@kellerkinder.xyz
|
||||
errorUpdateV = An error has occurred during update! \nError: could not check update version (nvc) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
errorUpdateD = An error has occurred during update! \nError: could not download update files (ndf) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
@ -66,7 +66,7 @@ public class Main extends Application {
|
||||
primaryStage.setMinWidth(900.00);
|
||||
primaryStage.setResizable(false);
|
||||
primaryStage.setTitle("Project HomeFlix");
|
||||
primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/Homeflix_Icon_64x64.png"))); //f<>gt Anwendungsicon hinzu
|
||||
primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/recources/Homeflix_Icon_64x64.png"))); //f<>gt Anwendungsicon hinzu
|
||||
|
||||
|
||||
mainWindowController = loader.getController(); //verkn<6B>pfung von FXMLController und Controller Klasse
|
||||
|
@ -40,6 +40,8 @@ import java.util.Properties;
|
||||
import java.util.ResourceBundle;
|
||||
import java.util.Scanner;
|
||||
|
||||
import org.apache.commons.lang3.SystemUtils;
|
||||
|
||||
import com.eclipsesource.json.Json;
|
||||
import com.eclipsesource.json.JsonObject;
|
||||
import com.jfoenix.controls.JFXButton;
|
||||
@ -105,13 +107,13 @@ public class MainWindowController {
|
||||
@FXML
|
||||
private JFXButton infoBtn = new JFXButton("Info");
|
||||
@FXML
|
||||
private JFXButton demoBtn = new JFXButton("Beheben");
|
||||
private JFXButton demoBtn = new JFXButton("Debugging");
|
||||
@FXML
|
||||
private JFXButton settingsBtn = new JFXButton("Settings");
|
||||
@FXML
|
||||
private JFXButton updateBtn = new JFXButton("Auf Update pr<70>fen");
|
||||
private JFXButton updateBtn = new JFXButton("Auf Update pr<70>fen");
|
||||
@FXML
|
||||
private JFXButton directoryBtn = new JFXButton("Ordner ausw<73>hlen");
|
||||
private JFXButton directoryBtn = new JFXButton("Ordner ausw<73>hlen");
|
||||
@FXML
|
||||
private JFXToggleButton autoupdateBtn = new JFXToggleButton();
|
||||
@FXML
|
||||
@ -129,7 +131,7 @@ public class MainWindowController {
|
||||
@FXML
|
||||
private Label versionlbl = new Label();
|
||||
@FXML
|
||||
private Label sizelbl = new Label("Schriftgr<EFBFBD><EFBFBD>e:");
|
||||
private Label sizelbl = new Label("Schriftgr<EFBFBD><EFBFBD>e:");
|
||||
@FXML
|
||||
private Label aulbl = new Label("beim starten nach Updates suchen:");
|
||||
@FXML
|
||||
@ -144,15 +146,19 @@ public class MainWindowController {
|
||||
@FXML
|
||||
TreeTableColumn<uiData, String> columnDatName = new TreeTableColumn<>("Datei Name");
|
||||
|
||||
private boolean menutrue = false; //merker f<>r menubtn (<28>ffnen oder schlie<69>en)
|
||||
private boolean menutrue = false; //merker f<>r menubtn (<28>ffnen oder schlie<69>en)
|
||||
private boolean settingstrue = false;
|
||||
private String version = "0.3.5";
|
||||
private String versionURL = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/version";
|
||||
private String downloadLink = "";
|
||||
private String updateDataURL = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/ProjectHomeFlix.jar";
|
||||
private String version = "0.3.6";
|
||||
private String versionURL = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/updates/version.txt";
|
||||
private String downloadLink = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/updates/downloadLink.txt";
|
||||
|
||||
private String errorUpdate;
|
||||
private String updateDataURL;
|
||||
private String errorUpdateD;
|
||||
private String errorUpdateV;
|
||||
private String errorPlay;
|
||||
private String infoText;
|
||||
private String linuxBugText;
|
||||
private String vlcNotInstalled;
|
||||
private String aktVersion;
|
||||
private String path;
|
||||
private String color;
|
||||
@ -170,9 +176,9 @@ public class MainWindowController {
|
||||
private ObservableList<uiData> newDaten = FXCollections.observableArrayList();
|
||||
private ObservableList<uiData> filterData = FXCollections.observableArrayList();
|
||||
private ObservableList<String> locals = FXCollections.observableArrayList("english", "deutsch");
|
||||
private Image imHF = new Image("Homeflix_Poster.png");
|
||||
private ImageView menu_icon_black = new ImageView(new Image("menu_icon_black.png"));
|
||||
// private ImageView menu_icon_white = new ImageView(new Image("menu_icon_white.png"));
|
||||
private Image imHF = new Image("recources/Homeflix_Poster.png");
|
||||
private ImageView menu_icon_black = new ImageView(new Image("recources/menu_icon_black.png"));
|
||||
private ImageView menu_icon_white = new ImageView(new Image("recources/menu_icon_white.png"));
|
||||
private DirectoryChooser directoryChooser = new DirectoryChooser();
|
||||
Properties props = new Properties();
|
||||
|
||||
@ -279,7 +285,7 @@ public class MainWindowController {
|
||||
}
|
||||
});
|
||||
|
||||
//demoBtn clicked
|
||||
//demoBtn clicked debbuging
|
||||
demoBtn.setOnAction(new EventHandler<ActionEvent>(){
|
||||
@Override
|
||||
public void handle(ActionEvent event) {
|
||||
@ -305,18 +311,66 @@ public class MainWindowController {
|
||||
|
||||
@FXML
|
||||
private void playbtnclicked(){
|
||||
try {
|
||||
Desktop.getDesktop().open(new File(getPath()+"\\"+ datPath)); //<2F>ffnt die aktuell ausgew<65>hlte Datei
|
||||
} catch (IOException e) {
|
||||
// Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
if(SystemUtils.IS_OS_LINUX){
|
||||
System.out.println("This is Linux");
|
||||
String line;
|
||||
String output = "";
|
||||
Process p;
|
||||
try {
|
||||
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) {
|
||||
// Auto-generated catch block
|
||||
e1.printStackTrace();
|
||||
}
|
||||
if(output.contains("which: no vlc")||output == ""){
|
||||
Alert alert = new Alert(AlertType.INFORMATION);
|
||||
alert.setHeaderText("");
|
||||
alert.setTitle("Info");
|
||||
alert.setContentText(vlcNotInstalled);
|
||||
alert.showAndWait();
|
||||
}else if(datPath.contains(" ")){
|
||||
Alert alert = new Alert(AlertType.INFORMATION);
|
||||
alert.setHeaderText("");
|
||||
alert.setTitle("Info");
|
||||
alert.setContentText(linuxBugText);
|
||||
alert.showAndWait();
|
||||
}else{
|
||||
try {
|
||||
Runtime.getRuntime().exec("vlc "+getPath()+"/"+ datPath);
|
||||
} catch (IOException e) {
|
||||
Alert alert = new Alert(AlertType.ERROR);
|
||||
alert.setHeaderText("");
|
||||
alert.setTitle("Info");
|
||||
alert.setContentText(errorPlay);
|
||||
alert.showAndWait();
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}else if(SystemUtils.IS_OS_WINDOWS || SystemUtils.IS_OS_MAC_OSX){
|
||||
System.out.println("This is Windows or Mac OSX");
|
||||
try {
|
||||
Desktop.getDesktop().open(new File(getPath()+"\\"+ datPath));
|
||||
} catch (IOException e) {
|
||||
Alert alert = new Alert(AlertType.ERROR);
|
||||
alert.setHeaderText("");
|
||||
alert.setTitle("Info");
|
||||
alert.setContentText(errorPlay);
|
||||
alert.showAndWait();
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void openfolderbtnclicked(){
|
||||
try {
|
||||
Desktop.getDesktop().open(new File(getPath())); //<2F>ffnet den aktuellen Pfad
|
||||
Desktop.getDesktop().open(new File(getPath())); //<2F>ffnet den aktuellen Pfad
|
||||
} catch (IOException e) {
|
||||
// Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
@ -450,7 +504,7 @@ public class MainWindowController {
|
||||
}
|
||||
|
||||
for(int i = 0; i < filterData.size(); i++){
|
||||
root.getChildren().addAll(new TreeItem<uiData>(filterData.get(i))); //f<>gt daten zur Rootnode hinzu
|
||||
root.getChildren().addAll(new TreeItem<uiData>(filterData.get(i))); //f<>gt daten zur Rootnode hinzu
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -491,18 +545,18 @@ public class MainWindowController {
|
||||
|
||||
treeTableViewfilm.getColumns().addAll(columnName, columnRating, columnDatName);
|
||||
|
||||
//Changelistener f<>r TreeTable
|
||||
//Changelistener f<>r TreeTable
|
||||
treeTableViewfilm.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Object>() {
|
||||
|
||||
@Override
|
||||
public void changed(ObservableValue<?> observable, Object oldVal, Object newVal) {
|
||||
// last = selected; //f<>r autoplay
|
||||
// last = selected; //f<>r autoplay
|
||||
selected = treeTableViewfilm.getSelectionModel().getSelectedIndex(); // holt aktuelles Item
|
||||
last = selected - 1;
|
||||
next = selected + 1;
|
||||
Name = columnName.getCellData(selected); // holt Namen des Aktuelle Items aus der ColumnName
|
||||
datPath = columnDatName.getCellData(selected); // holt den aktuellen Datei Pfad aus der ColumnDatName
|
||||
ta1.setText(""); // l<>scht Text in ta1
|
||||
ta1.setText(""); // l<>scht Text in ta1
|
||||
apiAbfrage(Name); // startet die api abfrage
|
||||
ta1.positionCaret(0); // setzt die startposition des Cursors in
|
||||
// ta1
|
||||
@ -512,7 +566,7 @@ public class MainWindowController {
|
||||
treeTableViewfilm.getColumns().get(2).setVisible(false); //blendet die Column mit den Dateinamen aus (wichtig um sie abzuspielen)
|
||||
}
|
||||
|
||||
//pr<70>ft auf Update und f<>ht es gegebenenfalls aus
|
||||
//pr<70>ft auf Update und f<>ht es gegebenenfalls aus
|
||||
private void update(){
|
||||
|
||||
System.out.println("check for updates ...");
|
||||
@ -522,47 +576,51 @@ public class MainWindowController {
|
||||
aktVersion = in.readLine(); //schreibt inputstream in String
|
||||
in.close();
|
||||
} catch (IOException e1) {
|
||||
// Auto-generated catch block
|
||||
Alert alert = new Alert(AlertType.ERROR);
|
||||
alert.setTitle("Error");
|
||||
alert.setHeaderText("");
|
||||
alert.setContentText(errorUpdateV);
|
||||
alert.showAndWait();
|
||||
e1.printStackTrace();
|
||||
}
|
||||
System.out.println("Version: "+version+", Update: "+aktVersion);
|
||||
|
||||
//vergleicht die Versionsnummern, bei aktversion > version wird ein Update durchgrf<72>hrt
|
||||
//vergleicht die Versionsnummern, bei aktversion > version wird ein Update durchgrf<72>hrt
|
||||
int iversion = Integer.parseInt(version.replace(".", ""));
|
||||
int iaktVersion = Integer.parseInt(aktVersion.replace(".", ""));
|
||||
|
||||
if(iversion >= iaktVersion){
|
||||
updateBtn.setText("kein Update verf<72>gbar");
|
||||
System.out.println("kein Update verf<72>gbar");
|
||||
updateBtn.setText("kein Update verf<72>gbar");
|
||||
System.out.println("kein Update verf<72>gbar");
|
||||
}else{
|
||||
updateBtn.setText("Update verf<72>gbar");
|
||||
System.out.println("Update verf<72>gbar");
|
||||
updateBtn.setText("Update verf<72>gbar");
|
||||
System.out.println("Update verf<72>gbar");
|
||||
try {
|
||||
URL website;
|
||||
URL downloadURL = new URL(downloadLink);
|
||||
BufferedReader in = new BufferedReader(new InputStreamReader(downloadURL.openStream()));
|
||||
//updateDataURL = in.readLine();
|
||||
updateDataURL = in.readLine();
|
||||
website = new URL(updateDataURL); //Update URL
|
||||
ReadableByteChannel rbc = Channels.newChannel(website.openStream()); //<2F>ffnet neuen Stream/Channel
|
||||
FileOutputStream fos = new FileOutputStream("ProjectHomeFlix.jar"); //neuer fileoutputstram f<>r ProjectHomeFLix.jar
|
||||
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); //holt datei von 0 bis max gr<67><72>e
|
||||
fos.close(); //schlie<69>t den fos (extrem wichtig!)
|
||||
ReadableByteChannel rbc = Channels.newChannel(website.openStream()); //<2F>ffnet neuen Stream/Channel
|
||||
FileOutputStream fos = new FileOutputStream("ProjectHomeFlix.jar"); //neuer fileoutputstram f<>r ProjectHomeFLix.jar
|
||||
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); //holt datei von 0 bis max gr<67><72>e
|
||||
fos.close(); //schlie<69>t den fos (extrem wichtig!)
|
||||
Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar"); //starte neu
|
||||
System.exit(0); //beendet sich selbst
|
||||
} catch (IOException e) {
|
||||
//Falls ein Fehler auftritt (ungetestet)
|
||||
//Falls ein Fehler auftritt
|
||||
e.printStackTrace();
|
||||
Alert alert = new Alert(AlertType.ERROR);
|
||||
alert.setTitle("Error");
|
||||
alert.setHeaderText("");
|
||||
alert.setContentText(errorUpdate);
|
||||
alert.setContentText(errorUpdateD);
|
||||
alert.showAndWait();
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//l<>dt die Daten im angegeben Ordner in newDaten
|
||||
//l<>dt die Daten im angegeben Ordner in newDaten
|
||||
public void loadData(){
|
||||
if(getPath().equals("")||getPath().equals(null)){
|
||||
System.out.println("Kein Pfad angegeben"); //falls der Pfad null oder "" ist
|
||||
@ -574,7 +632,7 @@ public class MainWindowController {
|
||||
newDaten.add(new uiData(5.0, titel ,data));
|
||||
}
|
||||
for(int i = 0; i < newDaten.size(); i++){
|
||||
root.getChildren().add(new TreeItem<uiData>(newDaten.get(i))); //f<>gt daten zur Rootnode hinzu
|
||||
root.getChildren().add(new TreeItem<uiData>(newDaten.get(i))); //f<>gt daten zur Rootnode hinzu
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -587,7 +645,7 @@ public class MainWindowController {
|
||||
return str.substring(0, pos);
|
||||
}
|
||||
|
||||
//setzt die Farben f<>r die UI-Elemente
|
||||
//setzt die Farben f<>r die UI-Elemente
|
||||
public void applyColor(){
|
||||
String style = "-fx-background-color: #"+getColor()+";";
|
||||
String btnStyle = "-fx-button-type: RAISED; -fx-background-color: #"+getColor()+"; -fx-text-fill: BLACK;";
|
||||
@ -610,8 +668,7 @@ public class MainWindowController {
|
||||
openfolderbtn.setStyle(btnStylewhite);
|
||||
returnBtn.setStyle(btnStylewhite);
|
||||
forwardBtn.setStyle(btnStylewhite);
|
||||
//TODO menubtn.setGraphic(menu_icon_white);
|
||||
menubtn.setGraphic(menu_icon_black);
|
||||
menubtn.setGraphic(menu_icon_white);
|
||||
}else{
|
||||
settingsBtn.setStyle("-fx-text-fill: BLACK;");
|
||||
infoBtn.setStyle("-fx-text-fill: BLACK;");
|
||||
@ -630,26 +687,31 @@ public class MainWindowController {
|
||||
|
||||
public void setLoaclUI(int local){
|
||||
switch(local){
|
||||
case 0: bundle = ResourceBundle.getBundle("application.HomeFlix-Local", Locale.US); //us_english
|
||||
case 0: bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.US); //us_english
|
||||
break;
|
||||
case 1: bundle = ResourceBundle.getBundle("application.HomeFlix-Local", Locale.GERMAN); //german
|
||||
case 1: bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.GERMAN); //german
|
||||
break;
|
||||
default:bundle = ResourceBundle.getBundle("application.HomeFlix-Local", Locale.US); //default local
|
||||
default:bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.US); //default local
|
||||
break;
|
||||
}
|
||||
settingsBtn.setText(bundle.getString("settings"));
|
||||
infoBtn.setText(bundle.getString("info"));
|
||||
playbtn.setText(bundle.getString("play"));
|
||||
openfolderbtn.setText(bundle.getString("openFolder"));
|
||||
sizelbl.setText(bundle.getString("fontSize"));
|
||||
updateBtn.setText(bundle.getString("checkUpdates"));
|
||||
directoryBtn.setText(bundle.getString("chooseFolder"));
|
||||
sizelbl.setText(bundle.getString("fontSize"));
|
||||
aulbl.setText(bundle.getString("autoUpdate"));
|
||||
versionlbl.setText(bundle.getString("version")+" "+version);
|
||||
columnName.setText(bundle.getString("columnName"));
|
||||
columnRating.setText(bundle.getString("columnRating"));
|
||||
columnDatName.setText(bundle.getString("columnDatName"));
|
||||
errorUpdate = bundle.getString("errorUpdate");
|
||||
errorUpdateD = bundle.getString("errorUpdateD");
|
||||
errorUpdateV = bundle.getString("errorUpdateV");
|
||||
infoText = bundle.getString("version")+" "+version+bundle.getString("infoText");
|
||||
linuxBugText = bundle.getString("linuxBug");
|
||||
errorPlay = bundle.getString("errorPlay");
|
||||
vlcNotInstalled = bundle.getString("vlcNotInstalled");
|
||||
}
|
||||
|
||||
//speichert die Einstellungen
|
||||
@ -670,7 +732,7 @@ public class MainWindowController {
|
||||
}
|
||||
}
|
||||
|
||||
//l<>dt die Einstellungen
|
||||
//l<>dt die Einstellungen
|
||||
public void loadSettings(){
|
||||
File configFile = new File("config.xml");
|
||||
try {
|
||||
@ -697,7 +759,7 @@ public class MainWindowController {
|
||||
return color;
|
||||
}
|
||||
|
||||
//entfernt 0x von dem r<>ckgabe wert des Colorpickers
|
||||
//entfernt 0x von dem r<>ckgabe wert des Colorpickers
|
||||
private void editColor(String input){
|
||||
StringBuilder sb = new StringBuilder(input);
|
||||
sb.delete(0, 2);
|
||||
@ -755,7 +817,7 @@ public class MainWindowController {
|
||||
sc = new Scanner(System.in);
|
||||
moviename = input;
|
||||
|
||||
// f<>r keinen oder "" Filmtitel
|
||||
// f<>r keinen oder "" Filmtitel
|
||||
if (moviename == null || moviename.equals("")) {
|
||||
System.out.println("No movie found");
|
||||
}
|
||||
@ -763,10 +825,10 @@ public class MainWindowController {
|
||||
//entfernen ungewolter leerzeichen
|
||||
moviename = moviename.trim();
|
||||
|
||||
// ersetzen der Leerzeichen durch + f<>r api-abfrage
|
||||
// ersetzen der Leerzeichen durch + f<>r api-abfrage
|
||||
moviename = moviename.replace(" ", "+");
|
||||
|
||||
//URL wird zusammengestellt abfragetypen: http,json,xml (muss json sein um sp<73>teres trennen zu erm<72>glichen)
|
||||
//URL wird zusammengestellt abfragetypen: http,json,xml (muss json sein um sp<73>teres trennen zu erm<72>glichen)
|
||||
dataurl = apiurl + "t=" + moviename + "&plot=full&r=json";
|
||||
|
||||
url = new URL(dataurl);
|
||||
@ -775,7 +837,7 @@ public class MainWindowController {
|
||||
|
||||
// lesen der Daten aus dem Antwort Stream
|
||||
while ((retdata = dis.readLine()) != null) {
|
||||
//retdata in json object parsen und anschlie<69>end das json Objekt "zerschneiden"
|
||||
//retdata in json object parsen und anschlie<69>end das json Objekt "zerschneiden"
|
||||
System.out.println(retdata);
|
||||
JsonObject object = Json.parse(retdata).asObject();
|
||||
String titel = object.getString("Title", "");
|
||||
@ -802,7 +864,7 @@ public class MainWindowController {
|
||||
String response = object.getString("Response", "");
|
||||
|
||||
if(response.equals("False")){
|
||||
ta1.appendText("Kein Film mit diesem Titel gefunden!");
|
||||
ta1.appendText("Kein Film mit diesem Titel gefunden!!");
|
||||
Image im2 = new Image("http://publicdomainvectors.org/photos/jean_victor_balin_cross.png");
|
||||
image1.setImage(im2);
|
||||
}else{
|
||||
@ -810,7 +872,7 @@ public class MainWindowController {
|
||||
ta1.appendText("Titel: "+titel+"\n");
|
||||
ta1.appendText("Jahr: "+ year+"\n");
|
||||
ta1.appendText("Einstufung: "+rated+"\n");
|
||||
ta1.appendText("Ver<EFBFBD>ffentlicht am: "+released+"\n");
|
||||
ta1.appendText("Ver<EFBFBD>ffentlicht am: "+released+"\n");
|
||||
ta1.appendText("Laufzeit: "+runtime+"\n");
|
||||
ta1.appendText("Genre: "+genre+"\n");
|
||||
ta1.appendText("Regisseur: "+director+"\n");
|
||||
@ -833,7 +895,7 @@ public class MainWindowController {
|
||||
System.out.println(e);
|
||||
} finally {
|
||||
try {
|
||||
//schlie<69>t datainputStream, InputStream,Scanner
|
||||
//schlie<69>t datainputStream, InputStream,Scanner
|
||||
if (dis != null) {
|
||||
dis.close();
|
||||
}
|
||||
@ -850,5 +912,4 @@ public class MainWindowController {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
19
src/recources/HomeFlix-Local_de_DE.properties
Normal file
@ -0,0 +1,19 @@
|
||||
# HomeFlix-Local_de_DE.properties German Local
|
||||
info = Info
|
||||
settings = Einstellungen
|
||||
play = play
|
||||
openFolder = Ordner \u00F6ffnen
|
||||
chooseFolder = Ordner ausw\u00E4hlen
|
||||
fontSize = Schriftgr\u00F6\u00DFe:
|
||||
checkUpdates = Auf Update pr\u00FCfen
|
||||
autoUpdate = beim Start nach Updates suchen:
|
||||
version = Version:
|
||||
columnName = Name
|
||||
columnRating = Bewertung
|
||||
columnDatName = Datei Name
|
||||
errorUpdateV = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not check update version (nvc)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
errorUpdateD = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not download update files (ndf)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
errorPlay = Beim \u00F6ffnen der Datei ist ein Fehler aufgetreten! \nError: could not open file (nof) \nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
linuxBug = Zurzeit werden unter Linux leider keine Dateien mit Leerzeichen unterst\u00FCtzt!
|
||||
vlcNotInstalled = Um einen Film abspielen wird der VLC Media Player ben\u00F6tigt!
|
||||
infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
19
src/recources/HomeFlix-Local_en_US.properties
Normal file
@ -0,0 +1,19 @@
|
||||
# HomeFlix-Local_en_US.properties US-English Local and default
|
||||
info = Info
|
||||
settings = Settings
|
||||
play = play
|
||||
openFolder = open Folder
|
||||
chooseFolder = choose Directory
|
||||
fontSize = font size:
|
||||
checkUpdates = check for updates
|
||||
autoUpdate = check at startup for updates:
|
||||
version = Version:
|
||||
columnName = Name
|
||||
columnRating = Rating
|
||||
columnDatName = File Name
|
||||
errorUpdateV = An error has occurred during update! \nError: could not check update version (nvc) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
errorUpdateD = An error has occurred during update! \nError: could not download update files (ndf) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
errorPlay = An error has occurred during opening the file! \nError: could not open file (nof) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
linuxBug = Currently no files are supported with additional space under Linux unfortunately!
|
||||
vlcNotInstalled = VLC Media Player is required to play a movie!
|
||||
infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
BIN
src/recources/menu_icon_white.png
Normal file
After Width: | Height: | Size: 15 KiB |
BIN
updates/ProjectHomeFlix.jar
Normal file
@ -0,0 +1 @@
|
||||
https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/updates/ProjectHomeFlix.jar
|
@ -1 +1 @@
|
||||
0.3.5
|
||||
0.3.6
|