Various small improvements

Author: sh4nks

d2rloader/core/platform_linux/__init__.py

@@ -1,5 +0,0 @@
-import os
-
-BASE_DIR: str = os.path.join(
-    os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
-)

d2rloader/core/platform_linux/lutris.py

@@ -37,7 +37,7 @@
 cd '{GAME_PATH}'
 
 # Command
-gamemoderun {LUTRIS_UMU_LAUNCHER} '{GAME_PATH}/D2R.exe' -w -username {USERNAME} -password {PASSWORD} -address {REGION}
+gamemoderun {LUTRIS_UMU_LAUNCHER} '{GAME_PATH}/D2R.exe' -w -username {USERNAME} -password {PASSWORD} -address {REGION} {PARAMS}
 """
 
 _punct_re = re.compile(r'[\t !"#$%&\'()*\-/<=>?@\[\\\]^_`{|},.+]+')
@@ -79,9 +79,10 @@ def render_start_script(self):
             GAME_PATH=self.settings.game_path,
             LUTRIS_PATH=self.lutris_home,
             LUTRIS_UMU_LAUNCHER=self.lutris_umu_launcher,
-            USERNAME=self.account.username,
+            USERNAME=self.account.email,
             PASSWORD=self.account.password,
             REGION=self.account.region.value,
+            PARAMS=self.account.params
         )
 
     def save_start_script(self, force: bool = True):
@@ -102,7 +103,7 @@ def save_start_script(self, force: bool = True):
         return True
 
     def normalize_username_name(self, delim: str = "-"):
-        text = unidecode.unidecode(self.account.username)
+        text = unidecode.unidecode(self.account.email)
         result: list[str] = []
         for word in _punct_re.split(text.lower()):
             if word:

d2rloader/core/platform_linux/process.py

@@ -73,8 +73,8 @@ def _validate_start(self, account: Account):
             )
 
         if (
-            len(account.username) == 0
+            len(account.email) == 0
             or account.password is None
             or len(account.password) == 0
         ):
-            raise ProcessingError("No username/password provided")
+            raise ProcessingError("No email/password provided")

d2rloader/core/platform_windows/__init__.py

@@ -1,5 +0,0 @@
-import os
-
-BASE_DIR: str = os.path.join(
-    os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
-)

d2rloader/core/platform_windows/process.py

@@ -102,7 +102,7 @@ def _process_auth_password(self, account: Account, params: list[str]):
                 "Password-based authentication is selected but no password was provided."
             )
 
-        params.extend(["-username", account.username, "-password", account.password,"-adress", account.region.value])
+        params.extend(["-username", account.email, "-password", account.password,"-adress", account.region.value])
 
     def _handle_instance_start(self, account: Account, pid: int):
         logger.trace(f"process id: {pid}")

d2rloader/core/platform_windows/utils.py

@@ -18,7 +18,7 @@ def window_title_callback(hwnd: int, account: Account):
 
     if title == D2R_PROCESS_TITLE:
         window_title = WINDOW_TITLE_FORMAT.format(
-            account.username, account.region.value
+            account.displayname, account.region.value
         )
         logger.debug(f"Setting Window Handle '{hwnd}' to '{window_title}'")
         win32gui.SetWindowText(hwnd, window_title)  # pyright: ignore

d2rloader/models/account.py

@@ -38,7 +38,8 @@ def from_name(cls, name: str):
 
 
 class Account(BaseModel):
-    username: str
+    profile_name: str | None = Field(default=None)
+    email: str
     auth_method: AuthMethod
     token: str | None
     token_protected: bytes | None = Field(default=None)
@@ -47,6 +48,12 @@ class Account(BaseModel):
     params: str | None
     runtime: float | None = Field(default=0)
 
+    @property
+    def displayname(self):
+        if self.profile_name is None or self.profile_name == "":
+            return self.email
+        return self.profile_name
+
 
 # TODO: Unused at the moment - switch to QTableView first
 class AccountModel(QAbstractItemModel):

d2rloader/ui/account_dialog.py

@@ -27,7 +27,7 @@ class AccountDialogWidget(QDialog):
 
     def __init__(self, parent: QWidget | None = None, account: Account | None = None):
         super().__init__(parent)
-        self.setFixedHeight(200)
+        self.setFixedHeight(230)
         self.setFixedWidth(700)
         main_layout = QVBoxLayout()
         options_group_box = QGroupBox("Options")
@@ -39,16 +39,13 @@ def __init__(self, parent: QWidget | None = None, account: Account | None = None
         left_layout = QFormLayout()
         right_layout = QFormLayout()
 
-        username_label: Final = QLabel("Account:", self)
-        self.username: Final = QLineEdit()
-        left_layout.addRow(username_label, self.username)
+        profile_name_label: Final = QLabel("Profile Name:", self)
+        self.profile_name: Final = QLineEdit()
+        left_layout.addRow(profile_name_label, self.profile_name)
 
-        region_label: Final = QLabel("Region:", self)
-        self.region_combobox: Final = QComboBox()
-        self.region_combobox.addItem(Region.Europe.name, Region.Europe)
-        self.region_combobox.addItem(Region.Americas.name, Region.Americas)
-        self.region_combobox.addItem(Region.Asia.name, Region.Asia)
-        right_layout.addRow(region_label, self.region_combobox)
+        email_label: Final = QLabel("Account:", self)
+        self.email: Final = QLineEdit()
+        left_layout.addRow(email_label, self.email)
 
         auth_label: Final = QLabel("Auth Method:", self)
         self.auth_combobox: Final = QComboBox()
@@ -57,11 +54,22 @@ def __init__(self, parent: QWidget | None = None, account: Account | None = None
         self.auth_combobox.currentTextChanged.connect(self.change_password_token_widget)
         left_layout.addRow(auth_label, self.auth_combobox)
 
+        region_label: Final = QLabel("Region:", self)
+        self.region_combobox: Final = QComboBox()
+        self.region_combobox.addItem(Region.Europe.name, Region.Europe)
+        self.region_combobox.addItem(Region.Americas.name, Region.Americas)
+        self.region_combobox.addItem(Region.Asia.name, Region.Asia)
+        right_layout.addRow(region_label, self.region_combobox)
+
         self.password_label: Final = QLabel("Password:", self)
         # self.password: Final = QLineEdit()
         # right_layout.addRow(self.password_label, self.password)
         self.password: PasswordWidget = PasswordWidget("")
-        right_layout.addRow(self.password_label, self.password)
+        left_layout.addRow(self.password_label, self.password)
+
+        params_label: Final = QLabel("Start Parameters:", self)
+        self.params: Final = QLineEdit()
+        right_layout.addRow(params_label, self.params)
 
         self.token_label: Final = QLabel("Token:", self)
         self.token: Final = QTextEdit()
@@ -70,12 +78,9 @@ def __init__(self, parent: QWidget | None = None, account: Account | None = None
         )
         right_layout.addRow(self.token_label, self.token)
 
-        params_label: Final = QLabel("Start Parameters:", self)
-        self.params: Final = QLineEdit()
-        left_layout.addRow(params_label, self.params)
-
         if account is not None:
-            self.username.setText(account.username)
+            self.profile_name.setText(account.profile_name or "")
+            self.email.setText(account.email)
             account_idx = self.auth_combobox.findData(account.auth_method)
             self.auth_combobox.setCurrentIndex(account_idx)
             region_idx = self.region_combobox.findData(account.region)
@@ -104,7 +109,7 @@ def __init__(self, parent: QWidget | None = None, account: Account | None = None
         if account is None:
             self.setWindowTitle("Add a new Account")
         else:
-            self.setWindowTitle(f"Edit Account - Username: {account.username}")
+            self.setWindowTitle(f"Edit Account - email: {account.email}")
 
         button_box.accepted.connect(self.accept)
         button_box.rejected.connect(self.reject)
@@ -115,7 +120,8 @@ def __init__(self, parent: QWidget | None = None, account: Account | None = None
     @property
     def data(self):
         return Account(
-            username=self.username.text(),
+            profile_name=self.profile_name.text(),
+            email=self.email.text(),
             auth_method=cast(
                 AuthMethod,
                 self.auth_combobox.itemData(self.auth_combobox.currentIndex()),

d2rloader/ui/main.py

@@ -169,6 +169,8 @@ def open_about(self):
             <b>Python: </b> {python_version}, <b>Qt: </b> {qt_version}<br />
             <b>Source Code: </b> <a href="https://github.com/sh4nks/d2r-loader">Link</a><br />
             <b>License: </b> MIT<br />
+            <br />
+            <b>TZ Info and DClone Info provided by <a href="https://d2emu.com">D2Emu.com</a>
             </center>
         """
 

