filefive 1.3.0 → 1.4.0

package/dist/queues/Copy.js

@@ -8,8 +8,8 @@ const Queue_1 = __importDefault(require("./Queue"));
 const types_1 = require("../types");
 const URI_1 = require("../utils/URI");
 class CopyQueue extends Queue_1.default {
-    constructor(connId, src, dest, filter, onState, onConflict, onError, onComplete, watcher, move) {
-        super(connId, connId, src, dest, filter, onState, onConflict, onComplete);
+    constructor(connId, src, dest, filter, fromRoot, onState, onConflict, onError, onComplete, watcher, move) {
+        super(connId, connId, src, dest, filter, fromRoot, onState, onConflict, onComplete);
         this.onError = onError;
         this.watcher = watcher;
         this.move = move;

package/dist/queues/Download.js

@@ -8,8 +8,8 @@ const Queue_1 = __importDefault(require("./Queue"));
 const types_1 = require("../types");
 const Local_1 = require("../Local");
 class DownloadQueue extends Queue_1.default {
-    constructor(connId, src, dest, filter, onState, onConflict, onError, onComplete) {
-        super(connId, types_1.LocalFileSystemID, src, dest, filter, onState, onConflict, onComplete);
+    constructor(connId, src, dest, filter, fromRoot, onState, onConflict, onError, onComplete) {
+        super(connId, types_1.LocalFileSystemID, src, dest, filter, fromRoot, onState, onConflict, onComplete);
         this.onError = onError;
     }
     async transmit(fs, from, dirs, to) {

package/dist/queues/Duplicate.js

@@ -7,7 +7,7 @@ const Copy_1 = __importDefault(require("./Copy"));
 const types_1 = require("../types");
 class DuplicateQueue extends Copy_1.default {
     constructor(connId, src, dest, filter, onState, onConflict, onError, onComplete, watcher) {
-        super(connId, src, dest, filter, onState, onConflict, onError, onComplete, watcher, false);
+        super(connId, src, dest, filter, null, onState, onConflict, onError, onComplete, watcher, false);
         this.newNames = new Map();
         this.resolve({ type: types_1.QueueActionType.Rename }, true);
     }

package/dist/queues/Queue.js

@@ -30,12 +30,13 @@ const lsRemote = (connId) => {
 };
 exports.lsRemote = lsRemote;
 class TransmitQueue {
-    constructor(from, to, src, dest, filter, onState, onConflict, onComplete) {
+    constructor(from, to, src, dest, filter, fromRoot, onState, onConflict, onComplete) {
         this.from = from;
         this.to = to;
         this.src = src;
         this.dest = dest;
         this.filter = filter;
+        this.fromRoot = fromRoot;
         this.onState = onState;
         this.onConflict = onConflict;
         this.onComplete = onComplete;
@@ -57,7 +58,7 @@ class TransmitQueue {
         }
         const stat = this.stat(this.to);
         this.processing = this.queue$.subscribe(async ({ from, dirs, to, action }) => {
-            let a = action ?? this.action;
+            const a = action ?? this.action;
             const existing = await stat((0, node_path_1.join)(to, ...dirs, from.name));
             if (existing) {
                 if (a) {
@@ -115,7 +116,7 @@ class TransmitQueue {
                 }
             }
         };
-        await Promise.all(paths.map(path => add(path, dest)));
+        await Promise.all(paths.map(path => add(path, dest, this.fromRoot ? (0, node_path_1.dirname)(path).substring(this.fromRoot.length + 1).split('/') : [])));
     }
     stop() {
         if (!this.stopped) {

package/dist/queues/Upload.js

@@ -9,8 +9,8 @@ const types_1 = require("../types");
 const Local_1 = require("../Local");
 const URI_1 = require("../utils/URI");
 class UploadQueue extends Queue_1.default {
-    constructor(connId, src, dest, filter, onState, onConflict, onError, onComplete, watcher) {
-        super(types_1.LocalFileSystemID, connId, src, dest, filter, onState, onConflict, onComplete);
+    constructor(connId, src, dest, filter, fromRoot, onState, onConflict, onError, onComplete, watcher) {
+        super(types_1.LocalFileSystemID, connId, src, dest, filter, fromRoot, onState, onConflict, onComplete);
         this.onError = onError;
         this.watcher = watcher;
         this.touched = new Map();
@@ -34,7 +34,9 @@ class UploadQueue extends Queue_1.default {
                         try {
                             await fs.mkdir(targetDir);
                         }
-                        catch (e) { }
+                        catch {
+                            // the targetDir already exists
+                        }
                         resolve();
                     }));
                 }

package/dist/transformers/Local.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const types_1 = require("../types");
+const git_1 = __importDefault(require("./git"));
+class default_1 {
+    async transform(path, files) {
+        files = files.map(f => ({ ...f, [types_1.FileAttrsAttr]: {} }));
+        for (const f of [git_1.default]) {
+            files = await f(path, files);
+        }
+        return files;
+    }
+}
+exports.default = default_1;

package/dist/transformers/git.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const node_util_1 = require("node:util");
+const node_child_process_1 = require("node:child_process");
+const node_path_1 = require("node:path");
+const types_1 = require("../types");
+const ramda_1 = require("ramda");
+async function default_1(path, files) {
+    const run = (0, node_util_1.promisify)(node_child_process_1.execFile);
+    try {
+        let { stdout: repoRoot } = await run('git', ['rev-parse', '--show-toplevel'], { cwd: path });
+        repoRoot = repoRoot.trim();
+        const { stdout: statuses } = await run('git', ['status', '-z', '.'], { cwd: path });
+        const [inRoot, inSubfolders] = (0, ramda_1.partition)(([p]) => (0, node_path_1.dirname)(p) == path, statuses
+            .replace(/\0$/, '')
+            .split('\0')
+            .map(s => [(0, node_path_1.join)(repoRoot, s.substring(3)), s.substring(0, 2)])
+            .map(([path, status]) => [path.replace(/\/$/, ''), status]));
+        if (inSubfolders.length == 1 && inSubfolders[0][0] == path && inSubfolders[0][1].includes('?')) {
+            files.forEach(f => {
+                const status = f.dir ? GitStatus.Contains : GitStatus.Untracked;
+                f[types_1.FileAttrsAttr][status] = statusNames[status];
+            });
+        }
+        else {
+            const topDir = new RegExp('^([^/]+)');
+            [...inRoot
+                    .map(([path, s]) => [path, getStatusCode(s)])
+                    .filter(([, status]) => status),
+                ...[...new Set(inSubfolders.map(([p]) => topDir.exec(p.substring(path.length + 1))?.[1]).filter(s => s))].map(dir => [(0, node_path_1.join)(path, dir), GitStatus.Contains])
+            ].forEach(([path, status]) => {
+                const f = files.find(f => f.path == path);
+                if (f) {
+                    if (f.dir) {
+                        status = GitStatus.Contains;
+                    }
+                    f[types_1.FileAttrsAttr][status] = status ? (statusNames[status] ?? '') : '';
+                }
+            });
+        }
+        const { stdout: ignored } = await run('git', ['ls-files', '--others', '--ignored', '--exclude-standard', '--directory', '-z'], { cwd: path });
+        if (ignored == './\0') {
+            files.forEach(f => f[types_1.FileAttrsAttr][GitStatus.Ignored] = statusNames[GitStatus.Ignored]);
+        }
+        else {
+            ignored
+                .replace(/\0$/, '')
+                .split('\0')
+                .map(s => (0, node_path_1.join)(path, s.replace(/\/$/, '')))
+                .forEach(path => {
+                const f = files.find(f => f.path == path);
+                f && (f[types_1.FileAttrsAttr][GitStatus.Ignored] = statusNames[GitStatus.Ignored]);
+            });
+        }
+    }
+    catch {
+        // either path is not in git repo or no git installed
+    }
+    return files;
+}
+var GitStatus;
+(function (GitStatus) {
+    GitStatus["Untracked"] = "git_u";
+    GitStatus["Modified"] = "git_m";
+    GitStatus["Added"] = "git_a";
+    GitStatus["Contains"] = "git_c";
+    GitStatus["Ignored"] = "git_i";
+})(GitStatus || (GitStatus = {}));
+const statusNames = {
+    [GitStatus.Untracked]: 'Untracked',
+    [GitStatus.Modified]: 'Modified',
+    [GitStatus.Added]: 'Index Added',
+    [GitStatus.Contains]: 'Has uncommited items',
+    [GitStatus.Ignored]: 'Ignored'
+};
+function getStatusCode(s) {
+    if (s.includes('?')) {
+        return GitStatus.Untracked;
+    }
+    else if (s.includes('M')) {
+        return GitStatus.Modified;
+    }
+    else if (s.includes('A')) {
+        return GitStatus.Added;
+    }
+    return null;
+}

package/dist/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FailureType = exports.QueueActionType = exports.QueueEventType = exports.QueueType = exports.SortOrder = exports.FileTagsAttr = exports.FileState = exports.FileStateAttr = exports.LocalFileSystemID = void 0;
+exports.FailureType = exports.QueueActionType = exports.QueueEventType = exports.QueueType = exports.SortOrder = exports.FileAttrsAttr = exports.FileState = exports.FileStateAttr = exports.LocalFileSystemID = void 0;
 exports.LocalFileSystemID = 'file://';
 exports.FileStateAttr = Symbol.for('state');
 var FileState;
@@ -8,7 +8,7 @@ var FileState;
     FileState["Creating"] = "creating";
     FileState["Renaming"] = "renaming";
 })(FileState || (exports.FileState = FileState = {}));
-exports.FileTagsAttr = Symbol.for('tags');
+exports.FileAttrsAttr = 'attributes';
 var SortOrder;
 (function (SortOrder) {
     SortOrder["Asc"] = "asc";

package/dist/utils/filter.js

@@ -18,7 +18,7 @@ function filterRegExp(settings) {
     try {
         return new RegExp(source, settings.matchCase ? '' : 'i');
     }
-    catch (e) {
+    catch {
         return null;
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "filefive",
   "description": "A SFTP/FTP client and dual-panel file manager for macOS and Linux",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "license": "GPL-3.0",
   "author": "Max Miroshnikov",
   "bin": {
@@ -31,6 +31,7 @@
     "dev": "NODE_ENV=development nodemon src/index.ts",
     "build": "tsc -p .",
     "start": "node dist/index.js",
+    "lint": "eslint",
     "publish": "tsc -p . && npm publish"
   },
   "dependencies": {
@@ -48,6 +49,7 @@
     "ws": "^8.18.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.22.0",
     "@types/express": "^5.0.0",
     "@types/ftp": "^0.3.36",
     "@types/multer": "^1.4.12",
@@ -56,9 +58,11 @@
     "@types/ssh2": "^1.15.4",
     "@types/whatwg-url": "^13.0.0",
     "@types/ws": "^8.5.14",
+    "eslint": "^9.22.0",
     "nodemon": "^3.1.9",
     "ts-node": "^10.9.2",
-    "typescript": "^5.7.3"
+    "typescript": "^5.8.2",
+    "typescript-eslint": "^8.26.1"
   },
   "nodemonConfig": {
     "ignore": [