rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

add slash command progress indicator

Browse Source
This commit is contained in:
LenAnderson
2024-04-27 11:12:30 -04:00
parent b8504735fa
commit 5cc3a2cede
5 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/scripts/slash-commands/SlashCommandClosure.js
View File

@ -15,6 +15,7 @@ export class SlashCommandClosure {
/**@type {SlashCommandExecutor[]}*/ executorList = [];
/**@type {string}*/ keptText;
/**@type {AbortController}*/ abortController;
/**@type {(done:number, total:number)=>void}*/ onProgress;
constructor(parent) {
this.scope = new SlashCommandScope(parent);
@ -79,6 +80,7 @@ export class SlashCommandClosure {
closure.executorList = this.executorList;
closure.keptText = this.keptText;
closure.abortController = this.abortController;
closure.onProgress = this.onProgress;
return closure;
}
@ -142,7 +144,10 @@ export class SlashCommandClosure {
this.scope.setVariable(key, v);
}
let done = 0;
for (const executor of this.executorList) {
done += 0.5;
this.onProgress?.(done, this.executorList.length);
if (executor instanceof SlashCommandClosureExecutor) {
const closure = this.scope.getVariable(executor.name);
if (!closure || !(closure instanceof SlashCommandClosure)) throw new Error(`${executor.name} is not a closure.`);
@ -233,6 +238,8 @@ export class SlashCommandClosure {
return abortResult;
}
this.scope.pipe = await executor.command.callback(args, value ?? '');
done += 0.5;
this.onProgress?.(done, this.executorList.length);
// eslint-disable-next-line no-cond-assign
if (abortResult = this.testAbortController()) {
return abortResult;