Skip to content

Fix simultaneous livesync error #3074

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 1 commit into from
Aug 22, 2017
Merged

Fix simultaneous livesync error #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/common
Open in desktop
Submodule common updated 3 files
+8 −0 commands/proxy/proxy-set.ts
+12 −2 services/html-help-service.ts
+8 −0 services/project-files-provider-base.ts
9 changes: 6 additions & 3 deletions lib/services/livesync/platform-livesync-service-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export abstract class PlatformLiveSyncServiceBase {
const mappedFiles = _.map(filesToSync, filePath => this.$projectFilesProvider.mapFilePath(filePath, device.deviceInfo.platform, projectData));

// Some plugins modify platforms dir on afterPrepare (check nativescript-dev-sass) - we want to sync only existing file.
const existingFiles = mappedFiles.filter(m => this.$fs.exists(m));
const existingFiles = mappedFiles.filter(m => m && this.$fs.exists(m));
this.$logger.trace("Will execute livesync for files: ", existingFiles);
const skippedFiles = _.difference(mappedFiles, existingFiles);
if (skippedFiles.length) {
Expand All @@ -75,7 +75,7 @@ export abstract class PlatformLiveSyncServiceBase {
const platformData = this.$platformsData.getPlatformData(device.deviceInfo.platform, projectData);
const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, APP_FOLDER_NAME);
const localToDevicePaths = await this.$projectFilesManager.createLocalToDevicePaths(deviceAppData,
projectFilesPath, mappedFiles, []);
projectFilesPath, existingFiles, []);
modifiedLocalToDevicePaths.push(...localToDevicePaths);
await this.transferFiles(deviceAppData, localToDevicePaths, projectFilesPath, false);
}
Expand All @@ -85,7 +85,10 @@ export abstract class PlatformLiveSyncServiceBase {
const filePaths = liveSyncInfo.filesToRemove;
const platformData = this.$platformsData.getPlatformData(device.deviceInfo.platform, projectData);

const mappedFiles = _.map(filePaths, filePath => this.$projectFilesProvider.mapFilePath(filePath, device.deviceInfo.platform, projectData));
const mappedFiles = _(filePaths)
.map(filePath => this.$projectFilesProvider.mapFilePath(filePath, device.deviceInfo.platform, projectData))
.filter(filePath => !!filePath)
.value();
const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, APP_FOLDER_NAME);
const localToDevicePaths = await this.$projectFilesManager.createLocalToDevicePaths(deviceAppData, projectFilesPath, mappedFiles, []);
modifiedLocalToDevicePaths.push(...localToDevicePaths);
Expand Down