Skip to content

on livesync delete empty folders on exit #821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 11, 2017
+14 −4
Merged

on livesync delete empty folders on exit #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8b2637
on livesync delete empty folders on exit
Plamen5kov Aug 9, 2017
1926c1f
add comment in code
Plamen5kov Aug 10, 2017
8da99f2
added comment
Plamen5kov Aug 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions build-artifacts/project-template-gradle/src/debug/java/com/tns/NativeScriptSyncService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,16 +268,21 @@ 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);

// this is done so empty folders, if any, are deleted after we're don deleting files.
if (targetFile.listFiles().length == 0) {
targetFile.delete();
}
}
}
}
Expand Down
9 changes: 7 additions & 2 deletions test-app/app/src/main/java/com/tns/NativeScriptSyncService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,16 +268,21 @@ 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);

// this is done so empty folders, if any, are deleted after we're don deleting files.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment is only present in the test-app class. Could you do the same for the build template?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

F!@@#%!%$!@#

if (targetFile.listFiles().length == 0) {
targetFile.delete();
}
}
}
}
Expand Down