public
/
ensync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

~ cleanup

Browse Source
pull/1/head
Ivan Olexyn 5 years ago
parent 227d861ad0
commit 79979bb41d
6 changed files with 95 additions and 99 deletions
Show Stats Download Patch File Download Diff File

4
src/com/olexyn/ensync/Execute.java
Unescape View File

@ -29,8 +29,8 @@ public class Execute {
public void executeBatch(List<String[]> batch){ public void executeBatch(List<String[]> batch){
for (int i =0; i<batch.size();i++){ for (String[] strings : batch) {
execute(batch.get(i)); execute(strings);
} }
} }

32
src/com/olexyn/ensync/Flow.java
Unescape View File

@ -9,7 +9,7 @@ import static com.olexyn.ensync.Main.MAP_OF_SYNCMAPS;
public class Flow implements Runnable { public class Flow implements Runnable {
Tools tools = new Tools();
private String state; private String state;
@ -27,22 +27,22 @@ public class Flow implements Runnable {
for (var syncMapEntry : MAP_OF_SYNCMAPS.entrySet()) { for (var syncMapEntry : MAP_OF_SYNCMAPS.entrySet()) {
for (var syncDirectoryEntry : syncMapEntry.getValue().syncDirectories.entrySet()) { for (var SDEntry : syncMapEntry.getValue().syncDirectories.entrySet()) {
SyncDirectory syncDirectory = syncDirectoryEntry.getValue(); SyncDirectory SD = SDEntry.getValue();
state = "READ"; state = "READ";
syncDirectory.findState(); SD.findState();
syncDirectory.makeListCreated(); SD.makeListCreated();
syncDirectory.makeListDeleted(); SD.makeListDeleted();
syncDirectory.makeListModified(); SD.listModified = SD.makeListModified();
syncDirectory.doCreate(); SD.doCreate();
syncDirectory.doDelete(); SD.doDelete();
syncDirectory.doModify(); SD.doModify();
syncDirectory.writeStateFile(syncDirectory.path); SD.writeStateFile(SD.path);
} }
@ -76,14 +76,14 @@ public class Flow implements Runnable {
state = syncMap.toString(); state = syncMap.toString();
for (var stringSyncDirectoryEntry : syncMap.syncDirectories.entrySet()) { for (var stringSyncDirectoryEntry : syncMap.syncDirectories.entrySet()) {
SyncDirectory syncDirectory = stringSyncDirectoryEntry.getValue(); SyncDirectory SD = stringSyncDirectoryEntry.getValue();
String path = syncDirectory.path; String path = SD.path;
String stateFilePath = syncDirectory.stateFilePath(path); String stateFilePath = tools.stateFilePath(path);
if (new File(stateFilePath).exists()) { if (new File(stateFilePath).exists()) {
state = "READ-STATE-FILE-" + syncDirectory.readStateFile(); state = "READ-STATE-FILE-" + SD.readStateFile();
} else { } else {
syncDirectory.writeStateFile(path); SD.writeStateFile(path);
} }
} }

3
src/com/olexyn/ensync/Tools.java
Unescape View File

@ -148,4 +148,7 @@ public class Tools {
} }
} }
public String stateFilePath(String path) {
return "/tmp/ensync/state" + path.replace("/", "-");
}
} }

133
src/com/olexyn/ensync/artifacts/SyncDirectory.java
Unescape View File

@ -4,7 +4,10 @@ import com.olexyn.ensync.Execute;
import com.olexyn.ensync.Tools; import com.olexyn.ensync.Tools;
import java.io.File; import java.io.File;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* A SyncDirectory is an occurrence of a particular directory somewhere across the filesystems. * A SyncDirectory is an occurrence of a particular directory somewhere across the filesystems.
@ -30,8 +33,7 @@ public class SyncDirectory {
* *
* @see SyncMap * @see SyncMap
*/ */
public SyncDirectory(String path, public SyncDirectory(String path, SyncMap syncMap) {
SyncMap syncMap) {
this.path = path; this.path = path;
this.syncMap = syncMap; this.syncMap = syncMap;
@ -39,8 +41,6 @@ public class SyncDirectory {
} }
/** /**
* Get the current state by using the `find` command. * Get the current state by using the `find` command.
*/ */
@ -54,7 +54,7 @@ public class SyncDirectory {
List<String> pathList = tools.brToListString(find.output); List<String> pathList = tools.brToListString(find.output);
for (String filePath : pathList) { for (String filePath : pathList) {
SyncFile file = new SyncFile(filePath); SyncFile file = new SyncFile(this, filePath);
filemap.put(filePath, file); filemap.put(filePath, file);
} }
@ -71,7 +71,7 @@ public class SyncDirectory {
*/ */
public Map<String, SyncFile> readStateFile() { public Map<String, SyncFile> readStateFile() {
Map<String, SyncFile> filemap = new HashMap<>(); Map<String, SyncFile> filemap = new HashMap<>();
List<String> lines = tools.fileToLines(new File(stateFilePath(path))); List<String> lines = tools.fileToLines(new File(tools.stateFilePath(path)));
for (String line : lines) { for (String line : lines) {
// this is a predefined format: "modification-time path" // this is a predefined format: "modification-time path"
@ -79,7 +79,7 @@ public class SyncDirectory {
long modTime = Long.parseLong(modTimeString); long modTime = Long.parseLong(modTimeString);
String sFilePath = line.replace(modTimeString + " ", ""); String sFilePath = line.replace(modTimeString + " ", "");
SyncFile sfile = new SyncFile(sFilePath); SyncFile sfile = new SyncFile(this, sFilePath);
sfile.setStateFileTime(modTime); sfile.setStateFileTime(modTime);
@ -98,7 +98,6 @@ public class SyncDirectory {
* @return * @return
*/ */
public void makeListCreated() { public void makeListCreated() {
listCreated = new ArrayList<>();
Map<String, SyncFile> fromA = findState(); Map<String, SyncFile> fromA = findState();
Map<String, SyncFile> substractB = readStateFile(); Map<String, SyncFile> substractB = readStateFile();
@ -106,22 +105,14 @@ public class SyncDirectory {
} }
public String stateFilePath(String path) {
return "/tmp/ensync/state" + path.replace("/", "-");
}
/** /**
* Compare the OLD and NEW pools. * Compare the OLD and NEW pools.
* List is cleared and created each time. * List is cleared and created each time.
*
*/ */
public void makeListDeleted() { public void makeListDeleted() {
listDeleted = new ArrayList<>();
Map<String, SyncFile> fromA = readStateFile(); Map<String, SyncFile> fromA = readStateFile();
Map<String, SyncFile> substractB = findState(); Map<String, SyncFile> substractB = findState();
listDeleted = tools.mapMinus(fromA, substractB); listDeleted = tools.mapMinus(fromA, substractB);
} }
@ -129,24 +120,22 @@ public class SyncDirectory {
/** /**
* Compare the OLD and NEW pools. * Compare the OLD and NEW pools.
* List is cleared and created each time. * List is cleared and created each time.
*
*/ */
public void makeListModified() { public List<SyncFile> makeListModified() {
listModified = new ArrayList<>(); listModified = new ArrayList<>();
Map<String, SyncFile> oldMap = readStateFile(); Map<String, SyncFile> oldMap = readStateFile();
for (Map.Entry<String, SyncFile> newFileEntry : findState().entrySet()) { for (var newFileEntry : findState().entrySet()) {
// If KEY exists in OLD , thus FILE was NOT created.
String newFileKey = newFileEntry.getKey();
String newFileKey = newFileEntry.getKey();
// If KEY exists in OLD , thus FILE was NOT created.
if (oldMap.containsKey(newFileKey)) { if (oldMap.containsKey(newFileKey)) {
SyncFile newFile = newFileEntry.getValue(); SyncFile newFile = newFileEntry.getValue();
long lastModifiedNew = newFile.lastModified();
long lastModifiedNew = newFile.lastModified();
long lastModifiedOld = oldMap.get(newFileKey).stateFileTime(); long lastModifiedOld = oldMap.get(newFileKey).stateFileTime();
if (lastModifiedNew > lastModifiedOld) { if (lastModifiedNew > lastModifiedOld) {
@ -154,7 +143,7 @@ public class SyncDirectory {
} }
} }
} }
return listModified;
} }
@ -177,26 +166,24 @@ public class SyncDirectory {
outputList.add("" + lastModified + " " + filePath); outputList.add("" + lastModified + " " + filePath);
} }
tools.writeStringListToFile(stateFilePath(path), outputList); tools.writeStringListToFile(tools.stateFilePath(path), outputList);
} }
private class Info { private class Info {
private String relativePath = null; private String relativePath;
private String thisFilePath = null; private String thisFilePath;
private String otherFilePath = null; private String otherFilePath;
private File otherFile = null; private File otherFile;
private String otherParentPath = null; private String otherParentPath;
private File otherParentFile = null; private File otherParentFile;
private long thisStateFileTime = 0; private long thisStateFileTime;
private long thisTimeModified = 0; private long thisFileTimeModified;
private long otherTimeModified = 0; private long otherFileTimeModified;
private Info(SyncDirectory thisSD, private Info(SyncDirectory thisSD, SyncFile sFile, SyncDirectory otherSD) {
SyncFile sFile,
SyncDirectory otherSD) {
// Example: // Example:
// syncDirectory /foo // syncDirectory /foo
// otherSyncDirectory /bar // otherSyncDirectory /bar
@ -216,18 +203,18 @@ public class SyncDirectory {
// thisFile does not exist in StateFile, a value of 0 can be seen as equal to "never existed". // thisFile does not exist in StateFile, a value of 0 can be seen as equal to "never existed".
this.thisStateFileTime = 0; this.thisStateFileTime = 0;
} }
this.thisTimeModified = sFile.lastModified(); this.thisFileTimeModified = sFile.lastModified();
if (otherFile.exists()) { if (otherFile.exists()) {
this.otherTimeModified = otherFile.lastModified(); this.otherFileTimeModified = otherFile.lastModified();
} else { } else {
if (otherSD.readStateFile().get(otherFilePath) != null) { if (otherSD.readStateFile().get(otherFilePath) != null) {
this.otherTimeModified = otherSD.readStateFile().get(otherFilePath).stateFileTime(); this.otherFileTimeModified = otherSD.readStateFile().get(otherFilePath).stateFileTime();
} else { } else {
this.otherTimeModified = 0; this.otherFileTimeModified = 0;
} }
} }
@ -243,15 +230,14 @@ public class SyncDirectory {
if (createdFile.isFile()) { if (createdFile.isFile()) {
for (Map.Entry<String, SyncDirectory> otherEntry : syncMap.syncDirectories.entrySet()) { for (var otherEntry : syncMap.syncDirectories.entrySet()) {
SyncDirectory otherSyncDirectory = otherEntry.getValue(); SyncDirectory otherSD = otherEntry.getValue();
if (!this.equals(otherSyncDirectory)) { if (this.equals(otherSD)) { continue; }
Info info = new Info(this, createdFile, otherSyncDirectory); Info info = new Info(this, createdFile, otherSD);
createFile(info); writeFile(info, this, createdFile, otherSD);
}
} }
} }
} }
@ -265,24 +251,21 @@ public class SyncDirectory {
for (SyncFile deletedFile : listDeleted) { for (SyncFile deletedFile : listDeleted) {
for (var otherEntry : syncMap.syncDirectories.entrySet()) {
SyncDirectory otherSD = otherEntry.getValue();
for (Map.Entry<String, SyncDirectory> otherEntry : syncMap.syncDirectories.entrySet()) { if (this.equals(otherSD)) { continue; }
SyncDirectory otherSyncDirectory = otherEntry.getValue();
if (!this.equals(otherSyncDirectory)) {
Info info = new Info(this, deletedFile, otherSyncDirectory); Info info = new Info(this, deletedFile, otherSD);
if (info.otherFile.isFile()) { if (info.otherFile.isFile()) {
// if the otherFile was created with ensync it will have the == TimeModified. // if the otherFile was created with ensync it will have the == TimeModified.
if (info.thisStateFileTime >= info.otherTimeModified) { if (info.thisStateFileTime >= info.otherFileTimeModified) {
String[] cmd = new String[]{"rm", String[] cmd = new String[]{"rm",
"-r", "-r",
info.otherFilePath}; info.otherFilePath};
x.execute(cmd); x.execute(cmd);
}
} }
} }
} }
} }
@ -295,19 +278,14 @@ public class SyncDirectory {
if (modifiedFile.isFile()) { if (modifiedFile.isFile()) {
for (Map.Entry<String, SyncDirectory> otherEntry : syncMap.syncDirectories.entrySet()) { for (var otherEntry : syncMap.syncDirectories.entrySet()) {
SyncDirectory otherSyncDirectory = otherEntry.getValue(); SyncDirectory otherSD = otherEntry.getValue();
if (!this.equals(otherSyncDirectory)) {
Info info = new Info(this, modifiedFile, otherSyncDirectory);
if (this.equals(otherSD)) { continue; }
createFile(info); Info info = new Info(this, modifiedFile, otherSD);
}
writeFile(info, this, modifiedFile, otherSD);
} }
} }
@ -316,8 +294,11 @@ public class SyncDirectory {
} }
private void createFile(Info info) { private void writeFile(Info info, SyncDirectory thisSD, SyncFile thisFile, SyncDirectory otherSD) {
if (!info.otherFile.exists() || info.thisTimeModified > info.otherTimeModified) {
File otherFile = new File(otherSD.path + thisFile.relativePath);
if (!otherFile.exists() || info.thisFileTimeModified > info.otherFileTimeModified) {
if (!info.otherParentFile.exists()) { if (!info.otherParentFile.exists()) {
String[] cmd = new String[]{"mkdir", String[] cmd = new String[]{"mkdir",
"-p", "-p",
@ -333,13 +314,11 @@ public class SyncDirectory {
} }
public String flowState(){ public String flowState() {
return flowState == null ? "NONE" : flowState; return flowState == null ? "NONE" : flowState;
} }
} }

19
src/com/olexyn/ensync/artifacts/SyncFile.java
Unescape View File

@ -8,10 +8,16 @@ public class SyncFile extends File {
// Very IMPORTANT field. Allows to store lastModified as it is stored in the StateFile. // Very IMPORTANT field. Allows to store lastModified as it is stored in the StateFile.
private long stateFileTime = 0; private long stateFileTime = 0;
public String relativePath;
private SyncDirectory sd;
public SyncFile(String pathname) {
public SyncFile(SyncDirectory sd , String pathname) {
super(pathname); super(pathname);
this.sd = sd;
relativePath = this.getPath().replace(sd.path, "");
} }
@ -25,7 +31,18 @@ public class SyncFile extends File {
} }
public long getFileTimeModified(SyncDirectory otherSD){
if (this.exists()){
return lastModified();
}
if (sd.readStateFile().get(this.getPath())!=null){
}
return 0;
}
} }

3
src/com/olexyn/ensync/artifacts/SyncMap.java
Unescape View File

@ -8,14 +8,11 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
* What is a SyncMap?
*
* A SyncMap is the set of such SyncDirectories. The purpose of the SyncMap is to help syncronize the SyncDirectories. * A SyncMap is the set of such SyncDirectories. The purpose of the SyncMap is to help syncronize the SyncDirectories.
*/ */
public class SyncMap { public class SyncMap {
public String name; public String name;
public int syncInterval = 3600;
public Map<String, SyncDirectory> syncDirectories = new HashMap<>(); public Map<String, SyncDirectory> syncDirectories = new HashMap<>();
Tools tools = new Tools(); Tools tools = new Tools();

Write Preview
Loading…
Cancel
Save