rdkartono/ErhaCam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add FTP address check before upload

Browse Source
This commit is contained in:
rdkartono
2024-12-17 09:23:14 +07:00
parent eceb94d524
commit d7719ae312
4 changed files with 180 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.properties
View File

@@ -1,4 +1,4 @@
#Mon Dec 16 15:02:10 WIB 2024 #Tue Dec 17 09:22:55 WIB 2024
AudioPhase1=C\:\\Users\\rdkar\\OneDrive\\Documents\\IntelliJ Project\\ErhaCam\\audio\\phase1.mp3 AudioPhase1=C\:\\Users\\rdkar\\OneDrive\\Documents\\IntelliJ Project\\ErhaCam\\audio\\phase1.mp3
AudioPhase2=C\:\\Users\\rdkar\\OneDrive\\Documents\\IntelliJ Project\\ErhaCam\\audio\\phase2.mp3 AudioPhase2=C\:\\Users\\rdkar\\OneDrive\\Documents\\IntelliJ Project\\ErhaCam\\audio\\phase2.mp3
AudioPhase3=C\:\\Users\\rdkar\\OneDrive\\Documents\\IntelliJ Project\\ErhaCam\\audio\\phase3.mp3 AudioPhase3=C\:\\Users\\rdkar\\OneDrive\\Documents\\IntelliJ Project\\ErhaCam\\audio\\phase3.mp3
@@ -11,7 +11,7 @@ CameraConfigLeft90={"Brightness"\:0.0,"Contrast"\:32.0,"Saturation"\:64.0,"Hue"\
CameraConfigRight45={"Brightness"\:0.0,"Contrast"\:32.0,"Saturation"\:64.0,"Hue"\:0.0,"Gain"\:0.0,"Exposure"\:157.0,"Sharpness"\:3.0,"Gamma"\:100.0,"AutoExposure"\:true,"AutoFocus"\:true,"AutoWhiteBalance"\:true} CameraConfigRight45={"Brightness"\:0.0,"Contrast"\:32.0,"Saturation"\:64.0,"Hue"\:0.0,"Gain"\:0.0,"Exposure"\:157.0,"Sharpness"\:3.0,"Gamma"\:100.0,"AutoExposure"\:true,"AutoFocus"\:true,"AutoWhiteBalance"\:true}
CameraConfigRight90={"Brightness"\:0.0,"Contrast"\:32.0,"Saturation"\:64.0,"Hue"\:0.0,"Gain"\:0.0,"Exposure"\:157.0,"Sharpness"\:3.0,"Gamma"\:100.0,"AutoExposure"\:true,"AutoFocus"\:true,"AutoWhiteBalance"\:true} CameraConfigRight90={"Brightness"\:0.0,"Contrast"\:32.0,"Saturation"\:64.0,"Hue"\:0.0,"Gain"\:0.0,"Exposure"\:157.0,"Sharpness"\:3.0,"Gamma"\:100.0,"AutoExposure"\:true,"AutoFocus"\:true,"AutoWhiteBalance"\:true}
CameraLeft45=OBSBOT Meet 2 StreamCamera CameraLeft45=OBSBOT Meet 2 StreamCamera
CameraLeft90=OBSBOT Meet 2 StreamCamera CameraLeft90=ACER QHD User Facing
CameraRight45=OBSBOT Meet 2 StreamCamera CameraRight45=OBSBOT Meet 2 StreamCamera
CameraRight90=OBSBOT Meet 2 StreamCamera CameraRight90=OBSBOT Meet 2 StreamCamera
FTPHost=192.168.10.2 FTPHost=192.168.10.2

BIN
database.db
View File

Binary file not shown.

19
src/main/java/FTP/FtpMonitorData.java Normal file
View File

@@ -0,0 +1,19 @@
package FTP;
import id.co.gtc.erhacam.UploadProgress;
public class FtpMonitorData {
public String information;
public String filename;
public UploadProgress progress;
public long total;
public long current;
public FtpMonitorData(String information, String filename, UploadProgress progress, long total, long current) {
this.information = information;
this.filename = filename;
this.progress = progress;
this.total = total;
this.current = current;
}
}

158
src/main/java/id/co/gtc/erhacam/CaptureView.java
View File

@@ -9,26 +9,28 @@ import Database.PhotoReviewClass;
import Database.Sqlite; import Database.Sqlite;
import FTP.FTPUpload; import FTP.FTPUpload;
import FTP.FTPUploadEvent; import FTP.FTPUploadEvent;
import FTP.FtpMonitorData;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.InvalidationListener; import javafx.beans.InvalidationListener;
import javafx.beans.Observable;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.concurrent.Task; import javafx.concurrent.Task;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
import javafx.scene.control.Alert; import javafx.scene.control.Alert;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.TextArea; import javafx.scene.control.TextArea;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.stage.DirectoryChooser; import javafx.stage.DirectoryChooser;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.*; import java.util.*;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicBoolean;
import javafx.scene.control.Alert.AlertType; import javafx.scene.control.Alert.AlertType;
import org.bytedeco.javacv.OpenCVFrameGrabber; import org.bytedeco.javacv.OpenCVFrameGrabber;
@@ -65,6 +67,7 @@ public class CaptureView {
private List<String> cams; private List<String> cams;
private final AtomicBoolean[] have_face = new AtomicBoolean[5];
@FXML @FXML
private void ChangeDirectory(){ private void ChangeDirectory(){
@@ -103,12 +106,17 @@ public class CaptureView {
@SuppressWarnings("resource") @SuppressWarnings("resource")
@FXML @FXML
private void TakePhotos(){ private void TakePhotos(){
boolean has_face = Arrays.stream(have_face).anyMatch(AtomicBoolean::get);
if (!has_face){
audioPlayer.PlayFile(audio_posisikan_muka, ps);
return;
}
Size thumbsize = new Size(160,120); Size thumbsize = new Size(160,120);
String directory = directorypath.getText(); String directory = directorypath.getText();
String prefix = RemoveSpaces(prefixfile.getText()) ; String prefix = RemoveSpaces(prefixfile.getText()) ;
if (ValidDirectory(directory)){ if (ValidDirectory(directory)){
if (ValidString(prefix)){ if (ValidString(prefix)){
audioPlayer.PlayFile(audio_posisi_diam, ps); //audioPlayer.PlayFile(audio_posisi_diam, ps);
PhotoReviewClass prc = new PhotoReviewClass(); PhotoReviewClass prc = new PhotoReviewClass();
prc.setPrefix(prefix); prc.setPrefix(prefix);
@@ -208,9 +216,30 @@ public class CaptureView {
String[] files = prc.files(); String[] files = prc.files();
if (files!=null && files.length>0){ if (files!=null && files.length>0){
InsertSQL(prc); InsertSQL(prc);
progressanchor.getChildren().clear(); progressanchor.getChildren().clear();
prefixfile.setText(""); prefixfile.setText("");
new Thread(()-> UploadToFTP(files)).start(); new Thread(()-> {
try{
InetAddress target = InetAddress.getByName(config.getFTPHost());
int port = toInt(config.getFTPPort());
if (target.isReachable(2000)){
Socket socket = new Socket();
InetSocketAddress isa = new InetSocketAddress(target, port);
socket.connect(isa,2000);
socket.close();
// sampai sini berarti FTP Host reachable
UploadToFTP(files);
} else throw new Exception("FTP Host not reachable");
} catch (Exception e){
Logger.error("Error UploadToFTP: "+e.getMessage());
Alert alert = new Alert(AlertType.ERROR);
alert.setTitle("Error");
alert.setHeaderText("Upload to FTP Failed");
alert.setContentText("Error: "+e.getMessage());
alert.showAndWait();
}
}).start();
} else { } else {
Alert Alert = new Alert(AlertType.ERROR); Alert Alert = new Alert(AlertType.ERROR);
Alert.setTitle("Error"); Alert.setTitle("Error");
@@ -412,6 +441,7 @@ public class CaptureView {
private void SetupCameraWithController(Cameradetail image, String cameraname, int devicenumber){ private void SetupCameraWithController(Cameradetail image, String cameraname, int devicenumber){
if (image!=null){ if (image!=null){
String title = switch(image.getCameraConfigEnum()){ String title = switch(image.getCameraConfigEnum()){
case CameraConfigCenter -> "03"; case CameraConfigCenter -> "03";
case CameraConfigLeft45 -> "02"; case CameraConfigLeft45 -> "02";
@@ -419,6 +449,15 @@ public class CaptureView {
case CameraConfigRight45 -> "04"; case CameraConfigRight45 -> "04";
case CameraConfigRight90 -> "05"; case CameraConfigRight90 -> "05";
}; };
final AtomicBoolean _have_face = switch (image.getCameraConfigEnum()){
case CameraConfigCenter -> have_face[2];
case CameraConfigLeft45 -> have_face[1];
case CameraConfigLeft90 -> have_face[0];
case CameraConfigRight45 -> have_face[3];
case CameraConfigRight90 -> have_face[4];
};
Platform.runLater(()-> image.setCameraTitle(title)); Platform.runLater(()-> image.setCameraTitle(title));
if (devicenumber!=-1){ if (devicenumber!=-1){
OpenCVFrameGrabber grabber = new OpenCVFrameGrabber(devicenumber); OpenCVFrameGrabber grabber = new OpenCVFrameGrabber(devicenumber);
@@ -460,11 +499,12 @@ public class CaptureView {
LiveCamEvent lce = new LiveCamEvent() { LiveCamEvent lce = new LiveCamEvent() {
@Override @Override
public void onDetectedQRCode(String qrCode) { public void onDetectedQRCode(String qrCode) {
Platform.runLater(()->prefixfile.setText(RemoveSpaces(qrCode))); Platform.runLater(()->prefixfile.setText(RemoveSpaces(qrCode)));
if (ValidString(qrCode)) audioPlayer.PlayFile(audio_posisikan_muka, ps); //if (ValidString(qrCode)) audioPlayer.PlayFile(audio_posisikan_muka, ps);
} }
@Override @Override
@@ -472,7 +512,8 @@ public class CaptureView {
Platform.runLater(()-> { Platform.runLater(()-> {
String ss = hasface ? String.format("Camera Started, %dx%d@%d, Face Detected", width, height, image.getLiveFPS()) : String.format("Camera Started, %dx%d@%d", width, height, image.getLiveFPS()); String ss = hasface ? String.format("Camera Started, %dx%d@%d, Face Detected", width, height, image.getLiveFPS()) : String.format("Camera Started, %dx%d@%d", width, height, image.getLiveFPS());
image.setCameraStatus(ss); image.setCameraStatus(ss);
//String qr = prefixfile.getText(); _have_face.set(hasface);
//if (ValidString(qr) && hasface) audioPlayer.PlayFile(audio_posisikan_muka, ps); //if (ValidString(qr) && hasface) audioPlayer.PlayFile(audio_posisikan_muka, ps);
}); });
} }
@@ -496,6 +537,7 @@ public class CaptureView {
private void LoadCameraDetail(AnchorPane cam, int camid, CameraConfigEnum cc){ private void LoadCameraDetail(AnchorPane cam, int camid, CameraConfigEnum cc){
try{ try{
have_face[camid-1] = new AtomicBoolean(false);
FXMLLoader loader = new FXMLLoader(getClass().getResource("cameradetail.fxml")); FXMLLoader loader = new FXMLLoader(getClass().getResource("cameradetail.fxml"));
AnchorPane child = loader.load(); AnchorPane child = loader.load();
@@ -561,6 +603,7 @@ public class CaptureView {
final double uploadprogressheight = 50; final double uploadprogressheight = 50;
Map<String, UploadProgress> progressmap = new HashMap<>(); Map<String, UploadProgress> progressmap = new HashMap<>();
// Load uploadprogress.fxml for each file
for (String filetoupload : files){ for (String filetoupload : files){
Task<AnchorPane> loadtask = new Task<>() { Task<AnchorPane> loadtask = new Task<>() {
@Override @Override
@@ -579,23 +622,36 @@ public class CaptureView {
return pane; return pane;
} }
}; };
// kalau berhasil, add ke progressanchor
loadtask.setOnSucceeded(e-> progressanchor.getChildren().add(loadtask.getValue())); loadtask.setOnSucceeded(e-> progressanchor.getChildren().add(loadtask.getValue()));
// kalau gagal, log error
loadtask.setOnFailed(e-> Logger.error("Error LoadTask: {}",e.getSource().getMessage())); loadtask.setOnFailed(e-> Logger.error("Error LoadTask: {}",e.getSource().getMessage()));
new Thread(loadtask).start(); new Thread(loadtask).start();
} }
InvalidationListener progressanchorlistener = observable -> {
// kalau sudah selesai load semua, mulai upload
Logger.info("Progress Anchor Children Size: {}", progressanchor.getChildren().size());
if (progressanchor.getChildren().size()==files.length){
Task<FtpMonitorData> monitorFTP = new Task<>() {
@Override
protected FtpMonitorData call() throws Exception {
FTPUpload ftp = new FTPUpload(config.getFTPHost(), toInt(config.getFTPPort()), config.getFTPUser(), config.getFTPPass(), config.getFTPPath()); FTPUpload ftp = new FTPUpload(config.getFTPHost(), toInt(config.getFTPPort()), config.getFTPUser(), config.getFTPPass(), config.getFTPPath());
ftp.UploadFile(new FTPUploadEvent() { ftp.UploadFile(new FTPUploadEvent() {
@Override @Override
public void onUploadSuccess(String file) { public void onUploadSuccess(String file) {
Logger.info("Upload Success: {}" ,file); Logger.info("Upload Success: {}" ,file);
UploadProgress up = progressmap.get(GetFileName(file)); String filename = GetFileName(file);
UploadProgress up = progressmap.get(filename);
if (up!=null){ if (up!=null){
Platform.runLater(()->{ updateValue(new FtpMonitorData("Success", filename, up, 1, 1));
up.SetStatus("Success"); // Platform.runLater(()->{
up.SetProgress(1,1); // up.SetStatus("Success");
}); // up.SetProgress(1,1);
// });
} }
} }
@@ -603,33 +659,39 @@ public class CaptureView {
@Override @Override
public void onUploadFailed(String file) { public void onUploadFailed(String file) {
Logger.info("Upload Failed: {}",file); Logger.info("Upload Failed: {}",file);
UploadProgress up = progressmap.get(GetFileName(file)); String filename = GetFileName(file);
UploadProgress up = progressmap.get(filename);
if (up!=null){ if (up!=null){
Platform.runLater(()->{ updateValue(new FtpMonitorData("Failed", filename, up, 1, 0));
up.SetStatus("Failed"); // Platform.runLater(()->{
up.SetProgress(0,1); // up.SetStatus("Failed");
}); // up.SetProgress(0,1);
// });
} }
} }
@Override @Override
public void onUploadProgress(String file, long bytes, long total) { public void onUploadProgress(String file, long bytes, long total) {
UploadProgress up = progressmap.get(GetFileName(file)); String filename = GetFileName(file);
UploadProgress up = progressmap.get(filename);
if (up!=null){ if (up!=null){
Platform.runLater(()->up.SetProgress(bytes, total)); updateValue(new FtpMonitorData("Uploading", filename, up, total, bytes));
// Platform.runLater(()->up.SetProgress(bytes, total));
} }
} }
@Override @Override
public void onUploadStarted(String file) { public void onUploadStarted(String file) {
Logger.info("Upload Started: {}",file); Logger.info("Upload Started: {}",file);
UploadProgress up = progressmap.get(GetFileName(file)); String filename = GetFileName(file);
UploadProgress up = progressmap.get(filename);
if (up!=null){ if (up!=null){
Platform.runLater(()->{ updateValue(new FtpMonitorData("Started", filename, up, 0, 0));
up.SetStatus("Started"); // Platform.runLater(()->{
up.SetProgress(0,0); // up.SetStatus("Started");
}); // up.SetProgress(0,0);
// });
} }
} }
@@ -652,27 +714,35 @@ public class CaptureView {
}); });
} }
}, files); }, files);
// Task selesai, return null
return null;
}
};
monitorFTP.valueProperty().addListener(
(observable1, oldValue, newValue) -> {
if (newValue!=null){
if (newValue.progress!=null){
newValue.progress.SetStatus(newValue.information);
newValue.progress.SetProgress(newValue.current, newValue.total);
}
}
}
);
new Thread(monitorFTP).start();
}
};
progressanchor.getChildren().addListener(progressanchorlistener);
} }
// private void Load_UploadProgress(Map<String, UploadProgress> progressmap, String filename, double uploadprogressheight){
// try{
// FXMLLoader loader = new FXMLLoader(getClass().getResource("uploadprogress.fxml"));
// AnchorPane pane = loader.load();
// pane.prefWidthProperty().bind(progressanchor.widthProperty());
// pane.setPrefHeight(uploadprogressheight);
// UploadProgress up = loader.getController();
// up.SetFile(filename);
// up.SetStatus("Started");
// up.SetProgress(0,0);
// int ii = progressmap.size();
// AnchorPane.setTopAnchor(pane, (ii*uploadprogressheight)+10);
// progressanchor.getChildren().add(pane);
// progressmap.put(filename, up);
//
// } catch (Exception e){
// Logger.error("Error loading uploadprogress.fxml: "+e.getMessage());
// }
// }
private void InsertSQL(PhotoReviewClass prc){ private void InsertSQL(PhotoReviewClass prc){
Sqlite sql = new Sqlite(); Sqlite sql = new Sqlite();