diff --git a/assets/web_script.js b/assets/web_script.js index 501a606..410d3db 100644 --- a/assets/web_script.js +++ b/assets/web_script.js @@ -287,8 +287,7 @@ async function getRSILauncherToken(channelId) { let libraryData = (await libraryR.json())["data"] // get user avatar - let $avatarElement = $(".c-account-sidebar__profile-metas-avatar"); - let avatarUrl = $avatarElement.css("background-image"); + let avatarUrl = $(".a-avatarButton__image").attr("src"); //post message window.chrome.webview.postMessage({ diff --git a/lib/common/helper/system_helper.dart b/lib/common/helper/system_helper.dart index db1dc47..f43a93f 100644 --- a/lib/common/helper/system_helper.dart +++ b/lib/common/helper/system_helper.dart @@ -8,8 +8,8 @@ class SystemHelper { static initPowershellPath() async { try { - var result = await Process.run(powershellPath, ["echo", "ping"]); - if (!result.stdout.toString().startsWith("ping") && + var result = await Process.run(powershellPath, ["echo", "pong"]); + if (!result.stdout.toString().startsWith("pong") && powershellPath == "powershell.exe") { throw "powershell check failed"; } diff --git a/lib/ui/home/dialogs/home_game_login_dialog_ui_model.dart b/lib/ui/home/dialogs/home_game_login_dialog_ui_model.dart index 3ee1917..0de6362 100644 --- a/lib/ui/home/dialogs/home_game_login_dialog_ui_model.dart +++ b/lib/ui/home/dialogs/home_game_login_dialog_ui_model.dart @@ -63,10 +63,13 @@ class HomeGameLoginUIModel extends _$HomeGameLoginUIModel { final webToken = data["webToken"]; final releaseInfo = data["releaseInfo"]; final libraryData = RsiGameLibraryData.fromJson(data["libraryData"]); - final avatarUrl = data["avatar"] + var avatarUrl = data["avatar"] ?.toString() .replaceAll("url(\"", "") .replaceAll("\")", ""); + if (avatarUrl?.startsWith("/") ?? false) { + avatarUrl = "https://robertsspaceindustries.com$avatarUrl"; + } final Map payload = Jwt.parseJwt(authToken!); final nickname = payload["nickname"] ?? ""; diff --git a/lib/ui/home/localization/localization_ui_model.dart b/lib/ui/home/localization/localization_ui_model.dart index 24a59b9..1a6c284 100644 --- a/lib/ui/home/localization/localization_ui_model.dart +++ b/lib/ui/home/localization/localization_ui_model.dart @@ -297,7 +297,7 @@ class LocalizationUIModel extends _$LocalizationUIModel { for (var value in (element.rawContent?.readString() ?? "").split("\n")) { final tv = value.trim(); - if (tv.isNotEmpty) globalIni.writeln(tv); + if (tv.isNotEmpty) globalIni.writeln(value); } } } diff --git a/lib/ui/settings/settings_ui_model.dart b/lib/ui/settings/settings_ui_model.dart index 1c05a1d..6b13977 100644 --- a/lib/ui/settings/settings_ui_model.dart +++ b/lib/ui/settings/settings_ui_model.dart @@ -92,8 +92,9 @@ class SettingsUIModel extends _$SettingsUIModel { if (r == null || r.files.firstOrNull?.path == null) return; final fileName = r.files.first.path!; dPrint(fileName); - final fileNameRegExp = - RegExp(r"^(.*\\StarCitizen\\.*\\)Bin64\\StarCitizen\.exe$"); + final fileNameRegExp = RegExp( + r"^(.*\\StarCitizen\\.*\\)Bin64\\StarCitizen\.exe$", + caseSensitive: false); if (fileNameRegExp.hasMatch(fileName)) { RegExp pathRegex = RegExp(r"\\[^\\]+\\Bin64\\StarCitizen\.exe$"); String extractedPath = fileName.replaceFirst(pathRegex, '');