Skip to content

Commit 5b2f24a

Browse files
committed
功能完善!v1.0
1 parent 81e8610 commit 5b2f24a

File tree

1 file changed

+5
-30
lines changed

1 file changed

+5
-30
lines changed

Main.py

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env python3
22

33
import os
4-
import subprocess
54
import sys
5+
import image_converter
66
from pathlib import Path
77

88
version = "1.0"
@@ -36,16 +36,8 @@ def display_banner():
3636
print(f"{Colors.BOLD}https://github.com/YanYiGe2023/ImageBridge{Colors.ENDC}")
3737
print(f"{Colors.BLUE}{'=' * 60}")
3838

39-
def validate_script():
40-
"""验证转换脚本是否存在"""
41-
if not Path(CONVERTER_SCRIPT).is_file():
42-
print(f"{Colors.RED}错误: 未找到转换脚本 {CONVERTER_SCRIPT}")
43-
print("请确保此菜单脚本与转换脚本在同一目录下{Colors.ENDC}")
44-
sys.exit(1)
45-
46-
4739
def run_converter(command):
48-
"""运行转换器脚本"""
40+
"""运行转换器脚本
4941
try:
5042
clear_screen()
5143
print(f"{Colors.YELLOW}执行命令: python {CONVERTER_SCRIPT} {' '.join(command)}{Colors.ENDC}\n")
@@ -60,6 +52,7 @@ def run_converter(command):
6052
except KeyboardInterrupt:
6153
print(f"\n{Colors.YELLOW}操作已取消{Colors.ENDC}")
6254
return False
55+
"""
6356

6457

6558
def get_input_folder():
@@ -105,14 +98,7 @@ def to_webp_menu():
10598
output_folder = get_output_folder()
10699
quality = get_quality()
107100

108-
command = [
109-
"to_webp",
110-
"-i", input_folder,
111-
"-o", output_folder,
112-
"-q", str(quality)
113-
]
114-
115-
if run_converter(command):
101+
if image_converter.batch_convert(input_folder, output_folder, "to_webp", format, quality):
116102
print(f"\n{Colors.GREEN}转换完成! 输出目录: {output_folder}{Colors.ENDC}")
117103
input("\n按回车键返回主菜单...")
118104

@@ -138,24 +124,13 @@ def from_webp_menu():
138124
format = "jpg"
139125

140126
quality = get_quality()
141-
142-
command = [
143-
"from_webp",
144-
"-i", input_folder,
145-
"-o", output_folder,
146-
"-f", format,
147-
"-q", str(quality)
148-
]
149-
150-
if run_converter(command):
127+
if image_converter.batch_convert(input_folder, output_folder, "from_webp", format, quality):
151128
print(f"\n{Colors.GREEN}转换完成! 输出目录: {output_folder}{Colors.ENDC}")
152129
input("\n按回车键返回主菜单...")
153130

154131

155132
def main_menu():
156133
"""主菜单"""
157-
validate_script()
158-
159134
while True:
160135
clear_screen()
161136
display_banner()

0 commit comments

Comments
 (0)