From 46ed0fe992f5b3cf002fc12d20e1283417f2d76e Mon Sep 17 00:00:00 2001 From: Tzahi12345 Date: Mon, 7 Sep 2020 00:39:27 -0400 Subject: [PATCH 1/3] Fixed bug in import unregistered logic where files in subfolders could not be found --- backend/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/utils.js b/backend/utils.js index efedb3b..f815c6c 100644 --- a/backend/utils.js +++ b/backend/utils.js @@ -28,7 +28,7 @@ function getDownloadedFilesByType(basePath, type) { var located_files = recFindByExt(basePath, ext); for (let i = 0; i < located_files.length; i++) { let file = located_files[i]; - var file_path = path.basename(file); + var file_path = file.substring(basePath.length+1, file.length); var stats = fs.statSync(file); From 95e53b9549a76f3c9371f293dd81480713091e34 Mon Sep 17 00:00:00 2001 From: Tzahi12345 Date: Mon, 7 Sep 2020 16:06:25 -0400 Subject: [PATCH 2/3] Fixed bug where unix paths would improperly parsed while importing unregistered files --- backend/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/utils.js b/backend/utils.js index f815c6c..73156f3 100644 --- a/backend/utils.js +++ b/backend/utils.js @@ -28,7 +28,7 @@ function getDownloadedFilesByType(basePath, type) { var located_files = recFindByExt(basePath, ext); for (let i = 0; i < located_files.length; i++) { let file = located_files[i]; - var file_path = file.substring(basePath.length+1, file.length); + var file_path = file.substring(basePath.includes('\\') ? basePath.length+1 : basePath.length, file.length); var stats = fs.statSync(file); From 61daf26641741fa30c4080ae6513307fe18cb173 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Sep 2020 20:55:44 +0000 Subject: [PATCH 3/3] Bump node-fetch from 2.6.0 to 2.6.1 in /backend Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. - [Release notes](https://github.com/bitinn/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1) Signed-off-by: dependabot[bot] --- backend/package-lock.json | 6 +++--- backend/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 1e4f7ab..c969112 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1968,9 +1968,9 @@ "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, "node-fetch": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", - "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" }, "node-id3": { "version": "0.1.16", diff --git a/backend/package.json b/backend/package.json index b153a5d..91a1777 100644 --- a/backend/package.json +++ b/backend/package.json @@ -43,7 +43,7 @@ "md5": "^2.2.1", "merge-files": "^0.1.2", "multer": "^1.4.2", - "node-fetch": "^2.6.0", + "node-fetch": "^2.6.1", "node-id3": "^0.1.14", "nodemon": "^2.0.2", "passport": "^0.4.1",