scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0d2df6db95 into 376f687c38

Browse Source
This commit is contained in:
Eva
2025-04-04 09:31:49 +00:00
committed by GitHub
parent 376f687c38 0d2df6db95
commit edc39656a1
16 changed files with 108 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/css/core-forms.styl
View File

@ -369,6 +369,7 @@ input[type=file]:focus+.file-dropper,
a
display: block
padding: 0.1em 0.5em
transition: none
&.active a, a:hover
background: $button-enabled-background-color
color: $button-enabled-text-color

3
client/js/controllers/pool_list_controller.js
View File

@ -104,7 +104,8 @@ class PoolListController {
this._ctx.parameters.query,
offset,
limit,
fields
fields,
{}
);
},
pageRenderer: (pageCtx) => {

3
client/js/controllers/tag_list_controller.js
View File

@ -78,7 +78,8 @@ class TagListController {
this._ctx.parameters.query,
offset,
limit,
fields
fields,
{}
);
},
pageRenderer: (pageCtx) => {

18
client/js/controls/auto_complete_control.js
View File

@ -70,11 +70,18 @@ class AutoCompleteControl {
prefix = this._sourceInputNode.value.substring(0, index + 1);
middle = this._sourceInputNode.value.substring(index + 1);
}
suffix = spaceIndex < commaIndex ? suffix.replace(/^[^,]+/, "") : suffix.replace(/^\S+/, "");
suffix = suffix.trimLeft();
this._sourceInputNode.value =
prefix + result.toString() + delimiter + suffix.trimLeft();
prefix + result.toString() + delimiter + suffix;
if (!addSpace) {
this._sourceInputNode.value = this._sourceInputNode.value.trim();
this._sourceInputNode.value = this._sourceInputNode.value.trimLeft();
}
const selection = this._sourceInputNode.value.length - suffix.length;
if (!addSpace) {
this._sourceInputNode.value = this._sourceInputNode.value.trimRight();
}
this._sourceInputNode.setSelectionRange(selection, selection);
this._sourceInputNode.focus();
}
@ -228,6 +235,13 @@ class AutoCompleteControl {
}
_updateResults(textToFind) {
if (this._options.isNegationAllowed && textToFind === "-") {
this._results = [];
this._activeResult = -1;
this._refreshList();
return;
}
this._options.getMatches(textToFind).then((matches) => {
const oldResults = this._results.slice();
this._results = matches.slice(0, this._options.maxResults);

26
client/js/controls/pool_auto_complete_control.js
View File

@ -4,18 +4,19 @@ const misc = require("../util/misc.js");
const PoolList = require("../models/pool_list.js");
const AutoCompleteControl = require("./auto_complete_control.js");
function _poolListToMatches(pools, options) {
function _poolListToMatches(text, pools, options) {
return [...pools]
.sort((pool1, pool2) => {
return pool2.postCount - pool1.postCount;
})
.map((pool) => {
pool.matchingNames = misc.matchingNames(text, pool.names);
let cssName = misc.makeCssName(pool.category, "pool");
const caption =
'<span class="' +
cssName +
'">' +
misc.escapeHtml(pool.names[0] + " (" + pool.postCount + ")") +
misc.escapeHtml(pool.matchingNames[0] + " (" + pool.postCount + ")") +
"</span>";
return {
caption: caption,
@ -31,9 +32,9 @@ class PoolAutoCompleteControl extends AutoCompleteControl {
options.getMatches = (text) => {
const term = misc.escapeSearchTerm(text);
const query =
(text.length < minLengthForPartialSearch
? term + "*"
: "*" + term + "*") + " sort:post-count";
(text.length >= minLengthForPartialSearch
? "*" + term + "*"
: term + "*") + " sort:post-count";
return new Promise((resolve, reject) => {
PoolList.search(query, 0, this._options.maxResults, [
@ -42,10 +43,11 @@ class PoolAutoCompleteControl extends AutoCompleteControl {
"category",
"postCount",
"version",
]).then(
],
{ noProgress: true }).then(
(response) =>
resolve(
_poolListToMatches(response.results, this._options)
_poolListToMatches(text, response.results, this._options)
),
reject
);
@ -54,6 +56,16 @@ class PoolAutoCompleteControl extends AutoCompleteControl {
super(input, options);
}
_getActiveSuggestion() {
if (this._activeResult === -1) {
return null;
}
const result = this._results[this._activeResult].value;
const textToFind = this._options.getTextToFind();
result.matchingNames = misc.matchingNames(textToFind, result.names);
return result;
}
}
module.exports = PoolAutoCompleteControl;

40
client/js/controls/tag_auto_complete_control.js
View File

@ -5,21 +5,26 @@ const views = require("../util/views.js");
const TagList = require("../models/tag_list.js");
const AutoCompleteControl = require("./auto_complete_control.js");
function _tagListToMatches(tags, options) {
function _tagListToMatches(text, tags, options, negated) {
return [...tags]
.sort((tag1, tag2) => {
return tag2.usages - tag1.usages;
})
.map((tag) => {
tag.matchingNames = misc.matchingNames(text, tag.names);
let cssName = misc.makeCssName(tag.category, "tag");
if (options.isTaggedWith(tag.names[0])) {
cssName += " disabled";
}
if (negated) {
tag.names = tag.names.map((tagName) => "-"+tagName);
tag.matchingNames = tag.matchingNames.map((tagName) => "-"+tagName);
}
const caption =
'<span class="' +
cssName +
'">' +
misc.escapeHtml(tag.names[0] + " (" + tag.postCount + ")") +
misc.escapeHtml(tag.matchingNames[0] + " (" + tag.postCount + ")") +
"</span>";
return {
caption: caption,
@ -35,26 +40,37 @@ class TagAutoCompleteControl extends AutoCompleteControl {
options = Object.assign(
{
isTaggedWith: (tag) => false,
isNegationAllowed: false,
},
options
);
options.getMatches = (text) => {
const negated = options.isNegationAllowed && text[0] === "-";
if (negated) text = text.substring(1);
if (!text) {
return new Promise((resolve, reject) => {
(response) => resolve(null),
reject
});
}
const term = misc.escapeSearchTerm(text);
const query =
(text.length < minLengthForPartialSearch
? term + "*"
: "*" + term + "*") + " sort:usages";
(text.length >= minLengthForPartialSearch || (!options.isNegationAllowed && text[0] === "-")
? "*" + term + "*"
: term + "*") + " sort:usages";
return new Promise((resolve, reject) => {
TagList.search(query, 0, this._options.maxResults, [
"names",
"category",
"usages",
]).then(
],
{ noProgress: true }).then(
(response) =>
resolve(
_tagListToMatches(response.results, this._options)
_tagListToMatches(text, response.results, this._options, negated)
),
reject
);
@ -63,6 +79,16 @@ class TagAutoCompleteControl extends AutoCompleteControl {
super(input, options);
}
_getActiveSuggestion() {
if (this._activeResult === -1) {
return null;
}
const result = this._results[this._activeResult].value;
const textToFind = this._options.getTextToFind();
result.matchingNames = misc.matchingNames(textToFind, result.names);
return result;
}
}
module.exports = TagAutoCompleteControl;

1
client/js/controls/tag_input_control.js
View File

@ -114,6 +114,7 @@ class TagInputControl extends events.EventTarget {
},
verticalShift: -2,
isTaggedWith: (tagName) => this.tags.isTaggedWith(tagName),
isNegationAllowed: false,
}
);

5
client/js/models/pool_list.js
View File

@ -6,7 +6,7 @@ const AbstractList = require("./abstract_list.js");
const Pool = require("./pool.js");
class PoolList extends AbstractList {
static search(text, offset, limit, fields) {
static search(text, offset, limit, fields, options) {
return api
.get(
uri.formatApiLink("pools", {
@ -14,7 +14,8 @@ class PoolList extends AbstractList {
offset: offset,
limit: limit,
fields: fields.join(","),
})
}),
options
)
.then((response) => {
return Promise.resolve(

5
client/js/models/tag_list.js
View File

@ -6,7 +6,7 @@ const AbstractList = require("./abstract_list.js");
const Tag = require("./tag.js");
class TagList extends AbstractList {
static search(text, offset, limit, fields) {
static search(text, offset, limit, fields, options) {
return api
.get(
uri.formatApiLink("tags", {
@ -14,7 +14,8 @@ class TagList extends AbstractList {
offset: offset,
limit: limit,
fields: fields.join(","),
})
}),
options
)
.then((response) => {
return Promise.resolve(

20
client/js/util/misc.js
View File

@ -211,6 +211,24 @@ function getPrettyName(tag) {
return tag;
}
function wildcardMatch(pattern, str, sensitive = false) {
let w = pattern.replace(/[.+^${}()|[\]\\?]/g, "\\$&");
const re = new RegExp(`^${w.replace(/\(--wildcard--\)|\*/g, ".*")}$`, sensitive ? "" : "i");
return re.test(str);
}
function matchingNames(text, names) {
const minLengthForPartialSearch = 3;
let matches = names.filter((name) => wildcardMatch(text + "*", name, false));
if (!matches.length && text.length >= minLengthForPartialSearch) {
matches = names.filter((name) => wildcardMatch("*" + text + "*", name, false));
}
matches = matches.length ? matches : names;
return matches;
}
module.exports = {
range: range,
formatRelativeTime: formatRelativeTime,
@ -229,4 +247,6 @@ module.exports = {
escapeSearchTerm: escapeSearchTerm,
dataURItoBlob: dataURItoBlob,
getPrettyName: getPrettyName,
wildcardMatch: wildcardMatch,
matchingNames: matchingNames,
};

3
client/js/views/home_view.js
View File

@ -27,9 +27,10 @@ class HomeView {
{
confirm: (tag) =>
this._autoCompleteControl.replaceSelectedText(
misc.escapeSearchTerm(tag.names[0]),
misc.escapeSearchTerm(tag.matchingNames[0]),
true
),
isNegationAllowed: true,
}
);
this._formNode.addEventListener("submit", (e) =>

2
client/js/views/pool_merge_view.js
View File

@ -25,7 +25,7 @@ class PoolMergeView extends events.EventTarget {
confirm: (pool) => {
this._targetPoolId = pool.id;
this._autoCompleteControl.replaceSelectedText(
pool.names[0],
pool.matchingNames[0],
false
);
},

2
client/js/views/pools_header_view.js
View File

@ -21,7 +21,7 @@ class PoolsHeaderView extends events.EventTarget {
{
confirm: (pool) =>
this._autoCompleteControl.replaceSelectedText(
misc.escapeSearchTerm(pool.names[0]),
misc.escapeSearchTerm(pool.matchingNames[0]),
true
),
}

3
client/js/views/posts_header_view.js
View File

@ -183,9 +183,10 @@ class PostsHeaderView extends events.EventTarget {
{
confirm: (tag) =>
this._autoCompleteControl.replaceSelectedText(
misc.escapeSearchTerm(tag.names[0]),
misc.escapeSearchTerm(tag.matchingNames[0]),
true
),
isNegationAllowed: true,
}
);

2
client/js/views/tag_merge_view.js
View File

@ -23,7 +23,7 @@ class TagMergeView extends events.EventTarget {
{
confirm: (tag) =>
this._autoCompleteControl.replaceSelectedText(
tag.names[0],
tag.matchingNames[0],
false
),
}

2
client/js/views/tags_header_view.js
View File

@ -21,7 +21,7 @@ class TagsHeaderView extends events.EventTarget {
{
confirm: (tag) =>
this._autoCompleteControl.replaceSelectedText(
misc.escapeSearchTerm(tag.names[0]),
misc.escapeSearchTerm(tag.matchingNames[0]),
true
),
}