2.5

fix many bug
riceshowerX · Jul 30, 2024 · ef9f52b · ef9f52b
1 parent e4c0155
commit ef9f52b
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 25 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/SnapForge.iml b/.idea/SnapForge.iml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/core/__pycache__/config.cpython-312.pyc b/core/__pycache__/config.cpython-312.pyc
diff --git a/core/__pycache__/error_handler.cpython-312.pyc b/core/__pycache__/error_handler.cpython-312.pyc
diff --git a/core/__pycache__/image_processor.cpython-312.pyc b/core/__pycache__/image_processor.cpython-312.pyc
diff --git a/main.py b/main.py
@@ -77,8 +77,8 @@ def on_directory_selected(self, data):
             self.root.ids.target_button.text = '已选择: {}'.format(self.target_directory)
 
     def rename_files(self, instance):
-        if not self.source_directory or not self.target_directory:
-            self.show_error_message("请先选择原始和保存图片文件夹！")
+        if not self.source_file or not self.target_directory:
+            self.show_error_message("请先选择原始图片文件和保存图片文件夹！")
             return
 
         prefix = self.root.ids.prefix_input.text
@@ -90,7 +90,7 @@ def rename_files(self, instance):
 
         self.progress_value = 0
         renamed_count = self.image_processor.batch_rename_files(
-            self.source_directory,
+            self.source_file,
             self.target_directory,
             prefix,
             start_number,
@@ -99,8 +99,8 @@ def rename_files(self, instance):
         self.show_info_message(f"重命名完成！共重命名了 {renamed_count} 个文件。")
 
     def convert_files(self, instance):
-        if not self.source_directory or not self.target_directory:
-            self.show_error_message("请先选择原始和保存图片文件夹！")
+        if not self.source_file or not self.target_directory:
+            self.show_error_message("请先选择原始图片文件和保存图片文件夹！")
             return
 
         target_format = self.root.ids.format_input.text
@@ -110,16 +110,16 @@ def convert_files(self, instance):
 
         self.progress_value = 0
         converted_count = self.image_processor.batch_convert_images(
-            self.source_directory,
+            self.source_file,
             self.target_directory,
             target_format,
             self.update_progress
         )
         self.show_info_message(f"转换完成！共转换了 {converted_count} 个文件。")
 
     def compress_files(self, instance):
-        if not self.source_directory or not self.target_directory:
-            self.show_error_message("请先选择原始和保存图片文件夹！")
+        if not self.source_file or not self.target_directory:
+            self.show_error_message("请先选择原始图片文件和保存图片文件夹！")
             return
 
         try:
@@ -130,7 +130,7 @@ def compress_files(self, instance):
 
         self.progress_value = 0
         compressed_count = self.image_processor.batch_compress_images(
-            self.source_directory,
+            self.source_file,
             self.target_directory,
             quality,
             self.update_progress
@@ -149,4 +149,4 @@ def show_error_message(self, message):
 
 
 if __name__ == "__main__":
-    SnapForgeApp().run()
+    SnapForgeApp().run()
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 kivy
 pillow
-jnius
+jnius
+cython
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     kivy
     pillow
-    jnius
+    jnius
+    cython