From d8b26370622d265aaab49e407577e408f8116f5c Mon Sep 17 00:00:00 2001 From: plamen5kov Date: Wed, 9 Aug 2017 14:43:00 +0300 Subject: [PATCH 1/3] on livesync delete empty folders on exit --- .../src/debug/java/com/tns/NativeScriptSyncService.java | 7 +++++-- .../app/src/main/java/com/tns/NativeScriptSyncService.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build-artifacts/project-template-gradle/src/debug/java/com/tns/NativeScriptSyncService.java b/build-artifacts/project-template-gradle/src/debug/java/com/tns/NativeScriptSyncService.java index 0bf93dbcf..40f463bb9 100644 --- a/build-artifacts/project-template-gradle/src/debug/java/com/tns/NativeScriptSyncService.java +++ b/build-artifacts/project-template-gradle/src/debug/java/com/tns/NativeScriptSyncService.java @@ -268,16 +268,19 @@ private void deleteRemovedFiles(File sourceDir, String sourceRootAbsolutePath, S if (files != null) { for (int i = 0; i < files.length; i++) { File file = files[i]; + String targetFilePath = file.getAbsolutePath().replace(sourceRootAbsolutePath, targetRootAbsolutePath); + File targetFile = new File(targetFilePath); if (file.isFile()) { if (logger.isEnabled()) { logger.write("Syncing removed file: " + file.getAbsolutePath().toString()); } - String targetFilePath = file.getAbsolutePath().replace(sourceRootAbsolutePath, targetRootAbsolutePath); - File targetFile = new File(targetFilePath); targetFile.delete(); } else { deleteRemovedFiles(file, sourceRootAbsolutePath, targetRootAbsolutePath); + if (targetFile.listFiles().length == 0) { + targetFile.delete(); + } } } } diff --git a/test-app/app/src/main/java/com/tns/NativeScriptSyncService.java b/test-app/app/src/main/java/com/tns/NativeScriptSyncService.java index 0bf93dbcf..40f463bb9 100644 --- a/test-app/app/src/main/java/com/tns/NativeScriptSyncService.java +++ b/test-app/app/src/main/java/com/tns/NativeScriptSyncService.java @@ -268,16 +268,19 @@ private void deleteRemovedFiles(File sourceDir, String sourceRootAbsolutePath, S if (files != null) { for (int i = 0; i < files.length; i++) { File file = files[i]; + String targetFilePath = file.getAbsolutePath().replace(sourceRootAbsolutePath, targetRootAbsolutePath); + File targetFile = new File(targetFilePath); if (file.isFile()) { if (logger.isEnabled()) { logger.write("Syncing removed file: " + file.getAbsolutePath().toString()); } - String targetFilePath = file.getAbsolutePath().replace(sourceRootAbsolutePath, targetRootAbsolutePath); - File targetFile = new File(targetFilePath); targetFile.delete(); } else { deleteRemovedFiles(file, sourceRootAbsolutePath, targetRootAbsolutePath); + if (targetFile.listFiles().length == 0) { + targetFile.delete(); + } } } } From 1926c1fa85eec461ea5333f4315a9ed6d1f4358c Mon Sep 17 00:00:00 2001 From: plamen5kov Date: Thu, 10 Aug 2017 08:12:56 +0300 Subject: [PATCH 2/3] add comment in code --- test-app/app/src/main/java/com/tns/NativeScriptSyncService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test-app/app/src/main/java/com/tns/NativeScriptSyncService.java b/test-app/app/src/main/java/com/tns/NativeScriptSyncService.java index 40f463bb9..a443b358e 100644 --- a/test-app/app/src/main/java/com/tns/NativeScriptSyncService.java +++ b/test-app/app/src/main/java/com/tns/NativeScriptSyncService.java @@ -278,6 +278,8 @@ private void deleteRemovedFiles(File sourceDir, String sourceRootAbsolutePath, S targetFile.delete(); } else { deleteRemovedFiles(file, sourceRootAbsolutePath, targetRootAbsolutePath); + + // this is done so empty folders, if any, are deleted after we're don deleting files. if (targetFile.listFiles().length == 0) { targetFile.delete(); } From 8da99f2d1ec99857f19b2e4b15f279733c70fd3b Mon Sep 17 00:00:00 2001 From: plamen5kov Date: Thu, 10 Aug 2017 11:00:10 +0300 Subject: [PATCH 3/3] added comment --- .../src/debug/java/com/tns/NativeScriptSyncService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-artifacts/project-template-gradle/src/debug/java/com/tns/NativeScriptSyncService.java b/build-artifacts/project-template-gradle/src/debug/java/com/tns/NativeScriptSyncService.java index 40f463bb9..a443b358e 100644 --- a/build-artifacts/project-template-gradle/src/debug/java/com/tns/NativeScriptSyncService.java +++ b/build-artifacts/project-template-gradle/src/debug/java/com/tns/NativeScriptSyncService.java @@ -278,6 +278,8 @@ private void deleteRemovedFiles(File sourceDir, String sourceRootAbsolutePath, S targetFile.delete(); } else { deleteRemovedFiles(file, sourceRootAbsolutePath, targetRootAbsolutePath); + + // this is done so empty folders, if any, are deleted after we're don deleting files. if (targetFile.listFiles().length == 0) { targetFile.delete(); }