dcs-git-utils 1.0.8 → 1.0.10

package/.github/workflows/release.yml

@@ -66,7 +66,7 @@ jobs:
           prerelease: false
           generate_release_notes: true
           files: |
-            bin/DCS-Git-Utils-win.exe
-            bin/DCS-Git-Utils-linux
+            bin/dcs-git-utils-win.exe
+            bin/dcs-git-utils-linux
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/README.md

@@ -3,11 +3,12 @@
 DCS shuffles the keys in the configs when saving, to be able to version control, we need to sort the keys of config objects.
 
 ## Getting started
+
 Select the .miz you want to work on and use git to version control the mission!
 
 ## Alternatives to running it
 
-- ```npx dcs-git-utils```
+- ```npx dcs-git-utils ./mission.miz```
 - download the exe's from releases
 - clone the repo
 
@@ -19,6 +20,8 @@ Select the .miz you want to work on and use git to version control the mission!
 - (When saving in editor) After writing the .miz completes, it unpacks the archive and sorts the content, THEN re-archives into the .miz again to keep everything consistent for version control.
 - When editing anything in ./out, archive (.miz) is created from ./out.
 
+- When starting, it checks latest modified of both the outdir and .miz to prevent that something gets overwritten if you start using this tool after saving it in the mission editor.
+
 ### Cmd args for debugging purposes
 
 a single arg of a .miz filepath can be given to override file selection

package/dist/files/modified-date.js

@@ -0,0 +1,32 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.latestModifiedMsFromDir = void 0;
+const fast_glob_1 = __importDefault(require("fast-glob"));
+const fs_1 = __importDefault(require("fs"));
+const slash_1 = __importDefault(require("slash"));
+const latestModifiedMsFromDir = (dir) => __awaiter(void 0, void 0, void 0, function* () {
+    const dirPath = (0, slash_1.default)(dir);
+    const files = yield (0, fast_glob_1.default)(`${dirPath}/**/*`, {
+        dot: false,
+        onlyFiles: true,
+    });
+    if (files.length === 0)
+        return 0;
+    const mtimes = files.map(file => fs_1.default.statSync(file).mtimeMs);
+    const latestTimestamp = Math.max(...mtimes);
+    return latestTimestamp;
+});
+exports.latestModifiedMsFromDir = latestModifiedMsFromDir;
+//# sourceMappingURL=modified-date.js.map

package/dist/files/modified-date.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modified-date.js","sourceRoot":"","sources":["../../src/files/modified-date.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAA2B;AAC3B,4CAAoB;AACpB,kDAA0B;AAEnB,MAAM,uBAAuB,GAAG,CAAO,GAAW,EAAE,EAAE;IACzD,MAAM,OAAO,GAAG,IAAA,eAAK,EAAC,GAAG,CAAC,CAAC;IAC3B,MAAM,KAAK,GAAG,MAAM,IAAA,mBAAE,EAAC,GAAG,OAAO,OAAO,EAAE;QACtC,GAAG,EAAE,KAAK;QACV,SAAS,EAAE,IAAI;KAClB,CAAC,CAAC;IAEH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IAEjC,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,YAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IAE5D,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAE5C,OAAO,eAAe,CAAC;AAC3B,CAAC,CAAA,CAAA;AAdY,QAAA,uBAAuB,2BAcnC"}

package/dist/main.js

@@ -20,6 +20,7 @@ const watchers_1 = require("./watchers");
 const compression_1 = require("./compression");
 const sorting_1 = require("./sorting");
 const config_1 = require("./config");
