feature(fileop) read: persistent

cloudcmd · Sep 25, 2020 · d884109 · d884109
1 parent da96704
commit d884109
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/server/listen.js b/server/listen.js
@@ -7,7 +7,7 @@ const fullstore = require('fullstore');
 const operate = require('./operate');
 const extract = require('./extract');
 const pack = currify(require('./pack'));
-const reader = require('./reader');
+const read = require('./read');
 const getValue = require('./get-value');
 
 const connectionWraped = wraptile(connection);
@@ -68,7 +68,7 @@ function getOperation(name) {
         return extract;
 
     if (name === 'read')
-        return reader;
+        return read;
 
     if (name === 'copy')
         return operate('copy');

diff --git a/server/reader.js → server/read.js b/server/reader.js → server/read.js
@@ -32,18 +32,16 @@ async function readDirectory(id, socket, path) {
 
 async function watchDirectory(id, socket, path) {
     const watcher = watch(path, {
-        //persistent: false
+        persistent: false
     });
 
     watcher.on('all', async () => {
-        const [error] = await tryToCatch(readDirectory, id, socket, path);
+        const [error, info] = await tryToCatch(readDirectory, id, socket, path);
 
         if (error)
             return socket.emit(`${id}#error`, error.message);
-    });
 
-    watcher.on('error', (error) => {
-        socket.emit(`${id}#error`, error.message);
+        socket.emit(`${id}#directory`, info);
     });
 }
 
diff --git a/test/lib/clear.js b/test/lib/clear.js
@@ -9,6 +9,7 @@ module.exports = () => {
     clear('../../server/operate');
     clear('../../server/pack');
     clear('../../server/extract');
+    clear('../../server/read');
     clear('../../server/is-root-win32');
 };
 
diff --git a/test/server/read.js b/test/server/read.js
@@ -93,7 +93,13 @@ test('operate: read: chokidar', async (t) => {
 
     done();
 
-    t.ok(watch.calledWith(path));
+    const expected = [
+        path, {
+            persistent: false,
+        },
+    ];
+
+    t.ok(watch.calledWith(...expected));
     t.end();
 });
 
@@ -135,7 +141,13 @@ test('operate: read change: directory', async (t) => {
 
     done();
 
-    t.ok(watch.calledWith('/root'));
+    const expected = [
+        '/root', {
+            persistent: false,
+        },
+    ];
+
+    t.ok(watch.calledWith(...expected));
     t.end();
 });