Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6aec1e72
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,发现更多精彩内容 >>
提交
6aec1e72
编写于
12月 02, 2016
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge remove workspace funcs to removeBackupPathSync
上级
8ba5d115
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
32 deletion
+15
-32
src/vs/platform/backup/electron-main/backupMainService.ts
src/vs/platform/backup/electron-main/backupMainService.ts
+7
-24
src/vs/platform/backup/test/electron-main/backupMainService.test.ts
...tform/backup/test/electron-main/backupMainService.test.ts
+8
-8
未找到文件。
src/vs/platform/backup/electron-main/backupMainService.ts
浏览文件 @
6aec1e72
...
...
@@ -71,28 +71,16 @@ export class BackupMainService implements IBackupMainService {
}
}
protected
removeWorkspaceBackupPathSync
(
workspace
:
Uri
):
void
{
if
(
!
this
.
backups
.
folderWorkspaces
)
{
return
;
}
const
index
=
this
.
backups
.
folderWorkspaces
.
indexOf
(
workspace
.
fsPath
);
if
(
index
===
-
1
)
{
return
;
}
this
.
backups
.
folderWorkspaces
.
splice
(
index
,
1
);
this
.
saveSync
();
}
// TODO: Test
private
removeEmptyWorkspaceBackupFolder
(
backupFolder
:
string
):
void
{
if
(
!
this
.
backups
.
emptyWorkspaces
)
{
protected
removeBackupPathSync
(
workspaceIdentifier
:
string
,
isEmptyWorkspace
:
boolean
):
void
{
const
array
=
isEmptyWorkspace
?
this
.
backups
.
emptyWorkspaces
:
this
.
backups
.
folderWorkspaces
;
if
(
!
array
)
{
return
;
}
const
index
=
this
.
backups
.
emptyWorkspaces
.
indexOf
(
backupFold
er
);
const
index
=
array
.
indexOf
(
workspaceIdentifi
er
);
if
(
index
===
-
1
)
{
return
;
}
this
.
backups
.
emptyWorkspaces
.
splice
(
index
,
1
);
array
.
splice
(
index
,
1
);
this
.
saveSync
();
}
...
...
@@ -135,10 +123,9 @@ export class BackupMainService implements IBackupMainService {
backups
.
folderWorkspaces
.
forEach
(
workspacePath
=>
{
const
backupPath
=
path
.
join
(
this
.
backupHome
,
this
.
getWorkspaceHash
(
workspacePath
));
console
.
log
(
'
this.hasBackupsSync(backupPath) for
'
+
workspacePath
+
'
:
'
+
this
.
hasBackupsSync
(
backupPath
));
if
(
!
this
.
hasBackupsSync
(
backupPath
))
{
const
backupWorkspace
=
this
.
sanitizePath
(
workspacePath
);
staleBackupWorkspaces
.
push
({
workspaceIdentifier
:
backupWorkspace
,
backupPath
,
isEmptyWorkspace
:
false
});
staleBackupWorkspaces
.
push
({
workspaceIdentifier
:
Uri
.
file
(
backupWorkspace
).
fsPath
,
backupPath
,
isEmptyWorkspace
:
false
});
}
});
...
...
@@ -152,11 +139,7 @@ export class BackupMainService implements IBackupMainService {
staleBackupWorkspaces
.
forEach
(
staleBackupWorkspace
=>
{
const
{
backupPath
,
workspaceIdentifier
,
isEmptyWorkspace
}
=
staleBackupWorkspace
;
extfs
.
delSync
(
backupPath
);
if
(
isEmptyWorkspace
)
{
this
.
removeEmptyWorkspaceBackupFolder
(
workspaceIdentifier
);
}
else
{
this
.
removeWorkspaceBackupPathSync
(
Uri
.
file
(
workspaceIdentifier
));
}
this
.
removeBackupPathSync
(
workspaceIdentifier
,
isEmptyWorkspace
);
});
}
...
...
src/vs/platform/backup/test/electron-main/backupMainService.test.ts
浏览文件 @
6aec1e72
...
...
@@ -28,8 +28,8 @@ class TestBackupMainService extends BackupMainService {
this
.
loadSync
();
}
public
remove
WorkspaceBackupPathSync
(
workspace
:
Uri
):
void
{
return
super
.
remove
WorkspaceBackupPathSync
(
w
orkspace
);
public
remove
BackupPathSync
(
workspaceIdenfitier
:
string
,
isEmptyWorkspace
:
boolean
):
void
{
return
super
.
remove
BackupPathSync
(
workspaceIdenfitier
,
isEmptyW
orkspace
);
}
public
loadSync
():
void
{
...
...
@@ -204,15 +204,15 @@ suite('BackupMainService', () => {
});
});
suite
(
'
remove
Workspace
BackupPathSync
'
,
()
=>
{
test
(
'
removeWorkspaceBackupPathSync
should remove workspaces from workspaces.json
'
,
done
=>
{
suite
(
'
removeBackupPathSync
'
,
()
=>
{
test
(
'
should remove workspaces from workspaces.json
'
,
done
=>
{
service
.
registerWindowForBackups
(
1
,
false
,
null
,
fooFile
.
fsPath
);
service
.
registerWindowForBackups
(
2
,
false
,
null
,
barFile
.
fsPath
);
service
.
remove
WorkspaceBackupPathSync
(
fooFil
e
);
service
.
remove
BackupPathSync
(
fooFile
.
fsPath
,
fals
e
);
pfs
.
readFile
(
backupWorkspacesPath
,
'
utf-8
'
).
then
(
buffer
=>
{
const
json
=
<
IBackupWorkspacesFormat
>
JSON
.
parse
(
buffer
);
assert
.
deepEqual
(
json
.
folderWorkspaces
,
[
barFile
.
fsPath
]);
service
.
remove
WorkspaceBackupPathSync
(
barFil
e
);
service
.
remove
BackupPathSync
(
barFile
.
fsPath
,
fals
e
);
pfs
.
readFile
(
backupWorkspacesPath
,
'
utf-8
'
).
then
(
content
=>
{
const
json2
=
<
IBackupWorkspacesFormat
>
JSON
.
parse
(
content
);
assert
.
deepEqual
(
json2
.
folderWorkspaces
,
[]);
...
...
@@ -221,10 +221,10 @@ suite('BackupMainService', () => {
});
});
test
(
'
removeWorkspaceBackupPathSync
should fail gracefully when removing a path that doesn
\'
t exist
'
,
done
=>
{
test
(
'
should fail gracefully when removing a path that doesn
\'
t exist
'
,
done
=>
{
const
workspacesJson
:
IBackupWorkspacesFormat
=
{
folderWorkspaces
:
[
fooFile
.
fsPath
],
emptyWorkspaces
:
[]
};
pfs
.
writeFile
(
backupWorkspacesPath
,
JSON
.
stringify
(
workspacesJson
)).
then
(()
=>
{
service
.
remove
WorkspaceBackupPathSync
(
barFil
e
);
service
.
remove
BackupPathSync
(
barFile
.
fsPath
,
fals
e
);
pfs
.
readFile
(
backupWorkspacesPath
,
'
utf-8
'
).
then
(
content
=>
{
const
json
=
<
IBackupWorkspacesFormat
>
JSON
.
parse
(
content
);
assert
.
deepEqual
(
json
.
folderWorkspaces
,
[
fooFile
.
fsPath
]);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录