appcat
/
hosts-switch
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

修复一处异步逻辑

master
yutent 2023-09-05 18:52:29 +08:00
parent 80d328eab4
commit 409e5f1dde
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr/lib/hosts-switch/webapp/utils/index.js
View File

@ -20,14 +20,15 @@ export function checkPermission() {
export async function getHistory() { export async function getHistory() {
if (await native.fs.isfile(LOCK_FILE)) { if (await native.fs.isfile(LOCK_FILE)) {
var cache = await native.fs.read(HOST_FILE) let cache = await native.fs.read(HOST_FILE)
return JSON.parse(cache) return JSON.parse(cache)
} }
var cache = native.fs.read('/etc/hosts').toString() let cache = await native.fs.read('/etc/hosts').toString()
var records = cache.split(/[\n\r]+/) let records = cache.split(/[\n\r]+/)
var list = [] let list = []
var dict = {} let dict = {}
records.forEach(str => { records.forEach(str => {
str = str.trim() str = str.trim()
let matches = str.match(/^(#*?)\s*(\d+\.\d+\.\d+\.\d+)\s+(.*)/) let matches = str.match(/^(#*?)\s*(\d+\.\d+\.\d+\.\d+)\s+(.*)/)
@ -68,8 +69,10 @@ export async function getHistory() {
} }
}) })
list = null list = null
native.fs.write(HOST_FILE, JSON.stringify(dict)) try {
native.fs.write(LOCK_FILE, '') await native.fs.write(HOST_FILE, JSON.stringify(dict))
await native.fs.write(LOCK_FILE, '')
} catch (err) {}
return dict return dict
} }