feat：evfs施工中

Author: eee555

src/gameSettings.py

@@ -28,6 +28,7 @@ def __init__(self, mainWindow):
         self.unique_identifier = self.game_setting.value('DEFAULT/unique_identifier', None, str)
         self.country = self.game_setting.value('DEFAULT/country', None, str)
         self.autosave_video = self.game_setting.value('DEFAULT/autosave_video', None, bool)
+        self.autosave_video_set = self.game_setting.value('DEFAULT/autosave_video_set', None, bool)
         self.filter_forever = self.game_setting.value('DEFAULT/filter_forever', None, bool)
         self.end_then_flag = self.game_setting.value('DEFAULT/end_then_flag', None, bool)
         self.cursor_limit = self.game_setting.value('DEFAULT/cursor_limit', None, bool)
@@ -88,6 +89,7 @@ def setParameter(self):
         self.checkBox_auto_replay.setChecked(self.auto_replay >= 0)
         self.checkBox_auto_notification.setChecked(self.auto_notification)
         self.checkBox_autosave_video.setChecked(self.autosave_video)
+        self.checkBox_autosave_video_set.setChecked(self.autosave_video_set)
         self.checkBox_filter_forever.setChecked(self.filter_forever)
         self.lineEdit_constraint.setText(self.board_constraint)
         self.spinBox_attempt_times_limit.setValue (self.attempt_times_limit)
@@ -127,6 +129,7 @@ def processParameter(self):
         self.unique_identifier = self.lineEdit_unique_label.text()
         self.country = self.comboBox_country.currentText()
         self.autosave_video = self.checkBox_autosave_video.isChecked()
+        self.autosave_video_set = self.checkBox_autosave_video_set.isChecked()
         self.filter_forever = self.checkBox_filter_forever.isChecked()
         self.board_constraint = self.lineEdit_constraint.text()
         self.attempt_times_limit = self.spinBox_attempt_times_limit.value()

src/mineSweeperGUI.py

@@ -24,6 +24,7 @@
 from country_name import country_name
 import metaminesweeper_checksum
 from mainWindowGUI import MainWindow
+from datetime import datetime
 
 
 class MineSweeperGUI(superGUI.Ui_MainWindow):
@@ -211,29 +212,33 @@ def game_state(self):
     @game_state.setter
     def game_state(self, game_state: str):
         # print(self._game_state, " -> " ,game_state)
-        if self._game_state in ("playing", "show", "joking") and\
-                game_state not in ("playing", "show", "joking"):
-            self.timer_10ms.stop()
-            self.unlimit_cursor()
-        elif self._game_state in ("display", "showdisplay") and\
-                game_state not in ("display", "showdisplay"):
-            self.timer_video.stop()
-            self.ui_video_control.QWidget.close()
-            self.label.paint_cursor = False
-            self.set_country_flag()
-            self.score_board_manager.with_namespace({
-                "checksum_ok": "--",
-                "is_official": "--",
-                "is_fair": "--",
-                "mode": self.gameMode,
-                "row": self.row,
-                "column": self.column,
-                "minenum": self.minenum,
-            })
-            self.score_board_manager.show(self.label.ms_board, index_type=1)
-
-        elif self._game_state == 'study':
-            self.num_bar_ui.QWidget.close()
+        match self._game_state:
+            case "playing" | "joking":
+                if game_state not in ("playing", "show", "joking"):
+                    self.timer_10ms.stop()
+                    self.unlimit_cursor()
+            case "show":
+                if game_state not in ("playing", "show", "joking"):
+                    self.timer_10ms.stop()
+                    self.unlimit_cursor()
+            case "display" | "showdisplay":
+                if game_state not in ("display", "showdisplay"):
+                    self.timer_video.stop()
+                    self.ui_video_control.QWidget.close()
+                    self.label.paint_cursor = False
+                    self.set_country_flag()
+                    self.score_board_manager.with_namespace({
+                        "checksum_ok": "--",
+                        "is_official": "--",
+                        "is_fair": "--",
+                        "mode": self.gameMode,
+                        "row": self.row,
+                        "column": self.column,
+                        "minenum": self.minenum,
+                    })
+                    self.score_board_manager.show(self.label.ms_board, index_type=1)
+            case "study":
+                self.num_bar_ui.QWidget.close()
         self._game_state = game_state
 
 
