Merge branch 'main' into soulhn-patch-1

Author: soulhn

README.md

@@ -56,7 +56,7 @@
 | 23 | [성격 유형 검사하기](https://school.programmers.co.kr/learn/courses/30/lessons/118666) | [성격 유형 검사하기.js](https://github.com/codeisneverodd/programmers-coding-test/blob/main/level-1/성격-유형-검사하기&118666&.js) |
 | 24 | [소수 만들기](https://school.programmers.co.kr/learn/courses/30/lessons/12977) | [소수 만들기.js](https://github.com/codeisneverodd/programmers-coding-test/blob/main/level-1/소수-만들기&12977&.js) |
 | 25 | [소수 찾기](https://school.programmers.co.kr/learn/courses/30/lessons/42839) | [소수 찾기.js](https://github.com/codeisneverodd/programmers-coding-test/blob/main/level-1/소수-찾기&42839&.js) |
-| 26 | [수박수박수박수박수박수?](https://school.programmers.co.kr/learn/courses/30/lessons/12922) | [수박수박수박수박수박수?.js](https://github.com/codeisneverodd/programmers-coding-test/blob/main/level-1/수박수박수박수박수박수?&12922&.js) |
+| 26 | [수박수박수박수박수박수?](https://school.programmers.co.kr/learn/courses/30/lessons/12922) | [수박수박수박수박수박수?.js](https://github.com/codeisneverodd/programmers-coding-test/blob/main/level-1/수박수박수박수박수박수?&12922&.js) |
 | 27 | [숫자 문자열과 영단어](https://school.programmers.co.kr/learn/courses/30/lessons/81301) | [숫자 문자열과 영단어.js](https://github.com/codeisneverodd/programmers-coding-test/blob/main/level-1/숫자-문자열과-영단어&81301&.js) |
 | 28 | [시저 암호](https://school.programmers.co.kr/learn/courses/30/lessons/12926) | [시저 암호.js](https://github.com/codeisneverodd/programmers-coding-test/blob/main/level-1/시저-암호&12926&.js) |
 | 29 | [신고 결과 받기](https://school.programmers.co.kr/learn/courses/30/lessons/92334) | [신고 결과 받기.js](https://github.com/codeisneverodd/programmers-coding-test/blob/main/level-1/신고-결과-받기&92334&.js) |

level-1/수박수박수박수박수박수?&12922&.js renamed to level-1/수박수박수박수박수박수?&12922&.js

@@ -5,29 +5,44 @@ const splitCodeToSolutions = code => {
   return [solutions[0], ...solutions.slice(1).map(solution => '//' + solution)];
 };
 
-export const generateAPI = () => {
-  try {
-    const api = [1, 2, 3, 4, 5].flatMap(level =>
-      fs
-        .readdirSync(`level-${level}`)
-        .filter(name => name !== '00-해답-예시.js')
-        .map(file => {
-          const [name, id, extension] = file.split('&');
-          const code = splitCodeToSolutions(fs.readFileSync(`level-${level}/${file}`, 'utf-8'));
-          return {
-            id,
-            name: name.replaceAll('-', ' '),
-            fileName: file,
-            level,
-            code: code[0] + code[1],
-            link: `https://school.programmers.co.kr/learn/courses/30/lessons/${id}`,
-          };
-        })
-    );
-    fs.writeFileSync('api.json', JSON.stringify(api));
-    return api;
-  } catch (e) {
-    console.log('Making API ERROR: ' + e);
-    return [];
-  }
-};
+export const generateAPI = (() => {
+  const formatName = (() => {
+    const nameExceptions = [
+      ['-', ' '],
+      ['?', '?'],
+    ];
+
+    return name => {
+      nameExceptions.forEach(([a, b]) => (name = name.replaceAll(a, b)));
+      return name;
+    };
+  })();
+
+  return () => {
+    try {
+      const api = [1, 2, 3, 4, 5].flatMap(level =>
+        fs
+          .readdirSync(`level-${level}`)
+          .filter(name => name !== '00-해답-예시.js')
+          .map(fileName => {
+            const [name, id, extension] = formatName(fileName).split('&');
+            console.log(formatName(fileName));
+            const code = splitCodeToSolutions(fs.readFileSync(`level-${level}/${fileName}`, 'utf-8'));
+            return {
+              id,
+              name,
+              fileName,
+              level,
+              code: code[0] + code[1],
+              link: `https://school.programmers.co.kr/learn/courses/30/lessons/${id}`,
+            };
+          })
+      );
+      fs.writeFileSync('api.json', JSON.stringify(api));
+      return api;
+    } catch (e) {
+      console.log('Making API ERROR: ' + e);
+      return [];
+    }
+  };
+})();

utils/api.js

@@ -1,22 +1,52 @@
 import fetchTitleLink from './fetch.js';
 import fs from 'fs';
+const possibleLevels = [1, 2, 3, 4, 5];
+const nameExceptions = [
+  [' ', '-'],
+  ['?', '?'],
+];
+const renameFileNamesWithID = (() => {
+  const formatName = name => {
+    nameExceptions.forEach(([a, b]) => (name = name.replaceAll(a, b)));
+    return name;
+  };
 
-const renameFileNamesWithID = lessons => {
-  const possibleLevels = [1, 2, 3, 4, 5];
+  return lessons => {
+    possibleLevels.forEach(level => {
+      const files = fs.readdirSync(`level-${level}`);
+
+      Object.entries(lessons).forEach(([title, link]) => {
+        const id = link.split('/').at(-1);
+        const oldName = formatName(title) + '.js';
+        const newName = `${formatName(title)}&${id}&.js`;
+
+        if (files.includes(oldName) && !files.includes(newName)) {
+          fs.renameSync(`level-${level}/${oldName}`, `level-${level}/${newName}`, err => {
+            console.log(err);
+          });
+        }
+      });
+    });
+  };
+})();
+
+const renameInvalid = () => {
   possibleLevels.forEach(level => {
     const files = fs.readdirSync(`level-${level}`);
-    Object.entries(lessons).forEach(([title, link]) => {
-      const id = link.split('/').at(-1);
-      const oldFileName = title.split(' ').join('-') + '.js';
-      const newFileName = `${title.split(' ').join('-')}&${id}&.js`;
-      if (files.includes(oldFileName) && !files.includes(newFileName)) {
-        fs.renameSync(`level-${level}/${oldFileName}`, `level-${level}/${newFileName}`, err => {
-          console.log(err);
+
+    nameExceptions.forEach(e => {
+      files
+        .filter(name => name.includes(e[0]))
+        .forEach(name => {
+          fs.renameSync(`level-${level}/${name}`, `level-${level}/${name.replace(e[0], e[1])}`, err => {
+            console.log(err);
+          });
         });
-      }
     });
   });
 };
 
 const titleLinkObject = await fetchTitleLink();
+
 renameFileNamesWithID(titleLinkObject);
+renameInvalid();