Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3d2a2e5e
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3d2a2e5e
编写于
8月 26, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
multi root - migrate hot exit to new workspace id
上级
d3d10298
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
22 addition
and
6 deletion
+22
-6
src/vs/platform/backup/electron-main/backupMainService.ts
src/vs/platform/backup/electron-main/backupMainService.ts
+22
-6
未找到文件。
src/vs/platform/backup/electron-main/backupMainService.ts
浏览文件 @
3d2a2e5e
...
@@ -14,7 +14,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
...
@@ -14,7 +14,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IFilesConfiguration
,
HotExitConfiguration
}
from
'
vs/platform/files/common/files
'
;
import
{
IFilesConfiguration
,
HotExitConfiguration
}
from
'
vs/platform/files/common/files
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
IWorkspaceIdentifier
,
ISingleFolderWorkspaceIdentifier
,
IWorkspacesMainService
}
from
'
vs/platform/workspaces/common/workspaces
'
;
import
{
IWorkspaceIdentifier
,
ISingleFolderWorkspaceIdentifier
,
IWorkspacesMainService
,
isSingleFolderWorkspaceIdentifier
}
from
'
vs/platform/workspaces/common/workspaces
'
;
export
class
BackupMainService
implements
IBackupMainService
{
export
class
BackupMainService
implements
IBackupMainService
{
...
@@ -149,7 +149,7 @@ export class BackupMainService implements IBackupMainService {
...
@@ -149,7 +149,7 @@ export class BackupMainService implements IBackupMainService {
}
}
private
sanitizeId
(
workspaceIdentifier
:
IWorkspaceIdentifier
|
ISingleFolderWorkspaceIdentifier
):
string
{
private
sanitizeId
(
workspaceIdentifier
:
IWorkspaceIdentifier
|
ISingleFolderWorkspaceIdentifier
):
string
{
if
(
typeof
workspaceIdentifier
===
'
string
'
)
{
if
(
isSingleFolderWorkspaceIdentifier
(
workspaceIdentifier
)
)
{
return
this
.
sanitizePath
(
workspaceIdentifier
);
return
this
.
sanitizePath
(
workspaceIdentifier
);
}
}
...
@@ -220,10 +220,26 @@ export class BackupMainService implements IBackupMainService {
...
@@ -220,10 +220,26 @@ export class BackupMainService implements IBackupMainService {
// Validate Workspace and Folder Backups
// Validate Workspace and Folder Backups
workspaceAndFolders
.
forEach
(
workspaceOrFolder
=>
{
workspaceAndFolders
.
forEach
(
workspaceOrFolder
=>
{
const
workspaceId
=
workspaceOrFolder
.
workspaceIdentifier
;
const
workspaceId
=
workspaceOrFolder
.
workspaceIdentifier
;
const
workspacePath
=
typeof
workspaceId
===
'
string
'
?
workspaceId
:
workspaceId
.
configPath
;
const
workspacePath
=
isSingleFolderWorkspaceIdentifier
(
workspaceId
)
?
workspaceId
:
workspaceId
.
configPath
;
const
backupPath
=
path
.
join
(
this
.
backupHome
,
typeof
workspaceId
===
'
string
'
?
this
.
getFolderHash
(
workspaceId
)
:
workspaceId
.
id
);
const
backupPath
=
path
.
join
(
this
.
backupHome
,
isSingleFolderWorkspaceIdentifier
(
workspaceId
)
?
this
.
getFolderHash
(
workspaceId
)
:
workspaceId
.
id
);
const
hasBackups
=
this
.
hasBackupsSync
(
backupPath
);
const
hasBackups
=
this
.
hasBackupsSync
(
backupPath
);
const
missingWorkspace
=
hasBackups
&&
(
!
fs
.
existsSync
(
workspacePath
)
||
workspaceId
!==
this
.
workspacesService
.
getWorkspaceId
(
workspacePath
)
/* TODO@Ben migration to new workspace id */
);
const
missingWorkspace
=
hasBackups
&&
!
fs
.
existsSync
(
workspacePath
);
// TODO@Ben migration from old workspace ID to new
if
(
hasBackups
&&
!
missingWorkspace
&&
!
isSingleFolderWorkspaceIdentifier
(
workspaceId
)
&&
workspaceId
.
id
!==
this
.
workspacesService
.
getWorkspaceId
(
workspacePath
))
{
staleBackupWorkspaces
.
push
({
workspaceIdentifier
:
workspaceId
,
backupPath
,
target
:
workspaceOrFolder
.
target
});
const
identifier
=
{
id
:
this
.
workspacesService
.
getWorkspaceId
(
workspacePath
),
configPath
:
workspacePath
}
as
IWorkspaceIdentifier
;
this
.
pushBackupPathsSync
(
identifier
,
this
.
backups
.
rootWorkspaces
);
const
newWorkspaceBackupPath
=
path
.
join
(
this
.
backupHome
,
identifier
.
id
);
try
{
fs
.
renameSync
(
backupPath
,
newWorkspaceBackupPath
);
}
catch
(
ex
)
{
this
.
logService
.
error
(
`Backup: Could not rename backup folder for legacy workspace:
${
ex
.
toString
()}
`
);
this
.
removeBackupPathSync
(
identifier
,
this
.
backups
.
rootWorkspaces
);
}
}
// If the workspace/folder has no backups, make sure to delete it
// If the workspace/folder has no backups, make sure to delete it
// If the workspace/folder has backups, but the target workspace is missing, convert backups to empty ones
// If the workspace/folder has backups, but the target workspace is missing, convert backups to empty ones
...
@@ -233,7 +249,7 @@ export class BackupMainService implements IBackupMainService {
...
@@ -233,7 +249,7 @@ export class BackupMainService implements IBackupMainService {
if
(
missingWorkspace
)
{
if
(
missingWorkspace
)
{
const
identifier
=
this
.
getRandomEmptyWindowId
();
const
identifier
=
this
.
getRandomEmptyWindowId
();
this
.
pushBackupPathsSync
(
identifier
,
this
.
backups
.
emptyWorkspaces
);
this
.
pushBackupPathsSync
(
identifier
,
this
.
backups
.
emptyWorkspaces
);
const
newEmptyWindowBackupPath
=
path
.
join
(
path
.
dirname
(
backupPath
)
,
identifier
);
const
newEmptyWindowBackupPath
=
path
.
join
(
this
.
backupHome
,
identifier
);
try
{
try
{
fs
.
renameSync
(
backupPath
,
newEmptyWindowBackupPath
);
fs
.
renameSync
(
backupPath
,
newEmptyWindowBackupPath
);
}
catch
(
ex
)
{
}
catch
(
ex
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录