|
@@ -79,33 +79,41 @@ public class FileUtil {
|
|
|
if (!compareKey(fileMap1, fileMap2)) {
|
|
|
for (String key : fileMap1.keySet()) {
|
|
|
if (!fileMap2.containsKey(key)) {
|
|
|
- file_old.add(fileMap1.get(key).getAbsolutePath());
|
|
|
+ file_old.add(fileMap1.get(key).getPath());
|
|
|
}
|
|
|
}
|
|
|
for (String key : fileMap2.keySet()) {
|
|
|
if (!fileMap1.containsKey(key)) {
|
|
|
- file_new.add(fileMap2.get(key).getAbsolutePath());
|
|
|
+ file_new.add(fileMap2.get(key).getPath());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if (!compareKey(dirMap1, dirMap2)) {
|
|
|
for (String key : dirMap1.keySet()) {
|
|
|
if (!dirMap2.containsKey(key)) {
|
|
|
- dir_old.add(dirMap1.get(key).getAbsolutePath());
|
|
|
+ dir_old.add(dirMap1.get(key).getPath());
|
|
|
}
|
|
|
}
|
|
|
for (String key : dirMap2.keySet()) {
|
|
|
if (!dirMap1.containsKey(key)) {
|
|
|
- dir_new.add(dirMap2.get(key).getAbsolutePath());
|
|
|
+ dir_new.add(dirMap2.get(key).getPath());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
JSONObject file_change = new JSONObject();
|
|
|
- file_change.put("dir_name", file1.getAbsolutePath());
|
|
|
- file_change.put("file_old", file_old);
|
|
|
- file_change.put("file_new", file_new);
|
|
|
- file_change.put("dir_old", dir_old);
|
|
|
- file_change.put("dir_new", dir_new);
|
|
|
+ file_change.put("dir_name", file1.getPath());
|
|
|
+ if (file_old.size() > 0) {
|
|
|
+ file_change.put("file_old", file_old);
|
|
|
+ }
|
|
|
+ if (file_new.size() > 0) {
|
|
|
+ file_change.put("file_new", file_new);
|
|
|
+ }
|
|
|
+ if (dir_old.size() > 0) {
|
|
|
+ file_change.put("dir_old", dir_old);
|
|
|
+ }
|
|
|
+ if (dir_new.size() > 0) {
|
|
|
+ file_change.put("dir_new", dir_new);
|
|
|
+ }
|
|
|
LogOfDownload.changeList.add(file_change);
|
|
|
}
|
|
|
}
|
|
@@ -139,7 +147,7 @@ public class FileUtil {
|
|
|
if (!file_compare) {
|
|
|
if (LogOfDownload != null) {
|
|
|
JSONObject file_change = new JSONObject();
|
|
|
- file_change.put("file_name", file1.getAbsolutePath());
|
|
|
+ file_change.put("file_name", file1.getPath());
|
|
|
file_change.put("length_old", file1.length());
|
|
|
file_change.put("length_new", file2.length());
|
|
|
LogOfDownload.changeList.add(file_change);
|