This commit is contained in:
2025-10-13 02:20:40 +02:00
parent 8b2cb792ff
commit 6c46193cf2
7 changed files with 52 additions and 30 deletions

View File

@@ -1,4 +1,4 @@
# some sensitive files
Location.json
GeoInfoToken.txt
GeoInfoToken.txt
IpCache.json

View File

@@ -54,7 +54,7 @@ Singleton {
property int animationFast: 150
property int animationNormal: 300
property int animationSlow: 450
property int animationSlowest: 750
property int animationSlowest: 1000
// Delays
property int tooltipDelay: 300
property int tooltipDelayLong: 1200

View File

@@ -54,7 +54,7 @@ Scope {
Behavior on color {
ColorAnimation {
duration: 1000
duration: Style.animationSlowest
easing.type: Easing.InOutCubic
}
@@ -68,7 +68,7 @@ Scope {
Behavior on color {
ColorAnimation {
duration: 1000
duration: Style.animationSlowest
easing.type: Easing.InOutCubic
}
@@ -234,14 +234,6 @@ Scope {
Caffeine.manualToggle();
}
Behavior on buttonColor {
ColorAnimation {
duration: 500
easing.type: Easing.InOutCubic
}
}
}
SymbolButton {

View File

@@ -5,7 +5,7 @@ import qs.Utils
pragma Singleton
Singleton {
property string ip: "N/A"
property alias ip: cacheFileAdapter.ip
property string countryCode: "N/A"
property real fetchInterval: 30 // in s
property real fetchTimeout: 10 // in s
@@ -66,7 +66,7 @@ Singleton {
if (xhr.status === 200) {
try {
const response = JSON.parse(xhr.responseText);
if (response && response.country) {
if (response && response.country_code) {
let newCountryCode = response.country_code;
Logger.log("IpService", "Fetched country code: " + newCountryCode);
if (newCountryCode !== countryCode) {
@@ -77,6 +77,9 @@ Singleton {
countryCode = "N/A";
Logger.error("IpService", "Geo response does not contain 'country' field");
}
cacheFileAdapter.ip = ip;
cacheFileAdapter.geoInfo = response;
cacheFile.writeAdapter();
} catch (e) {
countryCode = "N/A";
Logger.error("IpService", "Failed to parse geo response: " + e);
@@ -123,6 +126,28 @@ Singleton {
}
}
FileView {
id: cacheFile
path: Qt.resolvedUrl("../Assets/Config/IpCache.json")
watchChanges: false
onLoaded: {
Logger.log("IpService", "Loaded IP from cache file: " + cacheFileAdapter.ip);
if (cacheFileAdapter.geoInfo) {
countryCode = cacheFileAdapter.geoInfo.country_code || cacheFileAdapter.country || "N/A";
Logger.log("IpService", "Loaded country code from cache file: " + countryCode);
}
}
JsonAdapter {
id: cacheFileAdapter
property string ip: "N/A"
property var geoInfo: null
}
}
Timer {
id: fetchTimer