Pre Merge pull request !227 from Madi/3.x

This commit is contained in:
Madi 2024-04-29 01:37:49 +00:00 committed by Gitee
commit cc0cc6f1cd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 12 additions and 6 deletions

View File

@ -201,9 +201,15 @@ export class ImageKnifeDispatcher {
} }
dispatchNextJob() { dispatchNextJob() {
let request = this.jobQueue.pop() while (true) {
if (request !== undefined) { let request = this.jobQueue.pop()
this.executeJob(request) if (request === undefined){
break// 队列已无任务
}
else if (request.requestState === ImageKnifeRequestState.PROGRESS) {
this.executeJob(request)
break
}
} }
} }

View File

@ -204,10 +204,10 @@ export class FileCache {
break break
} }
let delkey = this.lruCache.keys()[0] let delkey = this.lruCache.keys()[0]
let data: ArrayBuffer | undefined = FileUtils.getInstance().readFileSync(this.path + delkey) let remove: number | undefined = this.lruCache.remove(this.lruCache.keys()[0])
if (data !== undefined) { if (remove !== undefined) {
FileUtils.getInstance().deleteFile(this.path + delkey) FileUtils.getInstance().deleteFile(this.path + delkey)
this.removeMemorySize(data) this.removeMemorySize(remove)
} }
this.lruCache.remove(delkey) this.lruCache.remove(delkey)
} }