Skip to content
This repository was archived by the owner on Jul 12, 2026. It is now read-only.

Fixes (FFMPEG path only allow executables, automatic settling of FFProbe...) #3

Open
ad48hp wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes (FFMPEG path only allow executables, automatic settling of FFProbe...) #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6b5dd5
Allow all files instead of MP4 only
ad48hp Jul 24, 2019
8e29c65
Extension filters for FFMPEG & FFProbe automatic-path-setting
ad48hp Jul 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions src/ytpplusui/FXMLController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public class FXMLController {

@FXML
void addSource(ActionEvent event) {
FileChooser.ExtensionFilter fileFilter = new FileChooser.ExtensionFilter("Video files (*.mp4)", "*.mp4");
FileChooser.ExtensionFilter fileFilter = new FileChooser.ExtensionFilter("All files (*.*)", "*.*");
FileChooser fileChooser = new FileChooser();
fileChooser.getExtensionFilters().add(fileFilter);
fileChooser.setTitle("Choose Source");
Expand Down Expand Up @@ -304,13 +304,18 @@ void helpMeEffect(ActionEvent event) {
void openBrowser(ActionEvent event) {
switch (((Control)event.getSource()).getId()) {
case "btnBrowseFFMPEG":
actuallyOpenBrowser(tfFFMPEG);
actuallyOpenBrowser(tfFFMPEG,"ffmpeg.exe","exe");
String fffile=new File(tfFFMPEG.getText()).getParent().replace('\\', '/');
if(new File(fffile+"/ffprobe.exe").exists())
{
tfFFPROBE.setText(fffile+"/ffprobe.exe");
}
break;
case "btnBrowseFFPROBE":
actuallyOpenBrowser(tfFFPROBE);
actuallyOpenBrowser(tfFFPROBE,"ffprobe.exe","exe");
break;
case "btnBrowseMAGICK":
actuallyOpenBrowser(tfMAGICK);
actuallyOpenBrowser(tfMAGICK,"magick.exe","exe");
break;
case "btnBrowseTEMP":
actuallyOpenDirBrowser(tfTEMP);
Expand All @@ -332,16 +337,31 @@ void openBrowser(ActionEvent event) {

public File LAST_BROWSED;

void actuallyOpenBrowser(TextField toChange) {
void actuallyOpenBrowser(TextField toChange, String defvalue, String extfilter) {
FileChooser fileChooser = new FileChooser();
fileChooser.setTitle("Choose File");
//fileChooser.setInitialFileName(defvalue);
if(defvalue!="") {
fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(defvalue, defvalue));
}
if(extfilter=="exe") {
fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Executable files (*.exe)", "*.exe"));
}
fileChooser.setInitialDirectory(LAST_BROWSED);
File selected = fileChooser.showOpenDialog(null);
if (selected==null) return;
toChange.setText(selected.getAbsolutePath().replace('\\', '/'));
LAST_BROWSED = selected.getParentFile();
}


void actuallyOpenBrowser(TextField toChange) {
actuallyOpenBrowser(toChange,"","");
}
void actuallyOpenBrowser(TextField toChange, String defvalue) {
actuallyOpenBrowser(toChange,defvalue,"");
}


void actuallyOpenDirBrowser(TextField toChange) {
DirectoryChooser fileChooser = new DirectoryChooser();
fileChooser.setTitle("Choose File");
Expand Down