feat(reorganize): support multiple Java files in src directory

lzwjava · lzwjava · commit ddf0f00f8fc9 · 2025-07-04T03:54:00.000+08:00
diff --git a/reorganize_project.py b/reorganize_project.py
@@ -1,6 +1,7 @@
 import os
 import shutil
 from pathlib import Path
+import uuid
 
 def add_package_declaration(java_file, package):
     """Add package declaration to the top of a Java file if not already present."""
@@ -54,21 +55,22 @@ def reorganize_project():
                 target_java_dir.mkdir(exist_ok=True)
                 target_resource_dir.mkdir(exist_ok=True)
 
-                main_java = problem_dir / 'src' / 'Main.java'
-                if main_java.exists():
-                    target_java = target_java_dir / 'Main.java'
-                    shutil.move(str(main_java), str(target_java))
-                    print(f'Moved {main_java} to {target_java}')
-                    add_package_declaration(target_java, f'com.algorithm.solutions.uva.p{problem}')
-                else:
-                    print(f'No Main.java found in {problem_dir}/src')
+                # Handle all *.java files in src directory
+                src_dir = problem_dir / 'src'
+                if src_dir.exists():
+                    for java_file in src_dir.glob('*.java'):
+                        target_java = target_java_dir / java_file.name
+                        shutil.move(str(java_file), str(target_java))
+                        print(f'Moved {java_file} to {target_java}')
+                        add_package_declaration(target_java, f'com.algorithm.solutions.uva.p{problem}')
+                    else:
+                        print(f'No Java files found in {src_dir}')
 
                 for input_file in problem_dir.glob('*.in'):
                     target_input = target_resource_dir / input_file.name
                     shutil.move(str(input_file), str(target_input))
                     print(f'Moved {input_file} to {target_input}')
 
-                src_dir = problem_dir / 'src'
                 if src_dir.exists() and not any(src_dir.iterdir()):
                     src_dir.rmdir()
                     print(f'Removed empty directory {src_dir}')
diff --git a/src/main/java/com/algorithm/solutions/uva/p10000/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p10000/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10000;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10034/Main1.java b/src/main/java/com/algorithm/solutions/uva/p10034/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10034;
+
 import java.io.FileInputStream;
 import java.io.PrintStream;
 import java.util.Arrays;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10036/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p10036/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10036;
+
 import java.io.*;
 import java.util.StringTokenizer;
 
diff --git a/src/main/java/com/algorithm/solutions/uva/p10077/Main1.java b/src/main/java/com/algorithm/solutions/uva/p10077/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10077;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10077/Main2.java b/src/main/java/com/algorithm/solutions/uva/p10077/Main2.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10077;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10099/Main1.java b/src/main/java/com/algorithm/solutions/uva/p10099/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10099;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10104/Main1.java b/src/main/java/com/algorithm/solutions/uva/p10104/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10104;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10137/Main1.java b/src/main/java/com/algorithm/solutions/uva/p10137/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10137;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10179/Main1.java b/src/main/java/com/algorithm/solutions/uva/p10179/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10179;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10219/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p10219/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10219;
+
 import java.io.*;
 import java.math.BigInteger;
 import java.util.StringTokenizer;
diff --git a/src/main/java/com/algorithm/solutions/uva/p104/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p104/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p104;
+
 import java.io.*;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10533/Data.java b/src/main/java/com/algorithm/solutions/uva/p10533/Data.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10533;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10534/Gen.java b/src/main/java/com/algorithm/solutions/uva/p10534/Gen.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10534;
+
 import java.io.*;
 import java.util.Random;
 
diff --git a/src/main/java/com/algorithm/solutions/uva/p10534/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p10534/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10534;
+
 import java.io.*;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10583/Main1.java b/src/main/java/com/algorithm/solutions/uva/p10583/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10583;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10616/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p10616/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10616;
+
 import java.io.*;
 import java.util.Arrays;
 import java.util.StringTokenizer;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10653/Main1.java b/src/main/java/com/algorithm/solutions/uva/p10653/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10653;
+
 import java.io.*;
 import java.util.Arrays;
 import java.util.StringTokenizer;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10684/Main1.java b/src/main/java/com/algorithm/solutions/uva/p10684/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10684;
+
 import java.io.FileInputStream;
 import java.io.PrintStream;
 import java.util.Scanner;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10763/Main1.java b/src/main/java/com/algorithm/solutions/uva/p10763/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10763;
+
 import java.io.FileInputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10943/Main1.java b/src/main/java/com/algorithm/solutions/uva/p10943/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10943;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10986/Main1.java b/src/main/java/com/algorithm/solutions/uva/p10986/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10986;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p10986/Main2.java b/src/main/java/com/algorithm/solutions/uva/p10986/Main2.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p10986;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p11060/MainMinus.java b/src/main/java/com/algorithm/solutions/uva/p11060/MainMinus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p11060;
+
 import java.io.*;
 import java.util.*;
 
diff --git a/src/main/java/com/algorithm/solutions/uva/p11060/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p11060/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p11060;
+
 import java.io.*;
 import java.util.*;
 import java.util.concurrent.ArrayBlockingQueue;
diff --git a/src/main/java/com/algorithm/solutions/uva/p11134/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p11134/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p11134;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/src/main/java/com/algorithm/solutions/uva/p11235/Main1.java b/src/main/java/com/algorithm/solutions/uva/p11235/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p11235;
+
 import java.io.*;
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/src/main/java/com/algorithm/solutions/uva/p11572/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p11572/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p11572;
+
 import java.io.*;
 import java.util.HashSet;
 
