diff --git a/source/app/metrics/utils.mjs b/source/app/metrics/utils.mjs index d9aeb19c..f7ad3a6e 100644 --- a/source/app/metrics/utils.mjs +++ b/source/app/metrics/utils.mjs @@ -171,38 +171,12 @@ export async function chartist() { } /**Language analyzer (single file) */ -export async function language({filename, patch, prefix = "", timeout = 20 * 1000}) { - const path = paths.join(os.tmpdir(), `${prefix}-${Math.random()}`.replace(/[^\w-]/g, "")) - return new Promise(async (solve, reject) => { - setTimeout(() => { - console.debug(`metrics/language > ${filename} > timeout`) - reject("timeout") - }, timeout) - try { - //Create temp dir - console.debug(`metrics/language > ${filename} > creating temp dir at ${path}`) - await fs.mkdir(path, {recursive:true}) - - //Create file and remove diff syntax - await fs.writeFile(paths.join(path, paths.basename(filename)), patch.replace(/^@@ -\d+,\d+ \+\d+,\d+ @@/gm, "").replace(/^[+-]/gm, "")) - - //Call linguist - console.debug(`metrics/language > ${filename} > calling linguist`) - const {languages:{results}} = await linguist(path) - const result = (Object.keys(results).shift() ?? "unknown").toLocaleLowerCase() - console.debug(`metrics/language > ${filename} > result: ${result}`) - solve(result) - } - catch (error) { - console.debug(`metrics/language > ${filename} > ${error}`) - reject(error) - } - finally { - //Clean temp dir - console.debug(`metrics/language > ${filename} > cleaning temp dir at ${path}`) - fs.rm(path, {recursive:true, force:true}).catch(error => console.debug(`metrics/language > ${filename} > failed to clean temp dir at ${path} > ${error}`)) - } - }) +export async function language({filename, patch}) { + console.debug(`metrics/language > ${filename}`) + const {languages:{results}} = await linguist(filename, {fileContent:patch}) + const result = (Object.keys(results).shift() ?? "unknown").toLocaleLowerCase() + console.debug(`metrics/language > ${filename} > result: ${result}`) + return result } /**Run command (use this to execute commands and process whole output at once, may not be suitable for large outputs) */