@@ -709,7 +714,6 @@ def gameRestart(self, e=None):  # 画界面，但是不埋雷，改数据而不
         # self.label.setMouseTracking(False) # 鼠标未按下时，组织移动事件回调
 
     # 游戏结束画残局，改状态
-
     def gameFinished(self):
         if self.label.ms_board.game_board_state == 3 and self.end_then_flag:
             self.label.ms_board.win_then_flag_all_mine()
@@ -722,11 +726,15 @@ def gameFinished(self):
         self.score_board_manager.with_namespace({
             "is_official": self.is_official(),
             "is_fair": self.is_fair(),
-            "row": self.row,
-            "column": self.column,
-            "minenum": self.minenum,
+            # "row": self.row,
+            # "column": self.column,
+            # "minenum": self.minenum,
         })
-        self.score_board_manager.show(self.label.ms_board, index_type=2)
+        self.label.ms_board.analyse_for_features(["high_risk_guess", "jump_judge",
+                                                  "needless_guess","mouse_trace",
+                                                  "vision_transfer", "survive_poss"])
+
+        self.score_board_manager.show(self.label.ms_board, index_type=3)
         self.enable_screenshot()
         self.unlimit_cursor()
 
@@ -745,7 +753,7 @@ def gameWin(self):  # 成功后改脸和状态变量，停时间
         if self.autosave_video and self.checksum_module_ok():
             self.dump_evf_file_data()
             self.save_evf_file()
-
+            
         self.gameFinished()
 
         # 尝试弹窗，没有破纪录则不弹
@@ -760,7 +768,6 @@ def checksum_module_ok(self):
         #     '590028493bb58a25ffc76e2e2ad490df839a1f449435c35789d3119ca69e5d4f'
 
     # 搜集数据，生成evf文件的二进制数据，但是不保存
-
     def dump_evf_file_data(self):
         if isinstance(self.label.ms_board, ms.BaseVideo):
             self.label.ms_board.use_question = False  # 禁用问号是共识
@@ -801,7 +808,6 @@ def dump_evf_file_data(self):
     # 将evf数据存成evf文件
     # 调试的时候不会自动存录像，见checksum_module_ok
     # 菜单保存的回调。以及游戏结束自动保存。
-
     def save_evf_file(self):
         if not os.path.exists(self.replay_path):
             os.mkdir(self.replay_path)
@@ -833,6 +839,19 @@ def save_evf_file(self):
             file_name += "_fake"
 
         self.label.ms_board.save_to_evf_file(file_name)
+        
+    # 保存evfs文件。先保存后一个文件，再删除前一个文件。
+    def save_evfs_file(self):
+        now = datetime.now()
+        date_str = now.strftime("%Y%m%d")
+        file_name = self.replay_path + '\\' + self.label.ms_board.player_identifier +\
+            "_" + date_str + "_" + str(self.evfs.len())
+        self.evfs.save_evfs_file(file_name)
+        try:
+            os.remove(self.old_evfs_filename)
+        except Exception as e:
+            ...
+        self.old_evfs_filename = file_name
 
     def gameFailed(self):  # 失败后改脸和状态变量
         self.timer_10ms.stop()
@@ -1013,6 +1032,12 @@ def try_record_pop(self):
             ui.label_16.setText(mode_text)
             ui.Dialog.show()
             ui.Dialog.exec_()
+            
+            
+    # 根据条件是否满足，尝试追加evfs文件
+    def try_append_evfs(self):
+        ...
+    
 
     def showMineNum(self, n):
         # 显示剩余雷数，雷数大于等于0，小于等于999，整数
