Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b158bfb8
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,发现更多精彩内容 >>
提交
b158bfb8
编写于
12月 02, 2016
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix tests
上级
9ead89a7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
17 deletion
+35
-17
src/vs/platform/backup/electron-main/backupMainService.ts
src/vs/platform/backup/electron-main/backupMainService.ts
+19
-8
src/vs/platform/backup/test/electron-main/backupMainService.test.ts
...tform/backup/test/electron-main/backupMainService.test.ts
+16
-9
未找到文件。
src/vs/platform/backup/electron-main/backupMainService.ts
浏览文件 @
b158bfb8
...
...
@@ -52,7 +52,7 @@ export class BackupMainService implements IBackupMainService {
public
registerWindowForBackups
(
windowId
:
number
,
isEmptyWorkspace
:
boolean
,
backupFolder
?:
string
,
workspacePath
?:
string
):
void
{
// Generate a new folder if this is a new empty workspace
if
(
!
backupFolder
)
{
if
(
isEmptyWorkspace
&&
!
backupFolder
)
{
backupFolder
=
Date
.
now
().
toString
();
}
...
...
@@ -60,7 +60,7 @@ export class BackupMainService implements IBackupMainService {
this
.
pushBackupPathsSync
(
isEmptyWorkspace
?
backupFolder
:
this
.
sanitizePath
(
workspacePath
),
isEmptyWorkspace
);
}
protected
pushBackupPathsSync
(
workspaceIdentifier
:
string
,
isEmptyWorkspace
?
:
boolean
):
void
{
protected
pushBackupPathsSync
(
workspaceIdentifier
:
string
,
isEmptyWorkspace
:
boolean
):
void
{
if
(
!
isEmptyWorkspace
)
{
workspaceIdentifier
=
this
.
sanitizePath
(
workspaceIdentifier
);
}
...
...
@@ -131,20 +131,31 @@ export class BackupMainService implements IBackupMainService {
}
private
validateBackupWorkspaces
(
backups
:
IBackupWorkspacesFormat
):
void
{
const
staleBackupWorkspaces
:
{
workspaceIdentifier
:
string
;
backupPath
:
string
;
isEmptyWorkspace
:
boolean
}[]
=
[];
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
))
{
extfs
.
delSync
(
backupPath
);
const
backupWorkspace
=
Uri
.
file
(
this
.
sanitizePath
(
workspacePath
));
this
.
removeWorkspaceBackupPathSync
(
backupWorkspace
);
const
backupWorkspace
=
this
.
sanitizePath
(
workspacePath
);
staleBackupWorkspaces
.
push
({
workspaceIdentifier
:
backupWorkspace
,
backupPath
,
isEmptyWorkspace
:
false
});
}
});
backups
.
emptyWorkspaces
.
forEach
(
backupFolder
=>
{
const
backupPath
=
path
.
join
(
this
.
backupHome
,
backupFolder
);
if
(
!
this
.
hasBackupsSync
(
backupPath
))
{
extfs
.
delSync
(
backupPath
);
this
.
removeEmptyWorkspaceBackupFolder
(
backupFolder
);
staleBackupWorkspaces
.
push
({
workspaceIdentifier
:
backupFolder
,
backupPath
,
isEmptyWorkspace
:
true
});
}
});
staleBackupWorkspaces
.
forEach
(
staleBackupWorkspace
=>
{
const
{
backupPath
,
workspaceIdentifier
,
isEmptyWorkspace
}
=
staleBackupWorkspace
;
extfs
.
delSync
(
backupPath
);
if
(
isEmptyWorkspace
)
{
this
.
removeEmptyWorkspaceBackupFolder
(
workspaceIdentifier
);
}
else
{
this
.
removeWorkspaceBackupPathSync
(
Uri
.
file
(
workspaceIdentifier
));
}
});
}
...
...
@@ -184,7 +195,7 @@ export class BackupMainService implements IBackupMainService {
return
platform
.
isLinux
?
p
:
p
.
toLowerCase
();
}
pr
ivate
getWorkspaceHash
(
workspacePath
:
string
):
string
{
pr
otected
getWorkspaceHash
(
workspacePath
:
string
):
string
{
return
crypto
.
createHash
(
'
md5
'
).
update
(
this
.
sanitizePath
(
workspacePath
)).
digest
(
'
hex
'
);
}
}
src/vs/platform/backup/test/electron-main/backupMainService.test.ts
浏览文件 @
b158bfb8
...
...
@@ -37,7 +37,7 @@ class TestBackupMainService extends BackupMainService {
}
public
toBackupPath
(
workspacePath
:
string
):
string
{
return
super
.
toBackupPath
(
workspacePath
);
return
path
.
join
(
this
.
backupHome
,
super
.
getWorkspaceHash
(
workspacePath
)
);
}
}
...
...
@@ -100,12 +100,14 @@ suite('BackupMainService', () => {
});
test
(
'
pushWorkspaceBackupPathsSync should persist paths to workspaces.json
'
,
()
=>
{
service
.
pushWorkspaceBackupPathsSync
([
fooFile
,
barFile
]);
service
.
registerWindowForBackups
(
1
,
false
,
null
,
fooFile
.
fsPath
);
service
.
registerWindowForBackups
(
2
,
false
,
null
,
barFile
.
fsPath
);
assert
.
deepEqual
(
service
.
workspaceBackupPaths
,
[
fooFile
.
fsPath
,
barFile
.
fsPath
]);
});
test
(
'
removeWorkspaceBackupPath should remove workspaces from workspaces.json
'
,
done
=>
{
service
.
pushWorkspaceBackupPathsSync
([
fooFile
,
barFile
]);
service
.
registerWindowForBackups
(
1
,
false
,
null
,
fooFile
.
fsPath
);
service
.
registerWindowForBackups
(
2
,
false
,
null
,
barFile
.
fsPath
);
service
.
removeWorkspaceBackupPathSync
(
fooFile
);
pfs
.
readFile
(
backupWorkspacesPath
,
'
utf-8
'
).
then
(
buffer
=>
{
const
json
=
<
IBackupWorkspacesFormat
>
JSON
.
parse
(
buffer
);
...
...
@@ -134,16 +136,20 @@ suite('BackupMainService', () => {
test
(
'
service validates backup workspaces on startup and cleans up
'
,
done
=>
{
// 1) backup workspace path does not exist
service
.
pushWorkspaceBackupPathsSync
([
fooFile
,
barFile
]);
console
.
log
(
'
fooFile :
'
+
fooFile
.
fsPath
);
console
.
log
(
'
barFile :
'
+
barFile
.
fsPath
);
service
.
registerWindowForBackups
(
1
,
false
,
null
,
fooFile
.
fsPath
);
service
.
registerWindowForBackups
(
2
,
false
,
null
,
barFile
.
fsPath
);
service
.
loadSync
();
assert
.
equal
(
service
.
workspaceBackupPaths
.
length
,
0
);
assert
.
deepEqual
(
service
.
workspaceBackupPaths
,
[]
);
// 2) backup workspace path exists with empty contents within
fs
.
mkdirSync
(
service
.
toBackupPath
(
fooFile
.
fsPath
));
fs
.
mkdirSync
(
service
.
toBackupPath
(
barFile
.
fsPath
));
service
.
pushWorkspaceBackupPathsSync
([
fooFile
,
barFile
]);
service
.
registerWindowForBackups
(
1
,
false
,
null
,
fooFile
.
fsPath
);
service
.
registerWindowForBackups
(
2
,
false
,
null
,
barFile
.
fsPath
);
service
.
loadSync
();
assert
.
equal
(
service
.
workspaceBackupPaths
.
length
,
0
);
assert
.
deepEqual
(
service
.
workspaceBackupPaths
,
[]
);
assert
.
ok
(
!
fs
.
exists
(
service
.
toBackupPath
(
fooFile
.
fsPath
)));
assert
.
ok
(
!
fs
.
exists
(
service
.
toBackupPath
(
barFile
.
fsPath
)));
...
...
@@ -152,9 +158,10 @@ suite('BackupMainService', () => {
fs
.
mkdirSync
(
service
.
toBackupPath
(
barFile
.
fsPath
));
fs
.
mkdirSync
(
path
.
join
(
service
.
toBackupPath
(
fooFile
.
fsPath
),
'
file
'
));
fs
.
mkdirSync
(
path
.
join
(
service
.
toBackupPath
(
barFile
.
fsPath
),
'
untitled
'
));
service
.
pushWorkspaceBackupPathsSync
([
fooFile
,
barFile
]);
service
.
registerWindowForBackups
(
1
,
false
,
null
,
fooFile
.
fsPath
);
service
.
registerWindowForBackups
(
2
,
false
,
null
,
barFile
.
fsPath
);
service
.
loadSync
();
assert
.
equal
(
service
.
workspaceBackupPaths
.
length
,
0
);
assert
.
deepEqual
(
service
.
workspaceBackupPaths
,
[]
);
assert
.
ok
(
!
fs
.
exists
(
service
.
toBackupPath
(
fooFile
.
fsPath
)));
assert
.
ok
(
!
fs
.
exists
(
service
.
toBackupPath
(
barFile
.
fsPath
)));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录