From 44658625644522e03b41ab1030e00f31b1adf777 Mon Sep 17 00:00:00 2001
From: rdkartono <rdkartono@galva.co.id>
Date: Tue, 17 Dec 2024 09:44:09 +0700
Subject: [PATCH] add FTP address check before upload

---
 config.properties                             |   2 +-
 database.db                                   | Bin 32768 -> 36864 bytes
 src/main/java/FTP/FTPUpload.java              |  17 +++++++++++---
 .../id/co/gtc/erhacam/cameradetail.fxml       |  21 ++++++++++--------
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/config.properties b/config.properties
index ed53fba..bb8d824 100644
--- a/config.properties
+++ b/config.properties
@@ -1,4 +1,4 @@
-#Tue Dec 17 09:22:55 WIB 2024
+#Tue Dec 17 09:43:51 WIB 2024
 AudioPhase1=C\:\\Users\\rdkar\\OneDrive\\Documents\\IntelliJ Project\\ErhaCam\\audio\\phase1.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
diff --git a/database.db b/database.db
index e12762ce931862c1b78715c933d67c0175e52f94..1d1f10f7c7d4d3c18dbcf792c6b739e39ced03c9 100644
GIT binary patch
delta 242
zcmZo@U}{*vG(noxjDdlHbE1MhquIuUCHxYs{Lg^`44nMG`M>dh<bT8eoF#|pH)Gev
z!aT;!U4pTEtUy@~lg)4Bg#{Q*HyN-v2(dFXFz`&|RAPO_w3qQ8qdh~z#KJ7*MjMmK
zj74&+#s*f##*_224TKep42(>44UKdS&EqX~jSX~x;tT7nWb*T|$S4>X>SYzAZ?-Qy
z$j8MCw3CtFk%8ZFv!H@GKhSJbklE}e##Tl~RaKJ(ODs4*W||o58ckkMXFa*Mghv1-
IU<fq|0G2L45dZ)H

delta 94
zcmV-k0HObYpaOt^0+1U8Gynhq2$3K^0W`5-qz@Pb59|N{000ON`w#XH@ek|;-2`j`
z`vHovac%*#iZNmiv+N%e5CJo?Fa$sl1_3_+43P;U1?mF50sa9$v2iN_vp;dc4hY{I
AG5`Po

diff --git a/src/main/java/FTP/FTPUpload.java b/src/main/java/FTP/FTPUpload.java
index 4229626..a64139c 100644
--- a/src/main/java/FTP/FTPUpload.java
+++ b/src/main/java/FTP/FTPUpload.java
@@ -1,7 +1,8 @@
 package FTP;
 
-import lombok.val;
 import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.io.CopyStreamEvent;
+import org.apache.commons.net.io.CopyStreamListener;
 
 import java.io.*;
 
@@ -73,9 +74,19 @@ public class FTPUpload {
                         File localFile = new File(file);
                         if (localFile.exists()) {
                             FileInputStream input = new FileInputStream(localFile);
-                            ProgressInputStream pis = new ProgressInputStream(file, input, localFile.length(), event);
+                            //ProgressInputStream pis = new ProgressInputStream(file, input, localFile.length(), event);
                             if (event!=null) event.onUploadStarted(file);
-                            ftp.storeFile(localFile.getName(), pis);
+                            ftp.setCopyStreamListener(new CopyStreamListener() {
+                                @Override
+                                public void bytesTransferred(CopyStreamEvent copyStreamEvent) {
+                                }
+
+                                @Override
+                                public void bytesTransferred(long totalBytesTransferred, int bytesTransferred, long streamSize) {
+                                    if (event!=null) event.onUploadProgress(file, totalBytesTransferred, streamSize);
+                                }
+                            });
+                            ftp.storeFile(localFile.getName(), input);
                             input.close();
                             if (event!=null) event.onUploadSuccess(file);
                             success++;
diff --git a/src/main/resources/id/co/gtc/erhacam/cameradetail.fxml b/src/main/resources/id/co/gtc/erhacam/cameradetail.fxml
index d900748..2174980 100644
--- a/src/main/resources/id/co/gtc/erhacam/cameradetail.fxml
+++ b/src/main/resources/id/co/gtc/erhacam/cameradetail.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane prefHeight="280.0" xmlns="http://javafx.com/javafx/11.0.14-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="id.co.gtc.erhacam.Cameradetail">
+<AnchorPane prefHeight="280.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.14-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="id.co.gtc.erhacam.Cameradetail">
    <children>
       <GridPane layoutX="5.0" layoutY="5.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <columnConstraints>
@@ -45,8 +45,8 @@
                <children>
                   <GridPane layoutX="-28.0" layoutY="-29.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                     <columnConstraints>
-                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="70.0" prefWidth="100.0" />
-                      <ColumnConstraints fillWidth="false" maxWidth="-Infinity" minWidth="-Infinity" percentWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+                      <ColumnConstraints fillWidth="false" minWidth="10.0" percentWidth="20.0" />
                     </columnConstraints>
                     <rowConstraints>
                       <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -103,12 +103,15 @@
                         </AnchorPane>
                         <AnchorPane fx:id="streamanchor">
                            <children>
-                              <HBox alignment="CENTER" prefHeight="240.0" prefWidth="700.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                              <ImageView fx:id="camerastream" fitHeight="240.0" pickOnBounds="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                 <image>
-                                    <Image url="@gtcbackground.png" />
-                                 </image>
-                              </ImageView>
+                              <StackPane prefHeight="240.0" prefWidth="351.2" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                 <children>
+                                    <ImageView fx:id="camerastream" fitHeight="240.0" pickOnBounds="true">
+                                       <image>
+                                          <Image url="@gtcbackground.png" />
+                                       </image>
+                                    </ImageView>
+                                 </children>
+                              </StackPane>
                            </children>
                         </AnchorPane>
                      </children>