Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 38 additions & 16 deletions src/lib/PiscinaUtils/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,43 +56,66 @@ const piscina = new Piscina({
* Method which sends task to a worker thread (circuit)
* @param pubANodes
* @param pubBNodes
* @param piscinaInstance
*/
async function compareNodesInBackground(pubANodes: number[], pubBNodes: number[]): Promise<number> {
return piscina.run({ pubANodes, pubBNodes }, {name: 'compareNodes'});
export async function compareNodesInBackground(
pubANodes: number[],
pubBNodes: number[],
piscinaInstance: Piscina = piscina
): Promise<number> {
return piscinaInstance.run({ pubANodes, pubBNodes }, {name: 'compareNodes'});
}

/**
* Method which sends task to a worker thread (meta)
* @param pubAMeta
* @param pubBMeta
* @param piscinaInstance
*/
async function compareMetaInBackground(pubAMeta: PublicationMeta, pubBMeta: PublicationMeta): Promise<ResultMeta> {
return piscina.run({ pubA: pubAMeta, pubB: pubBMeta }, {name: 'compareMeta'});
export async function compareMetaInBackground(
pubAMeta: PublicationMeta,
pubBMeta: PublicationMeta,
piscinaInstance: Piscina = piscina
): Promise<ResultMeta> {
return piscinaInstance.run({ pubA: pubAMeta, pubB: pubBMeta }, {name: 'compareMeta'});
}

/**
* Method which sends task to a worker thread (files)
* @param pubAFiles
* @param pubBFiles
* @param piscinaInstance
*/
async function compareFilesInBackground(pubAFiles: PrismaFile[], pubBFiles: PrismaFile[]): Promise<ResultFile> {
return piscina.run({ pubAFiles, pubBFiles }, {name: 'compareFiles'});
export async function compareFilesInBackground(
pubAFiles: PrismaFile[],
pubBFiles: PrismaFile[],
piscinaInstance: Piscina = piscina
): Promise<ResultFile> {
return piscinaInstance.run({ pubAFiles, pubBFiles }, {name: 'compareFiles'});
}

/**
* Method which sends task to a worker thread (complete initial parsing of uploaded/edited publication)
* @param pubFiles
* @param piscinaInstance
*/
async function initialMaterialFileParseInBackground(pubFiles: PrismaFile[]): Promise<FileTokenInfo> {
return piscina.run({ pubFiles }, {name: 'initialParse'});
export async function initialMaterialFileParseInBackground(
pubFiles: PrismaFile[],
piscinaInstance: Piscina = piscina
): Promise<FileTokenInfo> {
return piscinaInstance.run({ pubFiles }, {name: 'initialParse'});
}

export async function enqueueMaterialComparison(publicationId: number, materialId: number): Promise<void> {
export async function enqueueMaterialComparison(
publicationId: number,
materialId: number,
piscinaInstance: Piscina = piscina
): Promise<void> {
try{
const currentFiles: PrismaFile[] = await getFilesForMaterial(materialId)

// INITIALLY PARSE CURRENT PUBLICATION FILES IN ORDER TO REUSE TOKENS LATER ON
const initialParsing = await initialMaterialFileParseInBackground(currentFiles);
const initialParsing = await initialMaterialFileParseInBackground(currentFiles, piscinaInstance);

await handleFileTokens(initialParsing)

Expand Down Expand Up @@ -127,8 +150,8 @@ export async function enqueueMaterialComparison(publicationId: number, materialI
comparisons.push({
fromPubId: publicationId,
toPubId: materials[i].publicationId,
similarityFile: compareFilesInBackground(currentMaterial.files, materials[i].files),
similarityMeta: compareMetaInBackground(pubAMeta, pubBMeta)
similarityFile: compareFilesInBackground(currentMaterial.files, materials[i].files, piscinaInstance),
similarityMeta: compareMetaInBackground(pubAMeta, pubBMeta, piscinaInstance)
});
}
}
Expand Down Expand Up @@ -169,7 +192,7 @@ export async function enqueueMaterialComparison(publicationId: number, materialI
}
}

export async function enqueueCircuitComparison(publicationId: number): Promise<void> {
export async function enqueueCircuitComparison(publicationId: number, piscinaInstance: Piscina = piscina): Promise<void> {
try{
const circuits = await getAllCircuits([], [], 0, '', '', true);
const currentCircuit = await getCircuitByPublicationId(publicationId)
Expand All @@ -188,7 +211,6 @@ export async function enqueueCircuitComparison(publicationId: number): Promise<v

for (let i = 0; i < circuits.length; i++) {
if (circuits[i].publicationId !== publicationId) {

const pubBMeta: PublicationMeta = {
title: circuits[i].publication.title,
description: circuits[i].publication.description,
Expand All @@ -203,8 +225,8 @@ export async function enqueueCircuitComparison(publicationId: number): Promise<v
fromPubId: publicationId,
toPubId: circuits[i].publicationId,
similarityNode: compareNodesInBackground(currentCircuit!.nodes.map(n => n.publicationId),
circuits[i].nodes.map(n => n.publicationId)),
similarityMeta: compareMetaInBackground(pubAMeta, pubBMeta)
circuits[i].nodes.map(n => n.publicationId), piscinaInstance),
similarityMeta: compareMetaInBackground(pubAMeta, pubBMeta, piscinaInstance)
});
}
}
Expand Down
201 changes: 0 additions & 201 deletions src/lib/components/Filter.svelte

This file was deleted.

64 changes: 0 additions & 64 deletions src/lib/components/FilterButton.svelte

This file was deleted.

Loading