+const modified_date_1 = require("./files/modified-date");
 const [_0, _1, file, backup] = node_process_1.default.argv;
 const shouldBackup = backup === "--backup";
 const backupMiz = (filepath) => __awaiter(void 0, void 0, void 0, function* () {
@@ -29,17 +30,27 @@ const backupMiz = (filepath) => __awaiter(void 0, void 0, void 0, function* () {
     const fileWithoutExt = filepath.replace(node_path_1.default.extname(filepath), "");
     yield node_fs_1.promises.copyFile(filepath, `${fileWithoutExt}_backup_${new Date().toISOString().replace(/:/g, '-')}.miz`);
 });
+const isOutDirLatest = (outDir, miz) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!(0, node_fs_1.existsSync)(outDir)) {
+        console.log(`No outdir at: ${outDir}`);
+        return false;
+    }
+    const latestOutDir = yield (0, modified_date_1.latestModifiedMsFromDir)(outDir);
+    const mizModified = (0, node_fs_1.statSync)(miz).mtimeMs;
+    console.log(`outDir latest: ${latestOutDir}, miz modified at: ${mizModified}`);
+    return latestOutDir > mizModified;
+});
 const initialize = () => __awaiter(void 0, void 0, void 0, function* () {
     const { missionPath, outDir, } = yield (0, config_1.initializeConfig)({ file });
     if (shouldBackup) {
         backupMiz(missionPath);
     }
-    if ((0, node_fs_1.existsSync)(outDir)) {
-        console.log('out exists, using this as source');
+    if (yield isOutDirLatest(outDir, missionPath)) {
+        console.log('using out as source');
         yield (0, compression_1.handleArchive)(outDir, missionPath);
     }
     else {
-        console.log("Initial unpack of .miz");
+        console.log("using .miz as source");
         const files = yield (0, compression_1.unpackMiz)(missionPath, outDir);
         const filePaths = files.filter(f => f.type === "file").map(f => node_path_1.default.join(outDir, f.path));
         yield (0, sorting_1.sortFiles)(filePaths);

package/dist/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,gEAAmC;AACnC,qCAAqD;AACrD,0DAA4B;AAC5B,yCAA2C;AAC3C,+CAAyD;AACzD,uCAAsC;AACtC,qCAA4C;AAE5C,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,sBAAO,CAAC,IAAI,CAAC;AAE5C,MAAM,YAAY,GAAG,MAAM,KAAK,UAAU,CAAC;AAE3C,MAAM,SAAS,GAAG,CAAO,QAAgB,EAAE,EAAE;IAEzC,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,MAAM,CAAC,CAAA,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;IACpE,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,cAAc,WAAW,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;AAC/G,CAAC,CAAA,CAAA;AAED,MAAM,UAAU,GAAG,GAAS,EAAE;IAE1B,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,GAAG,MAAM,IAAA,yBAAgB,EAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAElE,IAAI,YAAY,EAAE,CAAC;QACf,SAAS,CAAC,WAAW,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,IAAA,oBAAU,EAAC,MAAM,CAAC,EAAE,CAAC;QACrB,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;QAChD,MAAM,IAAA,2BAAa,EAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC7C,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,MAAM,IAAA,uBAAS,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACnD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3F,MAAM,IAAA,mBAAS,EAAC,SAAS,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;AAC5C,CAAC,CAAA,CAAA;AAGD,CAAC,GAAS,EAAE;IAER,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,UAAU,EAAE,CAAC;IAE/C,IAAA,wBAAa,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACnC,CAAC,CAAA,CAAC,EAAE,CAAA"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dcs-git-utils",
-    "version": "1.0.8",
+    "version": "1.0.10",
     "description": "",
     "main": "dist/main.js",
     "bin": {
@@ -52,10 +52,12 @@
         "archiver": "^7.0.1",
         "chokidar": "^3.6.0",
         "decompress": "^4.2.1",
+        "fast-glob": "^3.3.3",
         "fengari": "^0.1.4",
         "fengari-interop": "^0.1.3",
         "inquirer": "^8.2.7",
         "lodash": "^4.17.21",
-        "luaparse": "^0.3.1"
+        "luaparse": "^0.3.1",
+        "slash": "^5.1.0"
     }
 }

package/src/files/modified-date.ts

@@ -0,0 +1,19 @@
+import fg from 'fast-glob';
+import fs from 'fs';
+import slash from 'slash';
+
+export const latestModifiedMsFromDir = async (dir: string) => {
+    const dirPath = slash(dir);
+    const files = await fg(`${dirPath}/**/*`, {
+        dot: false,
+        onlyFiles: true,
+    });
+
+    if (files.length === 0) return 0;
+
+    const mtimes = files.map(file => fs.statSync(file).mtimeMs);
+
+    const latestTimestamp = Math.max(...mtimes);
+
+    return latestTimestamp;
+}

package/src/main.ts

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 
 import process from "node:process";
-import { promises as fs, existsSync } from "node:fs";
+import { promises as fs, existsSync, statSync } from "node:fs";
 import path from "node:path"
 import { startWatchers } from "./watchers";
 import { handleArchive, unpackMiz } from "./compression";
 import { sortFiles } from "./sorting";
 import { initializeConfig } from "./config";
+import { latestModifiedMsFromDir } from "./files/modified-date";
 
 const [_0, _1, file, backup] = process.argv;
 
@@ -22,6 +23,19 @@ const backupMiz = async (filepath: string) => {
     await fs.copyFile(filepath, `${fileWithoutExt}_backup_${new Date().toISOString().replace(/:/g, '-')}.miz`);
 }
 
+const isOutDirLatest = async (outDir: string, miz: string) => {
+
+    if (!existsSync(outDir)) {
+        console.log(`No outdir at: ${outDir}`);
+        return false;
+    }
+
+    const latestOutDir = await latestModifiedMsFromDir(outDir);
+    const mizModified = statSync(miz).mtimeMs;
+    console.log(`outDir latest: ${latestOutDir}, miz modified at: ${mizModified}`);
+    return latestOutDir > mizModified;
+}
+
 const initialize = async () => {
 
     const { missionPath, outDir, } = await initializeConfig({ file });
@@ -30,11 +44,11 @@ const initialize = async () => {
         backupMiz(missionPath);
     }
 
-    if (existsSync(outDir)) {
-        console.log('out exists, using this as source');
+    if (await isOutDirLatest(outDir, missionPath)) {
+        console.log('using out as source');
         await handleArchive(outDir, missionPath);
     } else {
-        console.log("Initial unpack of .miz");
+        console.log("using .miz as source");
         const files = await unpackMiz(missionPath, outDir);
         const filePaths = files.filter(f => f.type === "file").map(f => path.join(outDir, f.path));
         await sortFiles(filePaths);
@@ -43,7 +57,6 @@ const initialize = async () => {
     return { mizPath: missionPath, outDir };
 }
 
-
 (async () => {
 
     const { mizPath, outDir } = await initialize();

package/config.json

@@ -1,4 +0,0 @@
-{
-    "lastMissionPath": "C:\\Users\\marti\\Saved Games\\DCS\\Missions\\cas\\cas.miz",
-    "backupEnabled": true
-}