Fixed issue #476

APTrust · Aug 9, 2021 · eb75c3f · eb75c3f
1 parent 95a861e
commit eb75c3f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/core/util.js b/core/util.js
@@ -609,6 +609,17 @@ class Util {
         return canWrite;
     }
 
+    /**
+     * Returns true if dirpath is a directory.
+     *
+     * @path {string} dirpath - The path to check
+     *
+     * @returns {boolean}
+     */
+    static isDirectory(dirpath) {
+        return fs.existsSync(dirpath) && fs.lstatSync(dirpath).isDirectory()
+    }
+
     /**
      * Returns true if dirpath is a non-empty directory.
      *

diff --git a/core/util.test.js b/core/util.test.js
@@ -334,6 +334,12 @@ test('Util.canWrite()', () => {
     expect(Util.canWrite(path.join(testDir, 'does-not-exist.txt'))).toBe(false);
 });
 
+test('Util.isDirectory()', () => {
+    expect(Util.isDirectory(__dirname)).toBe(true)
+    expect(Util.isDirectory(__dirname + 'zzzz8080')).toBe(false)
+    expect(Util.isDirectory('')).toBe(false)
+});
+
 test('Util.isNonEmptyDirectory()', () => {
     expect(Util.isNonEmptyDirectory(__dirname)).toBe(true)
     expect(Util.isNonEmptyDirectory(__dirname + 'zzzz8080')).toBe(false)

diff --git a/ui/controllers/job_files_controller.js b/ui/controllers/job_files_controller.js
@@ -332,7 +332,7 @@ class JobFilesController extends BaseController {
     findContainingItem(filepath) {
         if (Array.isArray(this.job.packageOp.sourceFiles)) {
             for (let item of this.job.packageOp.sourceFiles) {
-                if (filepath.startsWith(item)) {
+                if (item === filepath || (filepath.startsWith(item) && Util.isDirectory(item))) {
                     return item;
                 }
             }

diff --git a/ui/controllers/job_files_controller.test.js b/ui/controllers/job_files_controller.test.js
@@ -183,3 +183,19 @@ test('deleting a file removes it from the UI and job', done => {
         done();
     }, timeout);
 });
+
+// https://github.com/APTrust/dart/issues/476
+test('findContainingItem', () => {
+    let job = new Job()
+    job.packageOp = new PackageOperation('test', 'testy/test.tar')
+    job.packageOp.sourceFiles = [
+        __dirname,
+        "D:/Baby Jan",
+    ]
+    let controller = new JobFilesController(new URLSearchParams())
+    controller.job = job
+
+    expect(controller.findContainingItem(path.join(__dirname, "photos", "image1"))).not.toBeNull()
+    expect(controller.findContainingItem("D:/Baby Jan")).not.toBeNull()
+    expect(controller.findContainingItem("D:/Baby Jan and Grandpa")).toBeNull()
+});