Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-03-02 03:05:55 +01:00
Code Issues Projects Releases Wiki Activity

Fix phash match presentation (#2997)

Browse source
This commit is contained in:
WithoutPants 2022-10-12 11:06:32 +11:00 committed by GitHub
parent 99bbd157d6
commit 5e1948516d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
ui/v2.5/src/components/Tagger/scenes/StashSearchResult.tsx
View file

@ -95,7 +95,13 @@ function matchPhashes(
}
});
return matches;
// convert to tuple and sort by distance descending
const entries = Object.entries(matches);
entries.sort((a, b) => {
return a[1] - b[1];
});
return entries;
}
const getFingerprintStatus = (
@ -122,7 +128,7 @@ const getFingerprintStatus = (
const phashList = (
<div className="m-2">
{Object.entries(phashMatches).map((fp) => {
{phashMatches.map((fp: [string, number]) => {
const hash = fp[0];
const d = fp[1];
return (
@ -137,37 +143,43 @@ const getFingerprintStatus = (
if (checksumMatch || phashMatches.length > 0)
return (
<div className="font-weight-bold">
<SuccessIcon className="mr-2" />
{phashMatches.length > 0 ? (
<HoverPopover
placement="bottom"
content={phashList}
className="PHashPopover"
>
{phashMatches.length > 1 ? (
<FormattedMessage
id="component_tagger.results.phash_matches"
values={{
count: phashMatches.length,
}}
/>
) : (
<FormattedMessage
id="component_tagger.results.hash_matches"
values={{
hash_type: <FormattedMessage id="media_info.phash" />,
}}
/>
)}
</HoverPopover>
) : (
<FormattedMessage
id="component_tagger.results.hash_matches"
values={{
hash_type: <FormattedMessage id="media_info.checksum" />,
}}
/>
<div>
{phashMatches.length > 0 && (
<div className="font-weight-bold">
<SuccessIcon className="mr-2" />
<HoverPopover
placement="bottom"
content={phashList}
className="PHashPopover"
>
{phashMatches.length > 1 ? (
<FormattedMessage
id="component_tagger.results.phash_matches"
values={{
count: phashMatches.length,
}}
/>
) : (
<FormattedMessage
id="component_tagger.results.hash_matches"
values={{
hash_type: <FormattedMessage id="media_info.phash" />,
}}
/>
)}
</HoverPopover>
</div>
)}
{checksumMatch && (
<div className="font-weight-bold">
<SuccessIcon className="mr-2" />
<FormattedMessage
id="component_tagger.results.hash_matches"
values={{
hash_type: <FormattedMessage id="media_info.checksum" />,
}}
/>
</div>
)}
</div>
);