Skip to content

Commit 93b3b47

Browse files
committed
no hash for template files
1 parent eda76f0 commit 93b3b47

1 file changed

Lines changed: 3 additions & 51 deletions

File tree

src/EIDEProjectExplorer.ts

Lines changed: 3 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3100,37 +3100,6 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
31003100

31013101
targetDir.CreateDir(true);
31023102

3103-
let templateShaStr: string | undefined;
3104-
let isVerified: boolean | undefined;
3105-
3106-
// get template sha str
3107-
const li = templateFile.noSuffixName.split('.');
3108-
if (li.length > 1) {
3109-
templateShaStr = li[li.length - 1];
3110-
}
3111-
3112-
// verify template zip
3113-
if (templateShaStr) {
3114-
const sha256 = compresser.sha256(templateFile);
3115-
if (sha256) {
3116-
const sha = md5(sha256);
3117-
isVerified = templateShaStr == sha;
3118-
}
3119-
}
3120-
3121-
// if verify failed, notify to user
3122-
if (templateShaStr && !isVerified) {
3123-
if (templateFile.suffix != '.ewt') { // it's eide template project
3124-
const selTxt = await vscode.window.showWarningMessage(
3125-
view_str$msg$err_ept_hash, 'Yes', 'No');
3126-
if (selTxt !== 'Yes') {
3127-
return; // user canceled
3128-
}
3129-
} else { // it's eide template workspace
3130-
vscode.window.showWarningMessage(view_str$msg$err_ewt_hash);
3131-
}
3132-
}
3133-
31343103
const err = await vscode.window.withProgress({
31353104
location: vscode.ProgressLocation.Notification,
31363105
title: `Creating project`
@@ -3163,17 +3132,6 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
31633132
// convert .EIDE to .eide
31643133
this.toLowercaseEIDEFolder(targetDir);
31653134

3166-
// if not verified, del *.sh
3167-
if (!isVerified) {
3168-
const eideFolder = File.fromArray([targetDir.path, AbstractProject.EIDE_DIR]);
3169-
if (eideFolder.IsDir()) {
3170-
eideFolder.GetList([/\-install\.sh$/i], File.EXCLUDE_ALL_FILTER)
3171-
.forEach((f) => {
3172-
try { fs.unlinkSync(f.path); } catch (err) { }
3173-
});
3174-
}
3175-
}
3176-
31773135
// init project
31783136
{
31793137
const prjFile = File.fromArray([targetDir.path, AbstractProject.EIDE_DIR, AbstractProject.prjConfigName]);
@@ -4491,16 +4449,10 @@ export class ProjectExplorer implements CustomConfigurationProvider {
44914449
progress.report({ message: 'zipping ...' });
44924450

44934451
const err = await compresser.Zip(prjRootDir, option, distDir);
4494-
if (!err) { // export done, set hash str
4495-
const sha256 = compresser.sha256(tFile);
4496-
if (sha256) {
4497-
const hash = md5(sha256);
4498-
const name = `${tFile.dir}/${tFile.noSuffixName}.${hash}${tFile.suffix}`;
4499-
try { fs.renameSync(tFile.path, name); } catch (err) { }
4500-
}
4501-
progress.report({ message: 'export done !' });
4502-
} else { // export failed
4452+
if (err) {
45034453
GlobalEvent.emit('msg', ExceptionToMessage(err, 'Warning'));
4454+
} else {
4455+
progress.report({ message: 'export done !' });
45044456
}
45054457

45064458
setTimeout(() => resolve(err), 1500);

0 commit comments

Comments
 (0)