make back up workspace path URI

sandy081 · sandy081 · commit 8cbdf09ab084 · 2019-07-05T13:12:31.000+02:00
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
@@ -419,6 +419,7 @@ export interface IWindowConfiguration extends ParsedArgs {
 	nodeCachedDataDir?: string;
 
 	backupPath?: string;
+	backupWorkspaceResource?: URI;
 
 	workspace?: IWorkspaceIdentifier;
 	folderUri?: ISingleFolderWorkspaceIdentifier;
diff --git a/src/vs/workbench/services/backup/common/backupFileService.ts b/src/vs/workbench/services/backup/common/backupFileService.ts
@@ -114,9 +114,9 @@ export class BackupFileService implements IBackupFileService {
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 		@IFileService fileService: IFileService
 	) {
-		const backupWorkspacePath = environmentService.configuration.backupPath;
-		if (backupWorkspacePath) {
-			this.impl = new BackupFileServiceImpl(backupWorkspacePath, this.hashPath, environmentService, fileService);
+		const backupWorkspaceResource = environmentService.configuration.backupWorkspaceResource;
+		if (backupWorkspaceResource) {
+			this.impl = new BackupFileServiceImpl(backupWorkspaceResource, this.hashPath, environmentService, fileService);
 		} else {
 			this.impl = new InMemoryBackupFileService(this.hashPath);
 		}
@@ -127,9 +127,9 @@ export class BackupFileService implements IBackupFileService {
 		return hash(str).toString(16);
 	}
 
-	initialize(backupWorkspacePath: string): void {
+	initialize(backupWorkspaceResource: URI): void {
 		if (this.impl instanceof BackupFileServiceImpl) {
-			this.impl.initialize(backupWorkspacePath);
+			this.impl.initialize(backupWorkspaceResource);
 		}
 	}
 
@@ -181,19 +181,19 @@ class BackupFileServiceImpl implements IBackupFileService {
 	private ioOperationQueues: ResourceQueue; // queue IO operations to ensure write order
 
 	constructor(
-		backupWorkspacePath: string,
+		backupWorkspaceResource: URI,
 		private readonly hashPath: (resource: URI) => string,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
 		@IFileService private readonly fileService: IFileService
 	) {
 		this.isShuttingDown = false;
 		this.ioOperationQueues = new ResourceQueue();
 
-		this.initialize(backupWorkspacePath);
+		this.initialize(backupWorkspaceResource);
 	}
 
-	initialize(backupWorkspacePath: string): void {
-		this.backupWorkspacePath = joinPath(this.environmentService.userRoamingDataHome, relativePath(URI.file(this.environmentService.userDataPath), URI.file(backupWorkspacePath))!);
+	initialize(backupWorkspaceResource: URI): void {
+		this.backupWorkspacePath = joinPath(this.environmentService.userRoamingDataHome, relativePath(URI.file(this.environmentService.userDataPath), backupWorkspaceResource)!);
 
 		this.ready = this.init();
 	}
diff --git a/src/vs/workbench/services/environment/node/environmentService.ts b/src/vs/workbench/services/environment/node/environmentService.ts
@@ -19,6 +19,7 @@ export class WorkbenchEnvironmentService extends EnvironmentService implements I
 		execPath: string
 	) {
 		super(_configuration, execPath);
+		this._configuration.backupWorkspaceResource = this._configuration.backupPath ? URI.file(this._configuration.backupPath) : undefined;
 	}
 
 	get configuration(): IWindowConfiguration {
diff --git a/src/vs/workbench/services/workspace/electron-browser/workspaceEditingService.ts b/src/vs/workbench/services/workspace/electron-browser/workspaceEditingService.ts
@@ -397,7 +397,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 			await this.migrateStorage(result.workspace);
 			// Reinitialize backup service
 			if (this.backupFileService instanceof BackupFileService) {
-				this.backupFileService.initialize(result.backupPath!);
+				this.backupFileService.initialize(URI.file(result.backupPath!));
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ export class WorkbenchEnvironmentService extends EnvironmentService implements I`
`19`	`19`	`execPath: string`
`20`	`20`	`) {`
`21`	`21`	`super(_configuration, execPath);`
	`22`	`+ this._configuration.backupWorkspaceResource = this._configuration.backupPath ? URI.file(this._configuration.backupPath) : undefined;`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`get configuration(): IWindowConfiguration {`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {`
`397`	`397`	`await this.migrateStorage(result.workspace);`
`398`	`398`	`// Reinitialize backup service`
`399`	`399`	`if (this.backupFileService instanceof BackupFileService) {`
`400`		`- this.backupFileService.initialize(result.backupPath!);`
	`400`	`+ this.backupFileService.initialize(URI.file(result.backupPath!));`
`401`	`401`	`}`
`402`	`402`	`}`
`403`	`403`