Merge pull request #95 from fa0311/develop-v5

v5.1.1
fa0311 · Sep 7, 2023 · 9f826fa · 9f826fa
2 parents 860f275 + 675d941
commit 9f826fa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/DMMGamePlayerFastLauncher/models/setting_data.py b/DMMGamePlayerFastLauncher/models/setting_data.py
@@ -3,7 +3,7 @@
 
 from component.var import PathVar
 from component.variable_base import VariableBase
-from lib.DGPSessionWrap import DgpSessionWrap
+from lib.DGPSessionV2 import DgpSessionV2
 from static.env import Env
 
 
@@ -20,19 +20,19 @@ class SettingData(VariableBase):
     debug_window: BooleanVar = field(default_factory=lambda: BooleanVar(value=False))
 
     def update(self):
-        DgpSessionWrap.DGP5_PATH = self.dmm_game_player_program_folder.get_path()
-        DgpSessionWrap.DGP5_DATA_PATH = self.dmm_game_player_data_folder.get_path()
+        DgpSessionV2.DGP5_PATH = self.dmm_game_player_program_folder.get_path()
+        DgpSessionV2.DGP5_DATA_PATH = self.dmm_game_player_data_folder.get_path()
 
 
 @dataclass
 class DeviceData(VariableBase):
-    mac_address: StringVar = field(default_factory=lambda: StringVar(value=DgpSessionWrap.DGP5_DEVICE_PARAMS["mac_address"]))
-    hdd_serial: StringVar = field(default_factory=lambda: StringVar(value=DgpSessionWrap.DGP5_DEVICE_PARAMS["hdd_serial"]))
-    motherboard: StringVar = field(default_factory=lambda: StringVar(value=DgpSessionWrap.DGP5_DEVICE_PARAMS["motherboard"]))
-    user_os: StringVar = field(default_factory=lambda: StringVar(value=DgpSessionWrap.DGP5_DEVICE_PARAMS["user_os"]))
+    mac_address: StringVar = field(default_factory=lambda: StringVar(value=DgpSessionV2.DGP5_DEVICE_PARAMS["mac_address"]))
+    hdd_serial: StringVar = field(default_factory=lambda: StringVar(value=DgpSessionV2.DGP5_DEVICE_PARAMS["hdd_serial"]))
+    motherboard: StringVar = field(default_factory=lambda: StringVar(value=DgpSessionV2.DGP5_DEVICE_PARAMS["motherboard"]))
+    user_os: StringVar = field(default_factory=lambda: StringVar(value=DgpSessionV2.DGP5_DEVICE_PARAMS["user_os"]))
 
     def update(self):
-        DgpSessionWrap.DGP5_DEVICE_PARAMS = {
+        DgpSessionV2.DGP5_DEVICE_PARAMS = {
             "mac_address": self.mac_address.get(),
             "hdd_serial": self.hdd_serial.get(),
             "motherboard": self.motherboard.get(),

diff --git a/DMMGamePlayerFastLauncher/static/env.py b/DMMGamePlayerFastLauncher/static/env.py
@@ -8,7 +8,7 @@
 
 
 class Env(Dump):
-    VERSION = "v5.1.0"
+    VERSION = "v5.1.1"
     RELEASE_VERSION = requests.get(UrlConfig.RELEASE_API).json().get("tag_name", VERSION)
 
     DEVELOP: bool = os.environ.get("ENV") == "DEVELOP"

diff --git a/setup.iss b/setup.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "DMMGamePlayerFastLauncher"
-#define MyAppVersion "5.1.0"
+#define MyAppVersion "5.1.1"
 #define MyAppPublisher "yuki"
 #define MyAppURL "https://github.com/fa0311/DMMGamePlayerFastLauncher"
 #define MyAppExeName "DMMGamePlayerFastLauncher.exe"