Team4388/RidgeScout
1
0
Fork 0
mirror of https://github.com/Team4388/RidgeScout.git synced 2026-06-09 00:37:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Work on improving ftp timestamp

Browse Source
This commit is contained in:
Astatin3
2024-10-07 20:16:42 -06:00
parent fb0718c4ec
commit fecf7e5d2b
4 changed files with 145 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/FTPSync.java
+80 -26
View File
@@ -4,6 +4,9 @@ package com.ridgebotics.ridgescout.ui.transfer;
import static com.ridgebotics.ridgescout.utility.fileEditor.baseDir;
import com.ridgebotics.ridgescout.utility.AlertManager;
import com.ridgebotics.ridgescout.utility.BuiltByteParser;
import com.ridgebotics.ridgescout.utility.ByteBuilder;
import com.ridgebotics.ridgescout.utility.fileEditor;
import com.ridgebotics.ridgescout.utility.settingsManager;
import org.apache.commons.net.ftp.FTP;
@@ -14,18 +17,25 @@ import org.apache.commons.net.ftp.FTPReply;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.InetAddress;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
public class FTPSync extends Thread {
public static final String remoteBasePath = "/RidgeScout/";
public static final String timestampsFilename = "timestamps";
public static final long timeTolerance = 60000; // One min
public static long lastSyncTime = 0;
private static Date curSyncTime;
public interface onResult {
void onResult(boolean error, int upCount, int downCount);
}
@@ -34,11 +44,13 @@ public class FTPSync extends Thread {
public static void sync(onResult onResult){
// DataManager.reload_event();
FTPSync ftpSync = new FTPSync();
ftpSync.onResult = onResult;
ftpSync.start();
lastSyncTime = new Date().getTime();
// FTPSync ftpSync = new FTPSync();
// ftpSync.onResult = onResult;
//
// lastSyncTime = new Date().getTime();
// curSyncTime = new Date();
//
// ftpSync.start();
}
FTPClient ftpClient;
@@ -51,20 +63,16 @@ public class FTPSync extends Thread {
private int upCount = 0;
private int downCount = 0;
private void downloadFile(FTPFile remoteFile, File localFile) throws IOException {
private void downloadFile(String remoteFile, File localFile) throws IOException {
try (FileOutputStream fos = new FileOutputStream(localFile)) {
ftpClient.retrieveFile(remoteBasePath + remoteFile.getName(), fos);
ftpClient.retrieveFile(remoteBasePath + remoteFile, fos);
}
Date d = getUtcTimestamp(remoteFile);
System.out.println(d);
setLocalFileTimestamp(localFile, d);
}
private void uploadFile(File localFile) throws IOException {
try (FileInputStream fis = new FileInputStream(localFile)) {
ftpClient.storeFile(remoteBasePath + localFile.getName(), fis);
}
setLocalFileTimestamp(localFile, new Date());
}
private FTPFile findRemoteFile(FTPFile[] remoteFiles, String fileName) {
@@ -92,16 +100,15 @@ public class FTPSync extends Thread {
// return n>0 ? n : -n;
// }
private boolean toleranceCompareAfter(Date d1, Date d2){
long diff = d1.getTime() - d2.getTime();
System.out.println(diff);
return diff > timeTolerance;
}
// private boolean toleranceCompareAfter(Date d1, Date d2){
// long diff = d1.getTime() - d2.getTime();
// System.out.println(diff);
// return diff > timeTolerance;
// }
public void run() {
try {
// localTimeZone = TimeZone.getDefault();
ftpClient = new FTPClient();
InetAddress address = InetAddress.getByName(settingsManager.getFTPServer());
ftpClient.connect(address);
@@ -123,13 +130,14 @@ public class FTPSync extends Thread {
////
// System.out.println("- " + t1.getTime() + (t1.after(t2) ? ">" : "<") + t2.getTime());
if (remoteFile == null || toleranceCompareAfter(getLocalFileUtcTimestamp(localFile), (getUtcTimestamp(remoteFile)))) {
uploadFile(localFile);
System.out.println("Uploaded " + localFile.getName());
upCount++;
}else{
System.out.println("Did not upload " + localFile.getName());
}
// if (remoteFile == null || toleranceCompareAfter(getLocalFileUtcTimestamp(localFile), (getUtcTimestamp(remoteFile)))) {
// uploadFile(localFile);
// System.out.println("Uploaded " + localFile.getName());
// setLocalFileTimestamp(localFile, curSyncTime);
// upCount++;
// }else{
// System.out.println("Did not upload " + localFile.getName());
// }
}
}
}
@@ -143,9 +151,11 @@ public class FTPSync extends Thread {
////
// System.out.println("- " + t1 + (t1.after(t2) ? ">" : "<") + t2);
if (!localFile.exists() || toleranceCompareAfter(getUtcTimestamp(remoteFile), (getLocalFileUtcTimestamp(localFile)))) {
downloadFile(remoteFile, localFile);
if (!localFile.exists() || getUtcTimestamp(remoteFile).after((getLocalFileUtcTimestamp(localFile)))) {
downloadFile(remoteFile.getName(), localFile);
System.out.println("Downloaded " + localFile.getName());
Date d = getUtcTimestamp(remoteFile);
setLocalFileTimestamp(localFile, d);
downCount++;
}else{
System.out.println("Did not download " + remoteFile.getName());
@@ -160,4 +170,48 @@ public class FTPSync extends Thread {
onResult.onResult(false, upCount, downCount);
}
}
private boolean setTimestamps(Map<String, Date> timestamps){
try {
ByteBuilder bb = new ByteBuilder();
String[] filenames = timestamps.keySet().toArray(new String[0]);
for(int i = 0; i < filenames.length; i++){
bb.addString(filenames[i]);
bb.addLong(timestamps.get(filenames[i]).getTime());
}
fileEditor.writeFile(timestampsFilename, bb.build());
uploadFile(new File(baseDir + timestampsFilename));
return true;
} catch (ByteBuilder.buildingException | IOException e) {
e.printStackTrace();
return false;
}
}
private Map<String, Date> getTimestamps() {
try {
downloadFile(timestampsFilename, new File(baseDir + timestampsFilename));
byte[] data = fileEditor.readFile(timestampsFilename);
BuiltByteParser bbp = new BuiltByteParser(data);
List<BuiltByteParser.parsedObject> pa = bbp.parse();
Map<String, Date> output = new HashMap<>();
for(int i = 0; i < pa.size(); i+=2){
// System.out.println((long) pa.get(i).get());
output.put(
(String) ((BuiltByteParser.stringObject) pa).get(),
new Date((long) ((BuiltByteParser.longObject) pa).get())
);
}
return output;
}catch (IOException | BuiltByteParser.byteParsingExeption e){
AlertManager.error(e);
return new HashMap<>();
}
}
}