recursiveにファイル名を取得するように変更する

Author: yuito-it

src/lib/file-system-repo.ts

@@ -214,9 +214,14 @@ export class FileSystemRepo {
   }
 
   private async getItemFilenames(remote: boolean = false) {
-    return await fs.readdir(
-      this.getRootOrRemotePath(remote),
-      FileSystemRepo.fileSystemOptions(),
+    return (
+      await fs.readdir(
+        this.getRootOrRemotePath(remote),
+        FileSystemRepo.fileSystemOptions()
+      )
+    ).filter(
+      (itemFilename) =>
+        /\.md$/.test(itemFilename) && !itemFilename.startsWith(".remote/")
     );
   }
 
@@ -234,7 +239,7 @@ export class FileSystemRepo {
       const basename = `${prefix}${suffix}`;
       const filenameCandidate = this.getFilename(basename);
       const found = itemFilenames.find(
-        (filename) => filename === filenameCandidate,
+        (filename) => filename === filenameCandidate
       );
       if (!found) {
         return basename;
@@ -246,33 +251,35 @@ export class FileSystemRepo {
   private static fileSystemOptions() {
     return {
       encoding: "utf8",
+      withFileTypes: false,
+      recursive: true,
     } as const;
   }
 
   private async setItemData(
     fileContent: FileContent,
     remote: boolean = false,
-    basename: string | null = null,
+    basename: string | null = null
   ) {
     if (!fileContent.id) {
       return;
     }
     const filepath = this.getFilePath(
       basename || this.defaultBasename(fileContent),
-      remote,
+      remote
     );
     const data = fileContent.toSaveFormat();
     await fs.writeFile(filepath, data, FileSystemRepo.fileSystemOptions());
   }
 
   private async getItemData(
     itemFilename: string,
-    remote: boolean = false,
+    remote: boolean = false
   ): Promise<FileContent | null> {
     try {
       const fileContent = await fs.readFile(
         path.join(this.getRootOrRemotePath(remote), itemFilename),
-        FileSystemRepo.fileSystemOptions(),
+        FileSystemRepo.fileSystemOptions()
       );
       return FileContent.read(fileContent);
     } catch (err: any) {
@@ -283,7 +290,7 @@ export class FileSystemRepo {
   private async syncItem(
     item: Item,
     beforeSync: boolean = false,
-    forceUpdate: boolean = false,
+    forceUpdate: boolean = false
   ) {
     const fileContent = FileContent.fromItem(item);
 
@@ -295,7 +302,7 @@ export class FileSystemRepo {
     const basename = localResult?.name || null;
     const remoteFileContent = await this.getItemData(
       this.getFilename(item.id),
-      true,
+      true
     );
 
     if (data === null || remoteFileContent?.equals(data) || forceUpdate) {
@@ -317,20 +324,18 @@ export class FileSystemRepo {
   async saveItem(
     item: Item,
     beforeSync: boolean = false,
-    forceUpdate: boolean = false,
+    forceUpdate: boolean = false
   ) {
     await this.syncItem(item, beforeSync, forceUpdate);
   }
 
   async loadItems(): Promise<QiitaItem[]> {
     const itemFilenames = await this.getItemFilenames();
 
-    const promises = itemFilenames
-      .filter((itemFilename) => /\.md$/.test(itemFilename))
-      .map(async (itemFilename) => {
-        const basename = this.parseFilename(itemFilename);
-        return await this.loadItemByBasename(basename);
-      });
+    const promises = itemFilenames.map(async (itemFilename) => {
+      const basename = this.parseFilename(itemFilename);
+      return await this.loadItemByBasename(basename);
+    });
 
     const items = excludeNull(await Promise.all(promises));
     return items;
@@ -447,7 +452,7 @@ export class FileSystemRepo {
     await fs.writeFile(
       newFilePath,
       newData,
-      FileSystemRepo.fileSystemOptions(),
+      FileSystemRepo.fileSystemOptions()
     );
   }