Commit 470a5e3

authored

Merge pull request #455 from shungang/csg/feat/develop/48424264

fix: to #50555373 修复windows下删除job后,缓冲文件不会删除的问题

2 parents c3a7c7f + 62a6150 commit 470a5e3Copy full SHA for 470a5e3

File tree

6 files changed

+15296

-27

lines changed

app/main/files
- modals
  - grant-modal.js
- transfer
  - downloads.js
node/ossstore/lib
- download-job.js
- upload-job-util.js
package-lock.json
package.json

6 files changed

+15296

-27

lines changed

`‎app/main/files/modals/grant-modal.js‎`

Lines changed: 33 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ angular.module('web').controller('grantModalCtrl', [`
`52`	`52`	`privTypes: ['readOnly', 'all'],`
`53`	`53`	`privType: 'readOnly'`
`54`	`54`	`},`
	`55`	`+ // eslint-disable-next-line no-useless-escape`
`55`	`56`	`policyNameReg: /^[a-z0-9A-Z\-]{1,128}$/,`
`56`	`57`	`mailSmtp: settingsSvs.mailSmtp.get(),`
`57`	`58`	`showEmailSettings: function() {`
`@@ -219,31 +220,41 @@ angular.module('web').controller('grantModalCtrl', [`
`219`	`220`	`var title = T('simplePolicy.title'); // 简化policy授权`
`220`	`221`	`var successMsg = T('simplePolicy.success'); // '应用policy成功'`
`221`	`222`
	`223`	`+ let retry = 0; // policyName创建后需要等几秒才生效,故需要重试3次,使用setTimeout避免attachPolicyToUser提示policyName不存在`
	`224`	`+ const retryFunc = ()=>{`
	`225`	`+ if (retry < 3) {`
	`226`	`+ retry++;`
	`227`	`+ setTimeout(()=>{`
	`228`	`+ ramSvs`
	`229`	`+ .attachPolicyToUser(policyName, $scope.grant.userName) // 为指定用户添加权限`
	`230`	`+ .then(function() {`
	`231`	`+ // 发邮件`
	`232`	`+ if (sendInfo) {`
	`233`	`+ Mailer.send(sendInfo).then(`
	`234`	`+ function(result) {`
	`235`	`+ console.log(result);`
	`236`	`+ Toast.success(T('mail.test.success'));`
	`237`	`+ },`
	`238`	`+ function(err) {`
	`239`	`+ console.error(err);`
	`240`	`+ Toast.error(err);`
	`241`	`+ }`
	`242`	`+ );`
	`243`	`+ }`
	`244`	`+`
	`245`	`+ Toast.success(successMsg);`
	`246`	`+ cancel();`
	`247`	`+ }).catch(()=>{`
	`248`	`+ retryFunc(); // 递归重试`
	`249`	`+ });`
	`250`	`+ }, 1000);`
	`251`	`+ }`
	`252`	`+ };`
`222`	`253`	`checkCreatePolicy(policyName, $scope.grant.policy, title).then(`
`223`	`254`	`function() {`
`224`	`255`	`switch ($scope.grant.toType) {`
`225`	`256`	`case 'user':`
`226`		`- ramSvs`
`227`		`- .attachPolicyToUser(policyName, $scope.grant.userName)`
`228`		`- .then(function() {`
`229`		`- // 发邮件`
`230`		`- if (sendInfo) {`
`231`		`- Mailer.send(sendInfo).then(`
`232`		`- function(result) {`
`233`		`- console.log(result);`
`234`		`- Toast.success(T('mail.test.success'));`
`235`		`- },`
`236`		`- function(err) {`
`237`		`- console.error(err);`
`238`		`- Toast.error(err);`
`239`		`- }`
`240`		`- );`
`241`		`- }`
`242`		`-`
`243`		`- Toast.success(successMsg);`
`244`		`- cancel();`
`245`		`- });`
`246`		`-`
	`257`	`+ retryFunc();`
`247`	`258`	`break;`
`248`	`259`	`case 'group':`
`249`	`260`	`ramSvs`
`@@ -294,7 +305,7 @@ angular.module('web').controller('grantModalCtrl', [`
`294`	`305`	`}`
`295`	`306`	`);`
`296`	`307`
`297`		`- return df.promise;`
	`308`	`+ // return df.promise;`
`298`	`309`	`}`
`299`	`310`
`300`	`311`	`function checkCreateUser(fn) {`

`‎app/main/files/transfer/downloads.js‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-`
	`1`	`+// 下载弹窗`
`2`	`2`	`angular.module('web').controller('transferDownloadsCtrl', [`
`3`	`3`	`'$scope',`
`4`	`4`	`'$timeout',`
`@@ -34,7 +34,7 @@ angular.module('web').controller('transferDownloadsCtrl', [`
`34`	`34`	`checkStartJob: checkStartJob,`
`35`	`35`	`openLocaleFolder: function(item) {`
`36`	`36`	`var suffix = item.status == 'finished' ? '' : '.download';`
`37`		`-`
	`37`	`+// eslint-disable-next-line no-undef`
`38`	`38`	`openLocaleFolder(item.to.path + suffix);`
`39`	`39`	`},`
`40`	`40`

`‎node/ossstore/lib/download-job.js‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -671,7 +671,7 @@ DownloadJob.prototype._changeStatus = function (status, retryTimes) {`
`671`	`671`	`if (status == "failed" \|\| status == "stopped" \|\| status == "finished") {`
`672`	`672`	`self.endTime = new Date().getTime();`
`673`	`673`	`//util.closeFD(self.keepFd);`
`674`		`-`
	`674`	`+util.closeFD(self.fd);// #50555373 不关闭会导致windows下删除job后,缓冲文件不会删除`
`675`	`675`	`console.log("clear speed tid, status:", self.status);`
`676`	`676`	`clearInterval(self.speedTid);`
`677`	`677`	`self.speed = 0;`

`‎node/ossstore/lib/upload-job-util.js‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ function prepareChunks(filePath, checkPoints, fn) {`
`195`	`195`
`196`	`196`	`fs.stat(filePath, function (err, state) {`
`197`	`197`	`if (err) {`
`198`		`- // callback(err);`
	`198`	`+ console.error(err);`
`199`	`199`	`return;`
`200`	`200`	`}`
`201`	`201`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 470a5e3

File tree

6 files changed

6 files changed

`‎app/main/files/modals/grant-modal.js‎`

`‎app/main/files/transfer/downloads.js‎`

`‎node/ossstore/lib/download-job.js‎`

`‎node/ossstore/lib/upload-job-util.js‎`

0 commit comments