allow use extra translation file

This commit is contained in:
sgmklp
2022-10-16 13:43:03 +08:00
parent 854b1952db
commit b858370acf
2 changed files with 28 additions and 12 deletions

View File

@@ -98,8 +98,8 @@ function readFile(filePath) {
return request.responseText;
}
function loadCSV() {
let text = readFile(`file/tags/${acConfig.tagFile}`);
function loadCSV(path) {
let text = readFile(path);
return parseCSV(text);
}
@@ -306,7 +306,7 @@ function addResultsToList(textArea, results, tagword) {
//suppost only show the translation to result
if (result[2]) {
li.textContent = result[2];
if (!acConfig.onlyShowTranslation) {
if (!acConfig.translation.onlyShowTranslation) {
li.textContent += " >> " + result[0];
}
} else {
@@ -420,11 +420,11 @@ function autocomplete(textArea, prompt, fixedTag = null) {
genericResults = allTags.filter(x => x[0].toLowerCase().includes(tagword)).slice(0, acConfig.maxResults);
results = genericResults.concat(tempResults.map(x => ["Embeddings: " + x.trim(), "embedding"])); // Mark as embedding
} else {
if (acConfig.searchByTranslation) {
if (acConfig.translation.searchByTranslation) {
results = allTags.filter(x => x[2] && x[2].toLowerCase().includes(tagword)); // check have translation
// if search by [a~z],first list the translations, and then search English if it is not enough
// if only show translation,it is unnecessary to list English results
if (results.length < acConfig.maxResults && !acConfig.onlyShowTranslation) {
if (results.length < acConfig.maxResults && !acConfig.translation.onlyShowTranslation) {
allTags.filter(x => x[0].toLowerCase().includes(tagword) && !results.includes(x)).map(x => results.push(x));
}
results = results.slice(0, acConfig.maxResults);
@@ -498,22 +498,35 @@ onUiUpdate(function () {
if (acConfig === null) {
try {
acConfig = JSON.parse(readFile("file/tags/config.json"));
if (acConfig.onlyShowTranslation) {
acConfig.searchByTranslation = true; // if only show translation, enable search by translation is necessary
if (acConfig.translation.onlyShowTranslation) {
acConfig.translation.searchByTranslation = true; // if only show translation, enable search by translation is necessary
}
} catch (e) {
console.error("Error loading config.json: " + e);
return;
}
}
// Load main tags
// Load main tags and translations
if (allTags.length === 0) {
try {
allTags = loadCSV();
allTags = loadCSV(`file/tags/${acConfig.tagFile}`);
} catch (e) {
console.error("Error loading tags file: " + e);
return;
}
if (acConfig.translation.extraTranslationFile) {
try {
allTranslations = loadCSV(`file/tags/${acConfig.translation.extraTranslationFile}`);
for (let i = 0; i < allTranslations.length; i++) {
if (allTranslations[i][0]) {
allTags[i][2] = allTranslations[i][0];
}
}
} catch (e) {
console.error("Error loading extra translation file: " + e);
return;
}
}
}
// Load wildcards
if (wildcardFiles.length === 0 && acConfig.useWildcards) {

View File

@@ -5,13 +5,16 @@
"img2img": true,
"negativePrompts": true
},
"maxResults": 5,
"maxResults": 8,
"replaceUnderscores": true,
"escapeParentheses": true,
"useWildcards": true,
"useEmbeddings": true,
"onlyShowTranslation": false,
"searchByTranslation": true,
"translation": {
"searchByTranslation": true,
"onlyShowTranslation": false,
"extraTranslationFile": ""
},
"colors": {
"danbooru": {
"0": ["lightblue", "dodgerblue"],