Formatting
This commit is contained in:
quadbyte
parent
d17fb4c002
commit
934d4cc933
2 changed files with 314 additions and 329 deletions
|
|
@ -16,7 +16,7 @@ ColumnLayout {
|
|||
|
||||
Component.onCompleted: {
|
||||
// Initialize the Github service
|
||||
Github.init();
|
||||
Github.init()
|
||||
}
|
||||
|
||||
spacing: 0
|
||||
|
|
@ -28,21 +28,21 @@ ColumnLayout {
|
|||
|
||||
command: ["sh", "-c", "cd " + Quickshell.shellDir + " && git describe --tags --abbrev=0 2>/dev/null || echo 'Unknown'"]
|
||||
Component.onCompleted: {
|
||||
running = true;
|
||||
running = true
|
||||
}
|
||||
|
||||
stdout: StdioCollector {
|
||||
onStreamFinished: {
|
||||
const version = text.trim();
|
||||
const version = text.trim()
|
||||
if (version && version !== "Unknown") {
|
||||
root.currentVersion = version;
|
||||
root.currentVersion = version
|
||||
} else {
|
||||
currentVersionProcess.command = ["sh", "-c", "cd " + Quickshell.shellDir + " && cat package.json 2>/dev/null | grep '\"version\"' | cut -d'\"' -f4 || echo 'Unknown'"];
|
||||
currentVersionProcess.running = true;
|
||||
currentVersionProcess.command = ["sh", "-c", "cd " + Quickshell.shellDir
|
||||
+ " && cat package.json 2>/dev/null | grep '\"version\"' | cut -d'\"' -f4 || echo 'Unknown'"]
|
||||
currentVersionProcess.running = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
ScrollView {
|
||||
|
|
@ -110,7 +110,6 @@ ColumnLayout {
|
|||
color: Colors.textPrimary
|
||||
font.weight: Style.fontWeightBold
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
|
|
@ -124,21 +123,20 @@ ColumnLayout {
|
|||
border.width: 1
|
||||
visible: {
|
||||
if (root.currentVersion === "Unknown" || root.latestVersion === "Unknown")
|
||||
return false;
|
||||
return false
|
||||
|
||||
const latest = root.latestVersion.replace("v", "").split(".");
|
||||
const current = root.currentVersion.replace("v", "").split(".");
|
||||
for (let i = 0; i < Math.max(latest.length, current.length); i++) {
|
||||
const l = parseInt(latest[i] || "0");
|
||||
const c = parseInt(current[i] || "0");
|
||||
const latest = root.latestVersion.replace("v", "").split(".")
|
||||
const current = root.currentVersion.replace("v", "").split(".")
|
||||
for (var i = 0; i < Math.max(latest.length, current.length); i++) {
|
||||
const l = parseInt(latest[i] || "0")
|
||||
const c = parseInt(current[i] || "0")
|
||||
if (l > c)
|
||||
return true;
|
||||
return true
|
||||
|
||||
if (l < c)
|
||||
return false;
|
||||
|
||||
return false
|
||||
}
|
||||
return false;
|
||||
return false
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
|
|
@ -159,7 +157,6 @@ ColumnLayout {
|
|||
font.pointSize: 14 * Scaling.scale(screen)
|
||||
color: updateArea.containsMouse ? Colors.backgroundPrimary : Colors.accentPrimary
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
|
|
@ -169,10 +166,9 @@ ColumnLayout {
|
|||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
onClicked: {
|
||||
Quickshell.execDetached(["xdg-open", "https://github.com/Ly-sec/Noctalia/releases/latest"]);
|
||||
Quickshell.execDetached(["xdg-open", "https://github.com/Ly-sec/Noctalia/releases/latest"])
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Separator
|
||||
|
|
@ -252,7 +248,7 @@ ColumnLayout {
|
|||
|
||||
onStatusChanged: {
|
||||
if (status === Image.Error) {
|
||||
console.log("[About] Failed to load avatar for", modelData.login, "URL:", modelData.avatar_url);
|
||||
console.log("[About] Failed to load avatar for", modelData.login, "URL:", modelData.avatar_url)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -285,7 +281,6 @@ ColumnLayout {
|
|||
color: contributorArea.containsMouse ? Colors.backgroundPrimary : Colors.textPrimary
|
||||
visible: !avatarImage.source || avatarImage.status !== Image.Ready
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
|
|
@ -306,9 +301,7 @@ ColumnLayout {
|
|||
font.pointSize: 11 * Scaling.scale(screen)
|
||||
color: contributorArea.containsMouse ? Colors.backgroundPrimary : Colors.textSecondary
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
|
|
@ -319,19 +312,12 @@ ColumnLayout {
|
|||
cursorShape: Qt.PointingHandCursor
|
||||
onClicked: {
|
||||
if (modelData.html_url)
|
||||
Quickshell.execDetached(["xdg-open", modelData.html_url]);
|
||||
|
||||
Quickshell.execDetached(["xdg-open", modelData.html_url])
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ Singleton {
|
|||
onLoadFailed: function (error) {
|
||||
if (error.toString().includes("No such file") || error === 2) {
|
||||
// File doesn't exist, create it with default values
|
||||
console.log("[Github] Creating new cache file...");
|
||||
console.log("[Github] Creating new cache file...")
|
||||
writeAdapter()
|
||||
// Fetch data after a short delay to ensure file is created
|
||||
Qt.callLater(() => {
|
||||
|
|
@ -51,26 +51,25 @@ Singleton {
|
|||
}
|
||||
|
||||
// --------------------------------
|
||||
function init() {
|
||||
// does nothing but ensure the singleton is created
|
||||
function init() {// does nothing but ensure the singleton is created
|
||||
// do not remove
|
||||
}
|
||||
|
||||
// --------------------------------
|
||||
function loadFromCache() {
|
||||
const now = Date.now();
|
||||
const now = Date.now()
|
||||
if (!data.timestamp || (now - data.timestamp > githubUpdateFrequency * 1000)) {
|
||||
console.log("[Github] Cache expired or missing, fetching new data from GitHub...");
|
||||
fetchFromGitHub();
|
||||
return;
|
||||
console.log("[Github] Cache expired or missing, fetching new data from GitHub...")
|
||||
fetchFromGitHub()
|
||||
return
|
||||
}
|
||||
console.log("[Github] Loading cached GitHub data (age: " + Math.round((now - data.timestamp) / 60000) + " minutes)");
|
||||
console.log("[Github] Loading cached GitHub data (age: " + Math.round((now - data.timestamp) / 60000) + " minutes)")
|
||||
|
||||
if (data.version) {
|
||||
root.latestVersion = data.version;
|
||||
root.latestVersion = data.version
|
||||
}
|
||||
if (data.contributors) {
|
||||
root.contributors = data.contributors;
|
||||
root.contributors = data.contributors
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -82,20 +81,20 @@ Singleton {
|
|||
}
|
||||
|
||||
isFetchingData = true
|
||||
versionProcess.running = true;
|
||||
contributorsProcess.running = true;
|
||||
versionProcess.running = true
|
||||
contributorsProcess.running = true
|
||||
}
|
||||
|
||||
// --------------------------------
|
||||
function saveData() {
|
||||
data.timestamp = Date.now();
|
||||
data.timestamp = Date.now()
|
||||
Qt.callLater(() => {
|
||||
// Access the FileView's writeAdapter method
|
||||
var fileView = root.children.find(child => child.objectName === "githubDataFileView");
|
||||
var fileView = root.children.find(child => child.objectName === "githubDataFileView")
|
||||
if (fileView) {
|
||||
fileView.writeAdapter();
|
||||
fileView.writeAdapter()
|
||||
}
|
||||
});
|
||||
})
|
||||
}
|
||||
|
||||
// --------------------------------
|
||||
|
|
@ -116,26 +115,26 @@ Singleton {
|
|||
stdout: StdioCollector {
|
||||
onStreamFinished: {
|
||||
try {
|
||||
const response = text;
|
||||
const response = text
|
||||
if (response && response.trim()) {
|
||||
const data = JSON.parse(response);
|
||||
const data = JSON.parse(response)
|
||||
if (data.tag_name) {
|
||||
const version = data.tag_name;
|
||||
root.data.version = version;
|
||||
root.latestVersion = version;
|
||||
console.log("[Github] Latest version fetched from GitHub:", version);
|
||||
const version = data.tag_name
|
||||
root.data.version = version
|
||||
root.latestVersion = version
|
||||
console.log("[Github] Latest version fetched from GitHub:", version)
|
||||
} else {
|
||||
console.log("[Github] No tag_name in GitHub response");
|
||||
console.log("[Github] No tag_name in GitHub response")
|
||||
}
|
||||
} else {
|
||||
console.log("[Github] Empty response from GitHub API");
|
||||
console.log("[Github] Empty response from GitHub API")
|
||||
}
|
||||
} catch (e) {
|
||||
console.error("[Github] Failed to parse version:", e);
|
||||
console.error("[Github] Failed to parse version:", e)
|
||||
}
|
||||
|
||||
// Check if both processes are done
|
||||
checkAndSaveData();
|
||||
checkAndSaveData()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -148,25 +147,25 @@ Singleton {
|
|||
stdout: StdioCollector {
|
||||
onStreamFinished: {
|
||||
try {
|
||||
const response = text;
|
||||
const response = text
|
||||
if (response && response.trim()) {
|
||||
const data = JSON.parse(response);
|
||||
root.data.contributors = data || [];
|
||||
root.contributors = root.data.contributors;
|
||||
console.log("[Github] Contributors fetched from GitHub:", root.contributors.length);
|
||||
const data = JSON.parse(response)
|
||||
root.data.contributors = data || []
|
||||
root.contributors = root.data.contributors
|
||||
console.log("[Github] Contributors fetched from GitHub:", root.contributors.length)
|
||||
} else {
|
||||
console.log("[Github] Empty response from GitHub API for contributors");
|
||||
root.data.contributors = [];
|
||||
root.contributors = [];
|
||||
console.log("[Github] Empty response from GitHub API for contributors")
|
||||
root.data.contributors = []
|
||||
root.contributors = []
|
||||
}
|
||||
} catch (e) {
|
||||
console.error("[Github] Failed to parse contributors:", e);
|
||||
root.data.contributors = [];
|
||||
root.contributors = [];
|
||||
console.error("[Github] Failed to parse contributors:", e)
|
||||
root.data.contributors = []
|
||||
root.contributors = []
|
||||
}
|
||||
|
||||
// Check if both processes are done
|
||||
checkAndSaveData();
|
||||
checkAndSaveData()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -175,8 +174,8 @@ Singleton {
|
|||
function checkAndSaveData() {
|
||||
// Only save when both processes are finished
|
||||
if (!versionProcess.running && !contributorsProcess.running) {
|
||||
root.isFetchingData = false;
|
||||
root.saveData();
|
||||
root.isFetchingData = false
|
||||
root.saveData()
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue