Merge pull request #59 from ega4432/bug/output-count

Fixed output count
ega4432 · Mar 2, 2023 · c813a90 · c813a90
2 parents d57a14c + a8d2a8b
commit c813a90
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 23 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,34 +23,87 @@ jobs:
 
       - run: npm run all # exec: [ prettier, eslint, test, build, package ]
 
-  test: # make sure the action works on a clean machine without building
+  test-normal:
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
       - name: Checkout source
         uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
 
       - name: Normal test
         id: import
         uses: ./
         env:
           NOTION_API_KEY: ${{ secrets.NOTION_API_KEY }}
           NOTION_DATABASE_ID: ${{ secrets.NOTION_DATABASE_ID }}
-          ACTIONS_STEP_DEBUG: true
-          ACTIONS_RUNNER_DEBUG: true
+
+      - name: Check output
+        run: |
+          echo "exported count: ${{ steps.import.outputs.files_count }}"
+
+      - name: Validate count
+        run: |
+          if [ "$(find ./output -type f -name '*.md' | wc -l)" != "${{ steps.import.outputs.files_count }}" ]; then
+            find ./output -type f -name '*.md'
+            exit 1
+          fi
+
+  test-output-path:
+    runs-on: ubuntu-latest
+    timeout-minutes: 3
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Specific output path
+        id: import
+        uses: ./
+        with:
+          output_path: some/dir
+        env:
+          NOTION_API_KEY: ${{ secrets.NOTION_API_KEY }}
+          NOTION_DATABASE_ID: ${{ secrets.NOTION_DATABASE_ID }}
+
+      - name: Check output
+        run: |
+          echo "exported count: ${{ steps.import.outputs.files_count }}"
+
+      - name: Validate count
+        run: |
+          if [ "$(find ./some/dir -type f -name '*.md' | wc -l)" != "${{ steps.import.outputs.files_count }}" ]; then
+            find ./some/dir -type f -name '*.md'
+            exit 1
+          fi
+
+  test-filename-property:
+    runs-on: ubuntu-latest
+    timeout-minutes: 3
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
 
       - name: Specific property as a markdown filename
-        id: import2
+        id: import
         uses: ./
         with:
           filename_property: 'slug'
         env:
           NOTION_API_KEY: ${{ secrets.NOTION_API_KEY }}
           NOTION_DATABASE_ID: ${{ secrets.NOTION_DATABASE_ID }}
-          ACTIONS_STEP_DEBUG: true
-          ACTIONS_RUNNER_DEBUG: true
 
       - name: Check output
         run: |
-          echo "Normal test: exported count: ${{ steps.import.outputs.files_count }}"
-          echo "Specified property test: exported count: ${{ steps.import2.outputs.files_count }}"
+          echo "exported count: ${{ steps.import.outputs.files_count }}"
+
+      - name: Validate count
+        run: |
+          if [ "$(find ./output -type f -name '*.md' | wc -l)" != "${{ steps.import.outputs.files_count }}" ]; then
+            find ./output -type f -name '*.md'
+            exit 1
+          fi
diff --git a/README.md b/README.md
@@ -51,7 +51,14 @@ Database ID of target Notion page.
 
 ### `output_path`
 
-Directory path to output files.
+You can specify the directory path to output files.
 
 - optional
 - default: `output`
+
+### `filename_property`
+
+You can specify the column of the Notion database to be used as a filename when saving the files.
+
+- optional
+- default: `title`
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -8,7 +8,7 @@ import {
 } from '@actions/core';
 import { mkdirP } from '@actions/io';
 import { Client } from '@notionhq/client';
-import { readdir, writeFile } from 'fs/promises';
+import { writeFile } from 'fs/promises';
 import get from 'axios';
 
 import { queryDatabase } from './utils/notion';
@@ -51,25 +51,29 @@ const run = async (
 
   info(`---> Successfully created directory! : ${outDir}`);
 
-  await createFiles(mdResponse, outDir);
+  const count = await createFiles(mdResponse, outDir);
 
-  const files = await readdir(outDir);
-  debug(`Output: files_count=${files.length.toString()}`);
-  setOutput('files_count', files.length.toString());
+  debug(`Output: files_count=${count}`);
+  setOutput('files_count', count.toString());
 
   info('---> Successfully created markdown files!');
 };
 
 const createFiles = async (pages: MarkdownPage[], outDir: string) => {
-  pages.forEach(async (markdown) => {
+  let count = 0;
+
+  for (const markdown of pages) {
     if (markdown.filename.length) {
       // NOTE: 現状すでにファイルが存在していても上書きする
       const filename = `${outDir}/${markdown.filename}.md`;
       await writeFile(filename, markdown.body);
       debug(`Created: ${filename}`);
+      count++;
       await downloadImages(markdown.filename, outDir);
     }
-  });
+  }
+
+  return count;
 };
 
 const downloadImages = async (filename: string, outDir: string) => {

diff --git a/src/utils/notion.ts b/src/utils/notion.ts
@@ -39,6 +39,9 @@ export const queryDatabase = async ({
   });
 
   info('---> Successfully return response from Notion via API!');
+  debug(
+    `Response from Notion API: ${JSON.stringify(response.results, null, 2)}`
+  );
 
   const pages = response.results.filter(
     (result) => 'properties' in result