d2rloader/ui/table.py

@@ -17,6 +17,7 @@
 from d2rloader.core.core import D2RLoaderState
 from d2rloader.models.account import Account, AuthMethod, Region
 from d2rloader.ui.account_dialog import AccountDialogWidget
+from d2rloader.ui.utils.utils import show_error_dialog
 
 
 class D2RLoaderTableWidget(QTableWidget):
@@ -101,7 +102,7 @@ def create_row(self, row: int, item: Account | None = None):
         if item is None:
             return
 
-        account_item = QTableWidgetItem(item.username)
+        account_item = QTableWidgetItem(item.email)
         account_item.setFlags(account_item.flags() & ~Qt.ItemFlag.ItemIsEditable)
 
         auth_item = QTableWidgetItem()
@@ -237,7 +238,7 @@ def process_start(self, account: Account, button: QPushButton):
         button.setText("Starting...")
         button.setDisabled(True)
 
-        logger.info(f"Starting D2R.exe - {account.username} ({account.region.value})")
+        logger.info(f"Starting D2R.exe - {account.displayname} ({account.region.value})")
         self._state.process_manager.process_finished.connect(
             functools.partial(self.process_finished, button)
         )
@@ -249,22 +250,22 @@ def process_start(self, account: Account, button: QPushButton):
     def process_kill(self, account: Account, button: QPushButton):
         pid = None
         try:
