MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 06:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

async VRCXStorage

Browse Source
This commit is contained in:
Natsumi
2023-01-08 00:39:40 +13:00
parent e7e2960fab
commit 3fca54408c
6 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
html/src/app.js
View File

@@ -63,7 +63,10 @@ speechSynthesis.getVoices();
'launchAsDesktop'
];
for (var _key of legacyConfigKeys) {
configRepository.setBool(_key, VRCXStorage.Get(_key) === 'true');
configRepository.setBool(
_key,
(await VRCXStorage.Get(_key)) === 'true'
);
}
configRepository.setBool('migrate_config_20201101', true);
}
@@ -80,9 +83,9 @@ speechSynthesis.getVoices();
}
});
VRCXStorage.GetArray = function (key) {
VRCXStorage.GetArray = async function (key) {
try {
var array = JSON.parse(this.Get(key));
var array = JSON.parse(await this.Get(key));
if (Array.isArray(array)) {
return array;
}
@@ -96,9 +99,9 @@ speechSynthesis.getVoices();
this.Set(key, JSON.stringify(value));
};
VRCXStorage.GetObject = function (key) {
VRCXStorage.GetObject = async function (key) {
try {
var object = JSON.parse(this.Get(key));
var object = JSON.parse(await this.Get(key));
if (object === Object(object)) {
return object;
}
@@ -7058,7 +7061,7 @@ speechSynthesis.getVoices();
};
$app.methods.migrateMemos = async function () {
var json = JSON.parse(VRCXStorage.GetAll());
var json = JSON.parse(await VRCXStorage.GetAll());
database.begin();
for (var line in json) {
if (line.substring(0, 8) === 'memo_usr') {
@@ -8368,7 +8371,7 @@ speechSynthesis.getVoices();
}
$app.vrInit();
// remove old data from json file and migrate to SQLite
if (VRCXStorage.Get(`${args.json.id}_friendLogUpdatedAt`)) {
if (await VRCXStorage.Get(`${args.json.id}_friendLogUpdatedAt`)) {
VRCXStorage.Remove(`${args.json.id}_feedTable`);
$app.migrateMemos();
$app.migrateFriendLog(args.json.id);
@@ -12089,10 +12092,10 @@ speechSynthesis.getVoices();
this.friendLogInitStatus = true;
};
$app.methods.migrateFriendLog = function (userId) {
$app.methods.migrateFriendLog = async function (userId) {
VRCXStorage.Remove(`${userId}_friendLogUpdatedAt`);
VRCXStorage.Remove(`${userId}_friendLog`);
this.friendLogTable.data = VRCXStorage.GetArray(
this.friendLogTable.data = await VRCXStorage.GetArray(
`${userId}_friendLogTable`
);
database.addFriendLogHistoryArray(this.friendLogTable.data);
@@ -12996,12 +12999,15 @@ speechSynthesis.getVoices();
'VRCX_StartAtWindowsStartup'
);
$app.data.isStartAsMinimizedState =
VRCXStorage.Get('VRCX_StartAsMinimizedState') === 'true';
(await VRCXStorage.Get('VRCX_StartAsMinimizedState')) === 'true';
$app.data.isCloseToTray = VRCXStorage.Get('VRCX_CloseToTray') === 'true';
if (configRepository.getBool('VRCX_CloseToTray')) {
// move back to JSON
$app.data.isCloseToTray = configRepository.getBool('VRCX_CloseToTray');
VRCXStorage.Set('VRCX_CloseToTray', $app.data.isCloseToTray.toString());
await VRCXStorage.Set(
'VRCX_CloseToTray',
$app.data.isCloseToTray.toString()
);
configRepository.remove('VRCX_CloseToTray');
}
var saveVRCXWindowOption = function () {

18
html/src/repository/shared.js
View File

@@ -4,6 +4,22 @@ function transformKey(key) {
return String(key).toLowerCase();
}
function waitSynchronous(promise) {
if (typeof promise !== 'object' || promise === null) {
return promise;
}
console.log('waitSynchronous', promise);
while (true) {
var state = promise.getState();
if (state === 'resolved') {
return promise.get();
}
if (state === 'rejected') {
return null;
}
}
}
class SharedRepository {
remove(key) {
var _key = transformKey(key);
@@ -12,6 +28,8 @@ class SharedRepository {
getString(key, defaultValue = null) {
var _key = transformKey(key);
// var get = SharedVariable.Get(_key);
// var value = waitSynchronous(get);
var value = SharedVariable.Get(_key);
if (value === null) {
return defaultValue;