@@ -1198,6 +1223,7 @@ def action_NEvent(self):
             self.country = ui.country
             self.set_country_flag()
             self.autosave_video = ui.autosave_video
+            self.autosave_video_set = ui.autosave_video_set
             self.filter_forever = ui.filter_forever
 
             self.board_constraint = ui.board_constraint
@@ -1220,7 +1246,7 @@ def action_NEvent(self):
                 self.predefinedBoardPara[0]['gamemode'] = ui.gameMode
 
             self.score_board_manager.with_namespace({
-                "race_identifier": ui.race_identifier,
+                # "race_identifier": ui.race_identifier,
                 "mode": self.gameMode,
                 # "row": self.row,
                 # "column": self.column,
@@ -1352,6 +1378,8 @@ def screenShot(self):
         self.label.boardProbability = ans[0]
 
         self.label.update()
+        self.evfs = ms.Evfs()
+        self.old_evfs_filename = ""
         # self.label.setMouseTracking(True)
 
         self.minimumWindow()
@@ -1421,18 +1449,16 @@ def mineKeyReleaseEvent(self, keyName):
             if self.game_state == 'show':
                 self.game_state = 'joking'
                 self.label.paintProbability = False
-                # self.label.setMouseTracking(False)
                 self.label_info.setText(self.player_identifier)
                 self.label.update()
             elif self.game_state == 'display':
                 self.game_state = 'showdisplay'
                 self.label.paintProbability = True
-                # self.label.setMouseTracking(True)
                 self.label.update()
             elif self.game_state == 'showdisplay':
                 self.game_state = 'display'
                 self.label.paintProbability = False
-                # self.label.setMouseTracking(False)
+                self.label_info.setText(self.player_identifier)
                 self.label.update()
 
     def refreshSettingsDefault(self):
@@ -1451,7 +1477,7 @@ def action_OpenFile(self, openfile_name=None):
         if not openfile_name:
             openfile_name = QFileDialog.\
                 getOpenFileName(self.mainWindow, '打开文件', str(self.setting_path / 'replay'),
-                                'All(*.avf *.evf *.rmv *.mvf);;Arbiter video(*.avf);;Metasweeper video(*.evf);;Vienna MineSweeper video(*.rmv);;Minesweeper Clone 0.97(*.mvf)')
+                                'All(*.avf *.evf *.rmv *.mvf *.evfs);;Arbiter video(*.avf);;Metasweeper video(*.evf);;Vienna MineSweeper video(*.rmv);;Minesweeper Clone 0.97(*.mvf);;Metasweeper video set(*.evfs)')
             openfile_name = openfile_name[0]
         # 实例化
         if not openfile_name:
@@ -1464,10 +1490,11 @@ def action_OpenFile(self, openfile_name=None):
             elif openfile_name[-3:] == "rmv":
                 video = ms.RmvVideo(openfile_name)
             elif openfile_name[-3:] == "evf":
-                # evf版本过时以后会引发异常
                 video = ms.EvfVideo(openfile_name)
             elif openfile_name[-3:] == "mvf":
                 video = ms.MvfVideo(openfile_name)
+            elif openfile_name[-3:] == "evfs":
+                video = ms.Evfs(openfile_name)
             else:
                 return
         except:
@@ -1498,7 +1525,7 @@ def play_video(self, video):
             "mode": video.mode,
             "row": video.row,
             "column": video.column,
-            "minenum": video.minenum,
+            "minenum": video.mine_num,
         })
         video.analyse_for_features(["high_risk_guess", "jump_judge", "needless_guess",
                                     "mouse_trace", "vision_transfer", "survive_poss"])

src/minesweeper_master.py

@@ -32,12 +32,7 @@ def choose_3BV_laymine(laymine):
             else:
                 success_flag = True
 