diff --git a/src/main/java/com/algorithm/solutions/uva/p11729/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p11729/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p11729;
+
 import java.io.*;
 import java.util.StringTokenizer;
 
diff --git a/src/main/java/com/algorithm/solutions/uva/p12032/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p12032/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p12032;
+
 import java.io.*;
 import java.util.StringTokenizer;
 
diff --git a/src/main/java/com/algorithm/solutions/uva/p1237/SimpleMain.java b/src/main/java/com/algorithm/solutions/uva/p1237/SimpleMain.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p1237;
+
 import java.io.*;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/com/algorithm/solutions/uva/p12545/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p12545/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p12545;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/src/main/java/com/algorithm/solutions/uva/p12558/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p12558/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p12558;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/src/main/java/com/algorithm/solutions/uva/p12569/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p12569/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p12569;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/src/main/java/com/algorithm/solutions/uva/p12657/Main1.java b/src/main/java/com/algorithm/solutions/uva/p12657/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p12657;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p1374/Main1.java b/src/main/java/com/algorithm/solutions/uva/p1374/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p1374;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p1583/Main1.java b/src/main/java/com/algorithm/solutions/uva/p1583/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p1583;
+
 import java.io.FileInputStream;
 import java.util.Scanner;
 
diff --git a/src/main/java/com/algorithm/solutions/uva/p1592j/Main1.java b/src/main/java/com/algorithm/solutions/uva/p1592j/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p1592j;
+
 import java.io.FileInputStream;
 import java.io.PrintStream;
 import java.util.Scanner;
diff --git a/src/main/java/com/algorithm/solutions/uva/p1592j/Main2.java b/src/main/java/com/algorithm/solutions/uva/p1592j/Main2.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p1592j;
+
 import java.io.FileInputStream;
 import java.io.PrintStream;
 import java.util.HashMap;
diff --git a/src/main/java/com/algorithm/solutions/uva/p1604/MainMinus.java b/src/main/java/com/algorithm/solutions/uva/p1604/MainMinus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p1604;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/src/main/java/com/algorithm/solutions/uva/p1604/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p1604/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p1604;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/src/main/java/com/algorithm/solutions/uva/p1606/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p1606/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p1606;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/src/main/java/com/algorithm/solutions/uva/p165/StampOptimization.java b/src/main/java/com/algorithm/solutions/uva/p165/StampOptimization.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p165;
+
 // chatgpt
 import java.util.Arrays;
 
diff --git a/src/main/java/com/algorithm/solutions/uva/p1673/Gen.java b/src/main/java/com/algorithm/solutions/uva/p1673/Gen.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p1673;
+
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 import java.util.Random;
diff --git a/src/main/java/com/algorithm/solutions/uva/p200/Main1.java b/src/main/java/com/algorithm/solutions/uva/p200/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p200;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p200/Main2.java b/src/main/java/com/algorithm/solutions/uva/p200/Main2.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p200;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p278/Main1.java b/src/main/java/com/algorithm/solutions/uva/p278/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p278;
+
 import java.io.*;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
diff --git a/src/main/java/com/algorithm/solutions/uva/p331/Main1.java b/src/main/java/com/algorithm/solutions/uva/p331/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p331;
+
 import java.io.*;
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/src/main/java/com/algorithm/solutions/uva/p357/Main1.java b/src/main/java/com/algorithm/solutions/uva/p357/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p357;
+
 import java.io.FileInputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
diff --git a/src/main/java/com/algorithm/solutions/uva/p437/Main1.java b/src/main/java/com/algorithm/solutions/uva/p437/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p437;
+
 import java.io.*;
 import java.util.*;
 
diff --git a/src/main/java/com/algorithm/solutions/uva/p481/Main1.java b/src/main/java/com/algorithm/solutions/uva/p481/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p481;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p562/Main1.java b/src/main/java/com/algorithm/solutions/uva/p562/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p562;
+
 import java.io.FileInputStream;
 import java.io.PrintStream;
 import java.util.Scanner;
diff --git a/src/main/java/com/algorithm/solutions/uva/p679/Main1.java b/src/main/java/com/algorithm/solutions/uva/p679/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p679;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p714/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p714/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p714;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/src/main/java/com/algorithm/solutions/uva/p727/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p727/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p727;
+
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/algorithm/solutions/uva/p793/Main1.java b/src/main/java/com/algorithm/solutions/uva/p793/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p793;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/p818/MainPlus.java b/src/main/java/com/algorithm/solutions/uva/p818/MainPlus.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p818;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/src/main/java/com/algorithm/solutions/uva/p820/Main1.java b/src/main/java/com/algorithm/solutions/uva/p820/Main1.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.p820;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/algorithm/solutions/uva/pgen_sample/Gen.java b/src/main/java/com/algorithm/solutions/uva/pgen_sample/Gen.java
@@ -1,3 +1,5 @@
+package com.algorithm.solutions.uva.pgen_sample;
+
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package com.algorithm.solutions.uva.p10000;`
	`2`	`+`
`1`	`3`	`import java.io.BufferedReader;`
`2`	`4`	`import java.io.FileInputStream;`
`3`	`5`	`import java.io.IOException;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package com.algorithm.solutions.uva.p10036;`
	`2`	`+`
`1`	`3`	`import java.io.*;`
`2`	`4`	`import java.util.StringTokenizer;`
`3`	`5`