diff --git a/package/contents/config/main.xml b/package/contents/config/main.xml
index adf1487..b2c04df 100644
--- a/package/contents/config/main.xml
+++ b/package/contents/config/main.xml
@@ -98,7 +98,7 @@
true
- v0
+ v2.9.5
true
true
diff --git a/package/contents/tools/tools.js b/package/contents/tools/tools.js
index 0ef17f4..59e2d4e 100644
--- a/package/contents/tools/tools.js
+++ b/package/contents/tools/tools.js
@@ -5,7 +5,7 @@
const scriptDir = "$HOME/.local/share/plasma/plasmoids/com.github.exequtic.apdatifier/contents/tools/sh/"
const configDir = "$HOME/.config/apdatifier/"
-const configFile = configDir + "config.conf"
+const configFile = configDir + "config.json"
const cacheFile = configDir + "updates.json"
const rulesFile = configDir + "rules.json"
const newsFile = configDir + "news.json"
@@ -55,19 +55,10 @@ function init() {
function loadConfig() {
execute(readFile(configFile), (cmd, out, err, code) => {
if (Error(code, err)) return
- if (out) {
- const config = out.trim().split("\n")
- const convert = value => {
- if (!isNaN(parseFloat(value))) return parseFloat(value)
- if (value === "true" || value === "false") return value === 'true'
- return value
- }
- config.forEach(line => {
- const match = line.match(/(\w+)="([^"]*)"/)
- if (match) plasmoid.configuration[match[1]] = convert(match[2])
- })
+ if (out && validJSON(out, configFile)) {
+ const config = JSON.parse(out.trim())
+ Object.keys(config).forEach(key => plasmoid.configuration[key] = config[key])
}
-
loadCache()
})
}
@@ -106,14 +97,14 @@ function init() {
function saveConfig() {
if (saveTimer.running) return
- let config = ""
+ let config = {}
Object.keys(cfg).forEach(key => {
if (key.endsWith("Default")) {
let name = key.slice(0, -7)
- config += `${name}="${cfg[name]}"\n`
+ config[name] = cfg[name]
}
})
- execute(writeFile(config, ">", configFile))
+ execute(writeFile(toFileFormat(config), ">", configFile))
}
function checkDependencies() {
diff --git a/package/metadata.json b/package/metadata.json
index 8becae4..a1b6e90 100644
--- a/package/metadata.json
+++ b/package/metadata.json
@@ -12,7 +12,7 @@
"Id": "com.github.exequtic.apdatifier",
"Name": "Apdatifier",
"EnabledByDefault": false,
- "Version": "2.9.4",
+ "Version": "2.9.5",
"License": "MIT",
"BugReportUrl": "https://github.com/exequtic/apdatifier/issues",
"Website": "https://github.com/exequtic/apdatifier"