Add files via upload

PYAS.py

@@ -52,7 +52,7 @@ class MainWindow_Controller(QMainWindow):
         self.pyas = sys.argv[0].replace("\\", "/")
         self.dir = os.path.dirname(self.pyas)
         self.pyae_version = "AI Engine"
-        self.pyas_version = "3.2.5"
+        self.pyas_version = "3.2.6"
         self.first_startup = True
         self.init_tray_icon()
         self.init_data_base()
@@ -889,7 +889,6 @@ class MainWindow_Controller(QMainWindow):
             else:
                 self.virus_scan_break()
                 text = self.trans("當前未發現病毒")
-            self.scan_thread.join()
             QMetaObject.invokeMethod(self.ui.Virus_Scan_text, "setText",
             Qt.QueuedConnection, Q_ARG(str, text))
             self.send_notify(text)
@@ -922,7 +921,8 @@ class MainWindow_Controller(QMainWindow):
                 self.scan_thread.start()
                 while self.scan_thread.is_alive():
                     QApplication.processEvents()
-                self.answer_scan()
+                self.scan_thread.join()
+            self.answer_scan()
         except Exception as e:
             self.bug_event(e)
             self.virus_scan_break()
@@ -936,7 +936,8 @@ class MainWindow_Controller(QMainWindow):
                 self.scan_thread.start()
                 while self.scan_thread.is_alive():
                     QApplication.processEvents()
-                self.answer_scan()
+                self.scan_thread.join()
+            self.answer_scan()
         except Exception as e:
             self.bug_event(e)
             self.virus_scan_break()
@@ -950,6 +951,7 @@ class MainWindow_Controller(QMainWindow):
                     self.scan_thread.start()
                     while self.scan_thread.is_alive():
                         QApplication.processEvents()
+                    self.scan_thread.join()
             self.answer_scan()
         except Exception as e:
             self.bug_event(e)
@@ -1465,7 +1467,7 @@ class MainWindow_Controller(QMainWindow):
                     notify_info = FILE_NOTIFY_INFORMATION.from_buffer_copy(buffer[0:])
                     raw_filename = notify_info.FileName[:notify_info.FileNameLength // 2]
                     fpath = f"C:/{raw_filename}".replace("\\", "/")
-                    ftype = f".{fpath.split('.')[-1]}".lower()
+                    ftype = os.path.splitext(fpath)[-1].lower()
                     if self.ransom_counts >= 5 and self.track_proc:
                         self.ransom_counts = 0
                         self.kill_process("勒索攔截", *self.track_proc)

PYAS_Engine.py

@@ -9,7 +9,7 @@ class YRScan:
 
     def load_rules(self, file_path):
         try:
-            ftype = str(f".{file_path.split('.')[-1]}").lower()
+            ftype = os.path.splitext(file_path)[-1].lower()
             if ftype in [".yara", ".yar"]:
                 self.rules[file_path] = yara.compile(file_path)
             elif ftype in [".yc", ".yrc"]:
@@ -50,7 +50,7 @@ class DLScan:
 
     def load_model(self, file_path):
         try:
-            ftype = str(f".{file_path.split('.')[-1]}").lower()
+            ftype = os.path.splitext(file_path)[-1].lower()
             if ftype in [".json", ".txt"]:
                 with open(file_path, 'r') as f:
                     self.class_names = json.load(f)
@@ -92,7 +92,7 @@ class DLScan:
 
     def get_type(self, file_path):
         match_data = {}
-        ftype = str(f".{file_path.split('.')[-1]}").lower()
+        ftype = os.path.splitext(file_path)[-1].lower()
         if ftype in self.suffix:
             try:
                 with pefile.PE(file_path, fast_load=True) as pe:

PYAS_Version.py

@@ -2,7 +2,7 @@ import pyinstaller_versionfile
 
 pyinstaller_versionfile.create_versionfile(
 output_file="versionfile.txt",
-version='3.2.5',
+version='3.2.6',
 company_name="PYAS Security",
 file_description="Python Antivirus Software",
 internal_name="PYAS",