mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-07-02 01:22:07 -04:00
Ignore invalid harmonize mask layers (#1829)
This commit is contained in:
@@ -32,6 +32,7 @@
|
|||||||
* @returns {HTMLCanvasElement|null}
|
* @returns {HTMLCanvasElement|null}
|
||||||
*/
|
*/
|
||||||
export function layerUnionAlpha(w, h, layers) {
|
export function layerUnionAlpha(w, h, layers) {
|
||||||
|
if (!Array.isArray(layers)) return null;
|
||||||
const visible = layers.filter(l => l.visible);
|
const visible = layers.filter(l => l.visible);
|
||||||
if (visible.length < 2) return null;
|
if (visible.length < 2) return null;
|
||||||
const bgId = visible[0].id;
|
const bgId = visible[0].id;
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
"""Pin harmonize mask helpers against invalid layer lists.
|
||||||
|
|
||||||
|
Driven through `node --input-type=module`; skips without node.
|
||||||
|
"""
|
||||||
|
import json
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
_REPO = Path(__file__).resolve().parent.parent
|
||||||
|
_HELPER = _REPO / "static" / "js" / "editor" / "harmonize-masks.js"
|
||||||
|
_HAS_NODE = shutil.which("node") is not None
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.skipif(not _HAS_NODE, reason="node binary not on PATH")
|
||||||
|
def test_layer_union_alpha_returns_null_for_non_array_layers():
|
||||||
|
js = f"""
|
||||||
|
import {{ layerUnionAlpha, seamMask, layerBodyMask }} from '{_HELPER.as_posix()}';
|
||||||
|
console.log(JSON.stringify([
|
||||||
|
layerUnionAlpha(10, 10, null),
|
||||||
|
seamMask(10, 10, {{"bad": true}}),
|
||||||
|
layerBodyMask(10, 10, "bad")
|
||||||
|
]));
|
||||||
|
"""
|
||||||
|
proc = subprocess.run(
|
||||||
|
["node", "--input-type=module"],
|
||||||
|
input=js, capture_output=True, text=True, cwd=str(_REPO), timeout=30,
|
||||||
|
)
|
||||||
|
assert proc.returncode == 0, proc.stderr
|
||||||
|
assert json.loads(proc.stdout.strip()) == [None, None, None]
|
||||||
Reference in New Issue
Block a user