修复bug 添加对子文件夹读取支持

urls/main.py

@@ -8,21 +8,19 @@ def natural_sort_key(s):
     """为了自然排序的辅助函数，将字符串中的数字部分转换成整数"""
     return [int(text) if text.isdigit() else text.lower() for text in re.split('([0-9]+)', s)]
 
-def generate_urls(file_names, base_url, sub_directory):
-    """根据文件名、基础URL和子目录生成URL链接"""
+def generate_urls(file_paths, base_url, sub_directory):
+    """根据文件路径、基础URL和子目录生成URL链接"""
     urls = []
-    # 确保base_url和sub_directory以斜线结尾（如果sub_directory不为空）
     if not base_url.endswith('/'):
         base_url += '/'
     if sub_directory and not sub_directory.endswith('/'):
         sub_directory += '/'
-    current_timestamp = int(time.time())  # 获取当前时间的时间戳，转换为整数
-    for name in sorted(file_names, key=natural_sort_key):  # 使用自定义排序
-        file_path = os.path.join('.', name)
-        file_size_bytes = os.path.getsize(file_path)  # 获取文件大小（字节），为整数
-        # 对文件名进行URL编码
-        encoded_name = urllib.parse.quote(name)
-        url = f"{base_url}{sub_directory}{encoded_name}"
+    current_timestamp = int(time.time())
+    for path in sorted(file_paths, key=natural_sort_key):
+        file_size_bytes = os.path.getsize(path)
+        relative_path = os.path.relpath(path, start='.')
+        encoded_path = urllib.parse.quote(relative_path)
+        url = f"{base_url}{sub_directory}{encoded_path}"
         urls.append(f"{file_size_bytes}:{current_timestamp}:{url}")
     return urls
 
@@ -36,27 +34,26 @@ def parse_arguments():
     """解析命令行参数"""
     parser = argparse.ArgumentParser(description='Generate URLs from file names.')
     parser.add_argument('--dir', type=str, default='', help='Sub-directory for generating file URLs (optional)')
+    parser.add_argument('--output', type=str, default='urls.txt', help='Output file name (default: urls.txt)')
+    parser.add_argument('--base-url', type=str, default='https://link.kite.kim/feng', help='Base URL for generating file URLs (default: https://link.kite.kim/feng)')
     return parser.parse_args()
 
-def main():
-    # 解析命令行参数
-    args = parse_arguments()
-    
-    # 固定的base_url值
-    base_url = 'https://link.kite.kim/feng'
-    
-    # 获取当前目录下的所有文件名，排除此脚本文件和隐藏文件
-    current_script = os.path.basename(__file__)
-    file_names = [f for f in os.listdir('.') if os.path.isfile(f) and f != current_script and not f.startswith('.')]
-    
-    # 生成URL链接
-    urls = generate_urls(file_names, base_url, args.dir)
-    
-    # 保存URL链接到文本文件
-    output_file = 'urls.txt'
-    save_urls(urls, output_file)
+def list_files_recursive(start_path='.'):
+    """递归列出目录及其子目录中的所有文件"""
+    file_paths = []
+    for root, dirs, files in os.walk(start_path):
+        for file in files:
+            file_paths.append(os.path.join(root, file))
+    return file_paths
 
-    print(f"URL链接已保存到{output_file}")
+def main():
+    args = parse_arguments()
+    current_script = os.path.basename(__file__)
+    file_paths = list_files_recursive('.')
+    file_paths = [f for f in file_paths if os.path.isfile(f) and os.path.basename(f) != current_script and not os.path.basename(f).startswith('.')]
+    urls = generate_urls(file_paths, args.base_url, args.dir)
+    save_urls(urls, args.output)
+    print(f"URL链接已保存到{args.output}")
 
 if __name__ == '__main__':
-    main()
+    main()