mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-18 14:23:42 +00:00
fix: upgrade to race-safe dart_ipc (#1479)
This commit is contained in:
14 files changed
+136
-79
No files matched your search
@@ -251,7 +251,7 @@ Future<String?> _getManifestPath(Browser browser) async {
|
||||
|
||||
Future<bool> _checkWindowsRegistry(String keyPath) async {
|
||||
try {
|
||||
final key = Registry.openPath(RegistryHive.localMachine, path: keyPath);
|
||||
final key = LOCAL_MACHINE.open(keyPath);
|
||||
key.close();
|
||||
return true;
|
||||
} catch (e) {
|
||||
|
||||
@@ -26,7 +26,7 @@ void doRegisterUrlScheme(String scheme) {
|
||||
|
||||
void doUnregisterUrlScheme(String scheme) {
|
||||
if (Util.isWindows()) {
|
||||
Registry.currentUser.deleteKey('Software\\Classes\\$scheme', recursive: true);
|
||||
CURRENT_USER.removeSubkey('Software\\Classes\\$scheme');
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -66,8 +66,8 @@ void doUnregisterDefaultTorrentClient() {
|
||||
if (Util.isWindows()) {
|
||||
doUnregisterUrlScheme("magnet");
|
||||
|
||||
Registry.currentUser.deleteKey(_torrentRegKey, recursive: true);
|
||||
Registry.currentUser.deleteKey(_torrentAppRegKey, recursive: true);
|
||||
CURRENT_USER.removeSubkey(_torrentRegKey);
|
||||
CURRENT_USER.removeSubkey(_torrentAppRegKey);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -3,12 +3,14 @@ import 'package:win32_registry/win32_registry.dart';
|
||||
/// Check registry key
|
||||
/// If the key does not exist or the value is different, return false
|
||||
bool checkRegistry(String keyPath, String valueName, String value) {
|
||||
RegistryKey regKey;
|
||||
RegistryKey? regKey;
|
||||
try {
|
||||
regKey = Registry.openPath(RegistryHive.currentUser, path: keyPath);
|
||||
return regKey.getValueAsString(valueName) == value;
|
||||
regKey = CURRENT_USER.open(keyPath);
|
||||
return regKey.getString(valueName) == value;
|
||||
} catch (e) {
|
||||
return false;
|
||||
} finally {
|
||||
regKey?.close();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,15 +18,15 @@ bool checkRegistry(String keyPath, String valueName, String value) {
|
||||
/// If the key does not exist, create it
|
||||
/// If the value does not exist or is different, update it
|
||||
void upsertRegistry(String keyPath, String valueName, String value) {
|
||||
RegistryKey regKey;
|
||||
final regKey = CURRENT_USER.create(
|
||||
keyPath,
|
||||
config: const RegistryOpenConfig(access: RegistryAccess.all, create: true),
|
||||
);
|
||||
try {
|
||||
regKey = Registry.openPath(RegistryHive.currentUser, path: keyPath, desiredAccessRights: AccessRights.allAccess);
|
||||
} catch (e) {
|
||||
regKey = Registry.currentUser.createKey(keyPath);
|
||||
if (regKey.getString(valueName) != value) {
|
||||
regKey.setValue(valueName, RegistryValue.string(value));
|
||||
}
|
||||
} finally {
|
||||
regKey.close();
|
||||
}
|
||||
|
||||
if (regKey.getValueAsString(valueName) != value) {
|
||||
regKey.createValue(RegistryValue(valueName, RegistryValueType.string, value));
|
||||
}
|
||||
regKey.close();
|
||||
}
|
||||
Reference in new issue
Block a user