Merge remote-tracking branch 'origin/dev_image' into dev_image

Author: JavaScalaDeveloper

change/scripts/MergeMdFiles.java

@@ -6,7 +6,7 @@ public class MergeMdFiles {
 
     public static void main(String[] args) throws IOException {
         String directory = "D:\\WorkSpaces\\leetcode-all\\solution"; // 修改为目录路径
-        String outputFile = "D:\\WorkSpaces\\leetcode-all\\change\\scripts\\out\\leetcode-v2023.md"; // 修改为输出文件路径
+        String outputFile = "D:\\WorkSpaces\\leetcode-all\\change\\scripts\\out\\leetcode-1~1500-v2023.md"; // 修改为输出文件路径
 
         File dir = new File(directory);
         if (!dir.exists() || !dir.isDirectory()) {
@@ -27,14 +27,14 @@ private static void mergeMdFiles(File dir, OutputStream os) throws IOException {
             } else if (file.isFile() && file.getName().endsWith(".md")) {
 //                忽略solution根目录的文件
                 if (file.getPath().length() > 60) {
-//                    String num = file.getPath().substring(46, 50);
-//                    int no = Integer.parseInt(num);
+                    String num = file.getPath().substring(46, 50);
+                    int no = Integer.parseInt(num);
 //                    导出前2000道
-//                    if (no <= 2000) {
+                    if (no <= 1500) {
                         FileInputStream fis = new FileInputStream(file);
                         copy(fis, os);
                         fis.close();
-//                    }
+                    }
 
                 }
             }

change/scripts/MergeMdFilesByLevel.java

@@ -8,6 +8,7 @@
 import java.util.stream.Collectors;
 
 public class MergeMdFilesByLevel {
+    private final static int MAX_EXPORT_SIZE = 1500;
     private static final String OUTPUT_PATH = "D:\\WorkSpaces\\leetcode-all\\change\\scripts\\out\\"; // 修改为输出文件路径
     //题号->难度
     private static final Map<String, String> num2LevelMap = ParseMenu.getLineData().stream()
@@ -23,9 +24,9 @@ public static void main(String[] args) throws IOException {
         }
         Map<String, FileOutputStream> fileOutputStreamsMap = new HashMap<>();
 //        中等, 困难, 简单
-        fileOutputStreamsMap.put("简单", new FileOutputStream(OUTPUT_PATH + "easy-v2023.md"));
-        fileOutputStreamsMap.put("中等", new FileOutputStream(OUTPUT_PATH + "medium-v2023.md"));
-        fileOutputStreamsMap.put("困难", new FileOutputStream(OUTPUT_PATH + "hard-v2023.md"));
+        fileOutputStreamsMap.put("简单", new FileOutputStream(OUTPUT_PATH + "easy-1~" + MAX_EXPORT_SIZE + "-v2023.md"));
+        fileOutputStreamsMap.put("中等", new FileOutputStream(OUTPUT_PATH + "medium-1~" + MAX_EXPORT_SIZE + "-v2023.md"));
+        fileOutputStreamsMap.put("困难", new FileOutputStream(OUTPUT_PATH + "hard-1~" + MAX_EXPORT_SIZE + "-v2023.md"));
 
         mergeMdFiles(dir, fileOutputStreamsMap);
         fileOutputStreamsMap.forEach((s, fileOutputStream) -> {
@@ -47,15 +48,19 @@ private static void mergeMdFiles(File dir, Map<String, FileOutputStream> fileOut
             } else if (basicFileAttributes.isRegularFile() && file.getName().endsWith(".md")) {
                 FileInputStream fis = new FileInputStream(file);
                 String path = file.getPath();
-                if (path.length() > 50) {
+                if (path.length() > 60) {
 //                    题号
                     String num = path.substring(46, 50);
+                    int no = Integer.parseInt(num);
+//                    导出前2000道
+                    if (no <= MAX_EXPORT_SIZE) {
 //                    难度
-                    String level = num2LevelMap.get(num);
-                    FileOutputStream os = fileOutputStreamsMap.get(level);
-                    if (os != null) {
-                        System.out.println(num + "-->" + level);
-                        copy(fis, os);
+                        String level = num2LevelMap.get(num);
+                        FileOutputStream os = fileOutputStreamsMap.get(level);
+                        if (os != null) {
+                            System.out.println(num + "-->" + level);
+                            copy(fis, os);
+                        }
                     }
                 }
                 fis.close();