@zwa73/utils 1.0.296 → 1.0.299

package/dist/UtilClass/ObsidianDepot.d.ts

@@ -46,7 +46,7 @@ export declare class ObsidianDepot {
     /**搜索info.md文件
      * @param opt - 搜索选项
      */
-    static scanMarkdown(opt: ScanOpt): Promise<ScanResult[]>;
+    static scanMarkdown(opt: ScanOpt): Promise<(ScanResult)[]>;
     /**搜索并更新info.md文件 */
     static updateMarkdown(opt: UpdateOpt): Promise<void>;
 }

package/dist/UtilClass/ObsidianDepot.js

@@ -10,6 +10,7 @@ const pathe_1 = __importDefault(require("pathe"));
 const Constant_1 = require("../Constant");
 const UtilFileTools_1 = require("../UtilFileTools");
 const UtilFunctions_1 = require("../UtilFunctions");
+const UtilLogger_1 = require("../UtilLogger");
 const Markdown_1 = require("./Markdown");
 class ObsidianDepot {
     //static create(opt:ObsidianDepotOpt){return new ObsidianDepot(opt);}
@@ -34,31 +35,37 @@ class ObsidianDepot {
     static async scanMarkdown(opt) {
         const { pattern = "**/info.md", rootPath, jsonTitle, tomlTitle, } = opt;
         const infoList = await UtilFileTools_1.UtilFT.fileSearchGlob(rootPath, pattern);
-        return await Promise.all(infoList.map(async (v) => {
-            const { dir } = pathe_1.default.parse(v);
-            const content = await fs_1.default.promises.readFile(v, 'utf-8');
+        return await Promise.all(infoList.map(async (fp) => {
+            const { dir } = pathe_1.default.parse(fp);
+            const content = await fs_1.default.promises.readFile(fp, 'utf-8');
             const markdown = await Markdown_1.Markdown.parse(content);
             const codetype = (jsonTitle != undefined && markdown.extractBlock({ title: jsonTitle, trimTitle: true })) ? 'json'
                 : (tomlTitle != undefined && markdown.extractBlock({ title: tomlTitle, trimTitle: true })) ? 'toml'
                     : 'none';
-            const codeobj = await UtilFunctions_1.UtilFunc.match(codetype, {
-                json: () => JSON.parse(markdown.extractCodeBlock({ title: jsonTitle, codetype: 'json' }) ?? ''),
-                toml: async () => (await (0, Constant_1.importOptionPack)({
-                    name: '@iarna/toml',
-                    installTip: 'npm i @iarna/toml@2.2.5'
-                })).parse(markdown.extractCodeBlock({ title: tomlTitle, codetype: 'toml' }) ?? ''),
-                none: () => undefined
-            });
-            return {
-                content,
-                abspath: dir,
-                relpath: pathe_1.default.relative(rootPath, dir),
-                infopath: v,
-                markdown: await Markdown_1.Markdown.parse(content),
-                codetype,
-                codeobj,
-            };
-        }));
+            try {
+                const codeobj = await UtilFunctions_1.UtilFunc.match(codetype, {
+                    json: () => JSON.parse(markdown.extractCodeBlock({ title: jsonTitle, codetype: 'json' }) ?? ''),
+                    toml: async () => (await (0, Constant_1.importOptionPack)({
+                        name: '@iarna/toml',
+                        installTip: 'npm i @iarna/toml@2.2.5'
+                    })).parse(markdown.extractCodeBlock({ title: tomlTitle, codetype: 'toml' }) ?? ''),
+                    none: () => undefined
+                });
+                return {
+                    content,
+                    abspath: dir,
+                    relpath: pathe_1.default.relative(rootPath, dir),
+                    infopath: fp,
+                    markdown: await Markdown_1.Markdown.parse(content),
+                    codetype,
+                    codeobj,
+                };
+            }
+            catch (err) {
+                UtilLogger_1.SLogger.warn(`ObsidianDepot.scanMarkdown 错误 目标路径:${fp}`, err);
+                return undefined;
+            }
+        })).then(li => li.filter(v => v != undefined));
     }
     /**搜索并更新info.md文件 */
     static async updateMarkdown(opt) {
@@ -66,11 +73,16 @@ class ObsidianDepot {
         const scanResultList = await ObsidianDepot.scanMarkdown(opt);
         await js_utils_1.Stream.from(scanResultList, 16).map(async (scanResult) => {
             const { infopath } = scanResult;
-            const { content, data } = await updateFunc(scanResult);
-            await fs_1.default.promises.writeFile(infopath, await Markdown_1.Markdown.from({
-                data,
-                content
-            }).stringify(stringifyOpt));
+            try {
+                const { content, data } = await updateFunc(scanResult);
+                await fs_1.default.promises.writeFile(infopath, await Markdown_1.Markdown.from({
+                    data,
+                    content
+                }).stringify(stringifyOpt));
+            }
+            catch (err) {
+                UtilLogger_1.SLogger.warn(`ObsidianDepot.updateMarkdown 错误 目标路径:${infopath}`, err);
+            }
         }).apply();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.296",
+	"version": "1.0.299",
 	"description": "my utils",
 	"main": "dist/index.js",
 	"scripts": {