getmdfromleetcode 1.1.1 → 1.1.2

package/index.js

@@ -39,13 +39,25 @@ const argv = yargs(hideBin(process.argv))
     description: 'Copy output to clipboard',
     default: false
   })
+  .option('username', {
+    alias: 'n',
+    type: 'string',
+    description: 'Username for specific solution author',
+    default: 'endlesscheng'  // 设置默认用户名为endlesscheng
+  })
+  .option('solutionOnly', {
+    alias: 's',
+    type: 'boolean',
+    description: 'Output solution only',
+    default: false
+  })
   .help()
   .alias('help', 'h')
   .argv;
 
 // 主函数
 async function main() {
-  const { url, english, raw, clipboard } = argv;
+  const { url, english, raw, clipboard, username, solutionOnly } = argv;
   const language = english ? 'english' : 'chinese';
   const rawOutput = raw;
   
@@ -54,24 +66,36 @@ async function main() {
     
     // 首先尝试通过GraphQL API获取数据
     try {
-      questionData = await fetchProblemDataViaGraphQL(url, language);
+      questionData = await fetchProblemDataViaGraphQL(url, language, username);
     } catch (apiError) {
       console.error('Failed to fetch data via GraphQL API, trying to fetch from page...', apiError.message);
       // 如果API获取失败，则尝试从页面获取数据
-      questionData = await fetchProblemDataFromPage(url, language);
+      questionData = await fetchProblemDataFromPage(url, language, username);
     }
     
     // 添加语言信息到 questionData
     questionData.isEnglish = english;
     
-    // 格式化为Markdown
-    const markdownContent = formatAsMarkdown(questionData, rawOutput);
+    // 根据solutionOnly参数决定输出内容
+    let outputContent;
+    if (solutionOnly) {
+      // 只输出题解
+      if (questionData.solution) {
+        outputContent = formatAsMarkdown(questionData, rawOutput, true); // 传递solutionOnly标志
+      } else {
+        console.log('No solution found for the given problem.');
+        return;
+      }
+    } else {
+      // 正常输出完整内容
+      outputContent = formatAsMarkdown(questionData, rawOutput);
+    }
     
     // 如果用户指定了复制到剪贴板的选项，则复制内容
     if (clipboard) {
       try {
         // 将内容写入临时文件
-        writeFileSync('/tmp/leetcode_content.txt', markdownContent);
+        writeFileSync('/tmp/leetcode_content.txt', outputContent);
         
         // 根据操作系统使用不同的命令复制到剪贴板
         if (process.platform === 'darwin') {
@@ -89,11 +113,11 @@ async function main() {
       } catch (clipboardError) {
         console.error('Failed to copy content to clipboard:', clipboardError.message);
         // 即使复制到剪贴板失败，仍然输出内容
-        console.log(markdownContent);
+        console.log(outputContent);
       }
     } else {
       // 正常输出内容
-      console.log(markdownContent);
+      console.log(outputContent);
     }
   } catch (error) {
     console.error('Error fetching or processing problem data:', error.message);

package/lib/markdownFormatter.js

@@ -5,7 +5,7 @@
 import * as cheerio from 'cheerio';
 
 // 将题目内容格式化为Markdown
-function formatAsMarkdown(question, rawOutput = false) {
+function formatAsMarkdown(question, rawOutput = false, solutionOnly = false) {
   const title = question.displayTitle;
   const difficulty = question.difficulty;
   const content = question.displayContent;
@@ -144,6 +144,17 @@ function formatAsMarkdown(question, rawOutput = false) {
     }
   });
 
+  // 如果只输出题解
+  if (solutionOnly) {
+    if (solution && solution.content) {
+      // 直接返回题解内容
+      let solutionContent = solution.content || '';
+      return solutionContent;
+    } else {
+      return '没有找到题解';
+    }
+  }
+
   // 构建Markdown输出
   let markdown = '';
   if (title) {
@@ -200,6 +211,8 @@ function formatAsMarkdown(question, rawOutput = false) {
     // 处理HTML实体，但保留HTML标签结构
     // solutionContent = solutionContent.replace(/&lt;/g, '<').replace(/&gt;/g, '>');
 
+    // solutionContent = solutionContent.replace(/&lt;/g, '<').replace(/&gt;/g, '>');
+
     markdown += solutionContent + '\n';
   } else {
     markdown += '\n## 题解\n\n';

package/lib/problemDataFetcher.js

@@ -3,7 +3,7 @@
  */
 
 // 使用GraphQL API获取LeetCode题目数据
-async function fetchProblemDataViaGraphQL(url, language = 'chinese') {
+async function fetchProblemDataViaGraphQL(url, language = 'chinese', username = null) {
   // 从URL中提取题目slug
   const match = url.match(/\/problems\/([^/]+)/);
   const slug = match ? match[1] : null;
@@ -35,8 +35,8 @@ async function fetchProblemDataViaGraphQL(url, language = 'chinese') {
   `;
   
   const solutionQuery = `
-    query solutionData($slug: String!) {
-      questionSolutionArticles(first: 1, questionSlug: $slug) {
+    query solutionData($slug: String!, $first: Int) {
+      questionSolutionArticles(first: $first, questionSlug: $slug) {
         edges {
           node {
             title
@@ -85,7 +85,7 @@ async function fetchProblemDataViaGraphQL(url, language = 'chinese') {
     },
     body: JSON.stringify({
       query: solutionQuery,
-      variables: { slug: slug }
+      variables: { slug: slug, first: 20 } // 增加数量以查找特定用户
     })
   });
   
@@ -114,7 +114,23 @@ async function fetchProblemDataViaGraphQL(url, language = 'chinese') {
   if (solutionData && solutionData.data && solutionData.data.questionSolutionArticles && 
       solutionData.data.questionSolutionArticles.edges && 
       solutionData.data.questionSolutionArticles.edges.length > 0) {
-    question.solution = solutionData.data.questionSolutionArticles.edges[0].node;
+      
+    if (username) {
+      // 尝试查找指定用户名的题解
+      const userSolution = solutionData.data.questionSolutionArticles.edges.find(edge => 
+        edge.node.author && edge.node.author.username === username
+      );
+      
+      // 如果找到了指定用户的题解，则使用它；否则使用第一个题解
+      if (userSolution) {
+        question.solution = userSolution.node;
+      } else if (solutionData.data.questionSolutionArticles.edges.length > 0) {
+        question.solution = solutionData.data.questionSolutionArticles.edges[0].node;
+      }
+    } else {
+      // 如果没有指定用户名，则使用第一个题解
+      question.solution = solutionData.data.questionSolutionArticles.edges[0].node;
+    }
   }
   
   // 添加URL到question对象
@@ -124,7 +140,7 @@ async function fetchProblemDataViaGraphQL(url, language = 'chinese') {
 }
 
 // 从页面的__NEXT_DATA__中提取题目数据
-async function fetchProblemDataFromPage(url, language = 'chinese') {
+async function fetchProblemDataFromPage(url, language = 'chinese', username = null) {
   // 从URL中提取题目slug
   const match = url.match(/\/problems\/([^/]+)/);
   const slug = match ? match[1] : null;
@@ -183,7 +199,7 @@ async function fetchProblemDataFromPage(url, language = 'chinese') {
     
     // 单独获取题解数据，因为页面中可能不包含题解数据
     try {
-      const solutionData = await fetchSolutionData(slug);
+      const solutionData = await fetchSolutionData(slug, username);
       if (solutionData) {
         question.solution = solutionData;
       }
@@ -201,12 +217,12 @@ async function fetchProblemDataFromPage(url, language = 'chinese') {
 }
 
 // 单独获取题解数据
-async function fetchSolutionData(slug) {
+async function fetchSolutionData(slug, username = null) {
   const graphqlUrl = 'https://leetcode.cn/graphql';
   
   const solutionQuery = `
-    query solutionData($slug: String!) {
-      questionSolutionArticles(first: 1, questionSlug: $slug) {
+    query solutionData($slug: String!, $first: Int) {
+      questionSolutionArticles(first: $first, questionSlug: $slug) {
         edges {
           node {
             title
@@ -230,7 +246,7 @@ async function fetchSolutionData(slug) {
     },
     body: JSON.stringify({
       query: solutionQuery,
-      variables: { slug: slug }
+      variables: { slug: slug, first: 20 }  // 增加数量以查找特定用户
     })
   });
   
@@ -247,7 +263,23 @@ async function fetchSolutionData(slug) {
   if (solutionData.data && solutionData.data.questionSolutionArticles && 
       solutionData.data.questionSolutionArticles.edges && 
       solutionData.data.questionSolutionArticles.edges.length > 0) {
-    return solutionData.data.questionSolutionArticles.edges[0].node;
+      
+    if (username) {
+      // 尝试查找指定用户名的题解
+      const userSolution = solutionData.data.questionSolutionArticles.edges.find(edge => 
+        edge.node.author && edge.node.author.username === username
+      );
+      
+      // 如果找到了指定用户的题解，则使用它；否则使用第一个题解
+      if (userSolution) {
+        return userSolution.node;
+      } else {
+        return solutionData.data.questionSolutionArticles.edges[0].node;
+      }
+    } else {
+      // 如果没有指定用户名，则返回第一个题解
+      return solutionData.data.questionSolutionArticles.edges[0].node;
+    }
   }
   
   return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getmdfromleetcode",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A command line tool to fetch LeetCode problem content and convert it to Markdown",
   "main": "index.js",
   "type": "module",
@@ -10,7 +10,13 @@
   "scripts": {
     "start": "node index.js"
   },
-  "keywords": ["leetcode", "markdown", "cli", "solution", "algorithm"],
+  "keywords": [
+    "leetcode",
+    "markdown",
+    "cli",
+    "solution",
+    "algorithm"
+  ],
   "author": "User",
   "license": "MIT",
   "dependencies": {
@@ -28,4 +34,4 @@
   "engines": {
     "node": ">=14.0.0"
   }
-}
+}