-            constraints = {
-                "sin": math.sin,
-                "tan": math.tan,
-                "cos": math.cos,
-                "log": math.log,
-                } # 也许还要加row, column, mine_num, level, mode
+            constraints = {}
             wrapper_b = ms.Board(b)
             if "bbbv" in board_constraint:
                 constraints.update({"bbbv": wrapper_b.bbbv})
@@ -522,11 +517,7 @@ def main():
 
     # print2(enumerateChangeBoard2(board, game_board, [(2, 3), (3, 2), (2, 2)])[0])
 
-    constraints = {
-        "sin": math.sin,
-        "tan": math.tan,
-        "cos": math.cos,
-        } # 也许还要加row, column, mine_num, level, mode
+    constraints = {}
     board_constraint="all([1,2,3])"
     if "bbbv" in board_constraint:
         constraints.update({"bbbv": 120})

src/superGUI.py

@@ -499,6 +499,7 @@ def read_or_create_game_setting(self):
         self.unique_identifier = self.game_setting.get_or_set_value("DEFAULT/unique_identifier", "", str)
         self.country = self.game_setting.get_or_set_value("DEFAULT/country", "", str)
         self.autosave_video = self.game_setting.get_or_set_value("DEFAULT/autosave_video", True, bool)
+        self.autosave_video_set = self.game_setting.get_or_set_value("DEFAULT/autosave_video_set", True, bool)
         self.filter_forever = self.game_setting.get_or_set_value("DEFAULT/filter_forever", False, bool)
         self.language = self.game_setting.get_or_set_value("DEFAULT/language", "en_US", str)
         self.end_then_flag = self.game_setting.get_or_set_value("DEFAULT/end_then_flag", True, bool)

src/ui/ui_gameSettings.py

@@ -15,7 +15,7 @@ class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName("Form")
         Form.setWindowModality(QtCore.Qt.NonModal)
-        Form.resize(554, 605)
+        Form.resize(554, 644)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -368,6 +368,15 @@ def setupUi(self, Form):
         self.checkBox_autosave_video.setStyleSheet("")
         self.checkBox_autosave_video.setObjectName("checkBox_autosave_video")
         self.verticalLayout_5.addWidget(self.checkBox_autosave_video)
+        self.checkBox_autosave_video_set = QtWidgets.QCheckBox(self.frame_4)
+        self.checkBox_autosave_video_set.setMinimumSize(QtCore.QSize(0, 32))
+        self.checkBox_autosave_video_set.setMaximumSize(QtCore.QSize(16777215, 32))
+        font = QtGui.QFont()
+        font.setFamily("微软雅黑")
+        font.setPointSize(12)
+        self.checkBox_autosave_video_set.setFont(font)
+        self.checkBox_autosave_video_set.setObjectName("checkBox_autosave_video_set")
+        self.verticalLayout_5.addWidget(self.checkBox_autosave_video_set)
         self.checkBox_filter_forever = QtWidgets.QCheckBox(self.frame_4)
         self.checkBox_filter_forever.setMinimumSize(QtCore.QSize(0, 32))
         font = QtGui.QFont()
@@ -654,6 +663,7 @@ def retranslateUi(self, Form):
         self.label_country.setText(_translate("Form", "国家或地区："))
         self.checkBox_autosave_video.setToolTip(_translate("Form", "完成后自动将录像保存到replay文件夹下"))
         self.checkBox_autosave_video.setText(_translate("Form", "自动保存录像（推荐）"))
+        self.checkBox_autosave_video_set.setText(_translate("Form", "自动保存录像集"))
         self.checkBox_filter_forever.setToolTip(_translate("Form", "勾选后永远使用筛选法埋雷，否则会适时改用调整法"))
         self.checkBox_filter_forever.setText(_translate("Form", "永远使用筛选法埋雷（不推荐）"))
         self.checkBox_end_then_flag.setText(_translate("Form", "结束后标雷"))