Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a bug that filter is not working when ximgdiff.enabled=false #58

Merged
merged 1 commit into from
Apr 28, 2024
Merged

Fix a bug that filter is not working when ximgdiff.enabled=false #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<body>
<div id="app"></div>
<script type="module">
console.log(import.meta.env.VITE_ENABLED_HUGE);
window['__reg__'] = {
type: 'danger',
hasNew: true,
Expand All @@ -42,10 +41,18 @@
hasFailed: true,
failedItems:
import.meta.env.VITE_ENABLED_HUGE === 'true'
? [...new Uint8Array(1000)].map((_, i) => ({
raw: 'sample.png?' + i,
encoded: 'sample.png?' + i,
}))
? [
...Array.from({ length: 1000 }).map((_, i) => ({
raw: 'sample.png?' + i,
encoded: 'sample.png?' + i,
})),
{ raw: 'nest/sample.png?3', encoded: 'nest/sample.png?3' },
{ raw: 'nest/sample.png?4', encoded: 'nest/sample.png?4' },
{
raw: 'nest/deep/sample.png?5',
encoded: 'nest/deep/sample.png?5',
},
]
: [
{ raw: 'sample.png?1', encoded: 'sample.png?1' },
{ raw: 'sample.png?2', encoded: 'sample.png?2' },
Expand Down
17 changes: 11 additions & 6 deletions src/states/entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,20 @@ export const initializeEntityState = (
deleted: toEntities('deleted', dirs, data.deletedItems),
});

const defaultEntity = store.get(defaultEntityAtom);

store.set(entityAtom, {
...defaultEntity,
...store.get(defaultEntityAtom),
});

worker.requestFilterInit({
newItems: defaultEntity.new,
passedItems: defaultEntity.passed,
failedItems: defaultEntity.failed,
deletedItems: defaultEntity.deleted,
});

worker.subscribe(WorkerEventType.RESULT_FILTER, (payload) => {
store.set(entityAtom, {
new: payload.newItems,
Expand All @@ -83,7 +93,6 @@ export const useEntities = () => {
export const useEntityFilter = () => {
const worker = useWorkerClient();
const [isFiltered, setIsFiltered] = useAtom(filteredAtom);
const defaults = useAtomValue(defaultEntityAtom);

const filter = useCallback(
(input: string) => {
Expand All @@ -97,13 +106,9 @@ export const useEntityFilter = () => {

worker.requestFilter({
input: value,
newItems: defaults.new,
passedItems: defaults.passed,
failedItems: defaults.failed,
deletedItems: defaults.deleted,
});
},
[worker, setIsFiltered, defaults],
[worker, setIsFiltered],
);

return [isFiltered, filter] as const;
Expand Down
5 changes: 4 additions & 1 deletion src/types/event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export enum WorkerEventType {
RESULT_CALC = 'res_calc',

// filter
INIT_FILTER = 'init_filter',
REQUEST_FILTER = 'req_filter',
RESULT_FILTER = 'res_filter',
}
Expand All @@ -32,11 +33,13 @@ export type WorkerEventDataPayloadMap = {
result: Matching;
};

[WorkerEventType.REQUEST_FILTER]: {
[WorkerEventType.INIT_FILTER]: {
newItems: RegEntity[];
passedItems: RegEntity[];
failedItems: RegEntity[];
deletedItems: RegEntity[];
};
[WorkerEventType.REQUEST_FILTER]: {
input: string;
};
[WorkerEventType.RESULT_FILTER]: {
Expand Down
22 changes: 18 additions & 4 deletions src/worker-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,18 @@ export class WorkerClient {
private _cache: {
[key: string]: WorkerEventDataPayload<WorkerEventType.RESULT_CALC>;
} = {};
private _ximgdiffEnabled = false;
private _seq = 0;
private _emitter = mitt<WorkerEventDataPayloadMap>();
private _worker: Worker | null = null;

public start(config: XIMGDiffConfig) {
const { enabled, workerUrl } = config;
if (!enabled || !workerUrl) {
if (!config.workerUrl) {
return;
}

this._worker = new Worker(workerUrl, {});
this._ximgdiffEnabled = config.enabled;
this._worker = new Worker(config.workerUrl, {});

this._worker.addEventListener('message', ({ data }: WorkerEvent) => {
switch (data.type) {
Expand All @@ -74,7 +75,7 @@ export class WorkerClient {
'raw' | 'actualSrc' | 'expectedSrc'
>,
) {
if (this._worker == null) {
if (!this._ximgdiffEnabled || this._worker == null) {
return 0;
}

Expand Down Expand Up @@ -113,6 +114,19 @@ export class WorkerClient {
return seq;
}

public requestFilterInit(
payload: WorkerEventDataPayload<WorkerEventType.INIT_FILTER>,
) {
if (this._worker == null) {
return;
}

this._worker.postMessage({
type: WorkerEventType.INIT_FILTER,
payload,
});
}

public requestFilter = debounce(
(payload: WorkerEventDataPayload<WorkerEventType.REQUEST_FILTER>) => {
if (this._worker == null) {
Expand Down
36 changes: 30 additions & 6 deletions src/worker-main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@ function version2number(version: string) {
let loaded = false;
let lastCalcData: WorkerEventData<WorkerEventType.REQUEST_CALC> | null = null;

const cachedEntity: {
new: RegEntity[];
passed: RegEntity[];
failed: RegEntity[];
deleted: RegEntity[];
} = {
new: [],
passed: [],
failed: [],
deleted: [],
};

const calc = ({
payload: { raw, img1, img2, actualSrc, expectedSrc, seq },
}: WorkerEventData<WorkerEventType.REQUEST_CALC>) => {
Expand All @@ -51,13 +63,18 @@ const calc = ({
};

const filter = ({
payload: { input, newItems, passedItems, failedItems, deletedItems },
payload: { input },
}: WorkerEventData<WorkerEventType.REQUEST_FILTER>) => {
// Return all items when empty input
if (!input) {
return _self.postMessage({
type: WorkerEventType.RESULT_FILTER,
payload: { newItems, passedItems, failedItems, deletedItems },
payload: {
newItems: cachedEntity.new,
passedItems: cachedEntity.passed,
failedItems: cachedEntity.failed,
deletedItems: cachedEntity.deleted,
},
});
}

Expand All @@ -74,10 +91,10 @@ const filter = ({
_self.postMessage({
type: WorkerEventType.RESULT_FILTER,
payload: {
newItems: search(newItems),
passedItems: search(passedItems),
failedItems: search(failedItems),
deletedItems: search(deletedItems),
newItems: search(cachedEntity.new),
passedItems: search(cachedEntity.passed),
failedItems: search(cachedEntity.failed),
deletedItems: search(cachedEntity.deleted),
},
});
};
Expand Down Expand Up @@ -106,6 +123,13 @@ _self.addEventListener('message', ({ data }: WorkerEvent) => {
}
break;

case WorkerEventType.INIT_FILTER:
cachedEntity.new = data.payload.newItems;
cachedEntity.passed = data.payload.passedItems;
cachedEntity.failed = data.payload.failedItems;
cachedEntity.deleted = data.payload.deletedItems;
break;

case WorkerEventType.REQUEST_FILTER:
filter(data);
break;
Expand Down