-            pid = self._processes[account.username][1]
+            pid = self._processes[account.email][1]
         except KeyError:
             pass
 
         if pid is None or self._state.process_manager is None:
             logger.error("Stopping D2R.exe failed - PID not found!")
         else:
             logger.info(
-                f"Stopping D2R.exe with PID {self._processes[account.username][1]} - {account.username} ({account.region})"
+                f"Stopping D2R.exe with PID {self._processes[account.email][1]} - {account.displayname} ({account.region})"
             )
             try:
                 self._state.process_manager.kill(pid)
             except Exception:
                 logger.error(f"Couldn't kill pid {pid}")
 
-        del self._processes[account.username]
+        del self._processes[account.email]
         self.change_buttons_state(button, "start")
 
     @Slot()  # pyright: ignore
@@ -277,13 +278,14 @@ def process_finished(
             self.change_buttons_state(button, "start")
             return
 
-        logger.info(f"Started account {account.username} with pid {pid}")
+        logger.info(f"Started account {account.displayname} with pid {pid}")
         self.change_buttons_state(button, "start")
         button.setText("Running")
         button.setDisabled(False)
 
-        self._processes[account.username] = (logged_in, pid)
+        self._processes[account.email] = (logged_in, pid)
 
     @Slot()  # pyright: ignore
     def process_error(self, button: QPushButton, account: Account, msg: str):
+        show_error_dialog(self, msg)
         self.change_buttons_state(button, "start")