Autoformating
This commit is contained in:
LemmyCook
parent
18484f6686
commit
cb554f106b
15 changed files with 170 additions and 103 deletions
|
|
@ -37,9 +37,9 @@ Singleton {
|
|||
Process {
|
||||
id: process
|
||||
stdinEnabled: true
|
||||
running: (Settings.data.audio.visualizerType !== "none") && (PanelService.sidePanel.active
|
||||
|| Settings.data.audio.showMiniplayerCava
|
||||
|| (PanelService.lockScreen && PanelService.lockScreen.active))
|
||||
running: (Settings.data.audio.visualizerType !== "none")
|
||||
&& (PanelService.sidePanel.active || Settings.data.audio.showMiniplayerCava
|
||||
|| (PanelService.lockScreen && PanelService.lockScreen.active))
|
||||
command: ["cava", "-p", "/dev/stdin"]
|
||||
onExited: {
|
||||
stdinEnabled = true
|
||||
|
|
|
|||
|
|
@ -34,7 +34,8 @@ Singleton {
|
|||
|
||||
// Start/stop watchers when enabled changes
|
||||
Component.onCompleted: {
|
||||
if (root.active) startWatchers()
|
||||
if (root.active)
|
||||
startWatchers()
|
||||
}
|
||||
onActiveChanged: {
|
||||
if (root.active) {
|
||||
|
|
@ -64,30 +65,40 @@ Singleton {
|
|||
const lines = out.split('\n').filter(l => l.length > 0)
|
||||
// cliphist list default format: "<id> <preview>" or "<id>\t<preview>"
|
||||
const parsed = lines.map(l => {
|
||||
let id = ""
|
||||
let preview = ""
|
||||
const m = l.match(/^(\d+)\s+(.+)$/)
|
||||
if (m) {
|
||||
id = m[1]
|
||||
preview = m[2]
|
||||
} else {
|
||||
const tab = l.indexOf('\t')
|
||||
id = tab > -1 ? l.slice(0, tab) : l
|
||||
preview = tab > -1 ? l.slice(tab + 1) : ""
|
||||
}
|
||||
const lower = preview.toLowerCase()
|
||||
const isImage = lower.startsWith("[image]") || lower.includes(" binary data ")
|
||||
// Best-effort mime guess from preview
|
||||
var mime = "text/plain"
|
||||
if (isImage) {
|
||||
if (lower.includes(" png")) mime = "image/png"
|
||||
else if (lower.includes(" jpg") || lower.includes(" jpeg")) mime = "image/jpeg"
|
||||
else if (lower.includes(" webp")) mime = "image/webp"
|
||||
else if (lower.includes(" gif")) mime = "image/gif"
|
||||
else mime = "image/*"
|
||||
}
|
||||
return { id, preview, isImage, mime }
|
||||
})
|
||||
let id = ""
|
||||
let preview = ""
|
||||
const m = l.match(/^(\d+)\s+(.+)$/)
|
||||
if (m) {
|
||||
id = m[1]
|
||||
preview = m[2]
|
||||
} else {
|
||||
const tab = l.indexOf('\t')
|
||||
id = tab > -1 ? l.slice(0, tab) : l
|
||||
preview = tab > -1 ? l.slice(tab + 1) : ""
|
||||
}
|
||||
const lower = preview.toLowerCase()
|
||||
const isImage = lower.startsWith("[image]") || lower.includes(" binary data ")
|
||||
// Best-effort mime guess from preview
|
||||
var mime = "text/plain"
|
||||
if (isImage) {
|
||||
if (lower.includes(" png"))
|
||||
mime = "image/png"
|
||||
else if (lower.includes(" jpg") || lower.includes(" jpeg"))
|
||||
mime = "image/jpeg"
|
||||
else if (lower.includes(" webp"))
|
||||
mime = "image/webp"
|
||||
else if (lower.includes(" gif"))
|
||||
mime = "image/gif"
|
||||
else
|
||||
mime = "image/*"
|
||||
}
|
||||
return {
|
||||
"id": id,
|
||||
"preview": preview,
|
||||
"isImage": isImage,
|
||||
"mime": mime
|
||||
}
|
||||
})
|
||||
items = parsed
|
||||
loading = false
|
||||
}
|
||||
|
|
@ -99,7 +110,11 @@ Singleton {
|
|||
onExited: (exitCode, exitStatus) => {
|
||||
const out = String(stdout.text)
|
||||
if (root._decodeCallback) {
|
||||
try { root._decodeCallback(out) } finally { root._decodeCallback = null }
|
||||
try {
|
||||
root._decodeCallback(out)
|
||||
} finally {
|
||||
root._decodeCallback = null
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -117,7 +132,11 @@ Singleton {
|
|||
const b64 = String(stdout.text).trim()
|
||||
if (root._b64CurrentCb) {
|
||||
const url = `data:${root._b64CurrentMime};base64,${b64}`
|
||||
try { root._b64CurrentCb(url) } finally { /* noop */ }
|
||||
try {
|
||||
root._b64CurrentCb(url)
|
||||
} finally {
|
||||
|
||||
/* noop */ }
|
||||
}
|
||||
if (root._b64CurrentId !== "") {
|
||||
root.imageDataById[root._b64CurrentId] = `data:${root._b64CurrentMime};base64,${b64}`
|
||||
|
|
@ -136,19 +155,26 @@ Singleton {
|
|||
stdout: StdioCollector {}
|
||||
onExited: (exitCode, exitStatus) => {
|
||||
// Auto-restart if watcher dies
|
||||
if (root.autoWatch) Qt.callLater(() => { running = true })
|
||||
if (root.autoWatch)
|
||||
Qt.callLater(() => {
|
||||
running = true
|
||||
})
|
||||
}
|
||||
}
|
||||
Process {
|
||||
id: watchImage
|
||||
stdout: StdioCollector {}
|
||||
onExited: (exitCode, exitStatus) => {
|
||||
if (root.autoWatch) Qt.callLater(() => { running = true })
|
||||
if (root.autoWatch)
|
||||
Qt.callLater(() => {
|
||||
running = true
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function startWatchers() {
|
||||
if (!root.active || !autoWatch || watchersStarted) return
|
||||
if (!root.active || !autoWatch || watchersStarted)
|
||||
return
|
||||
watchersStarted = true
|
||||
// Start text watcher
|
||||
watchText.command = ["wl-paste", "--type", "text", "--watch", "cliphist", "store"]
|
||||
|
|
@ -159,15 +185,19 @@ Singleton {
|
|||
}
|
||||
|
||||
function stopWatchers() {
|
||||
if (!watchersStarted) return
|
||||
if (!watchersStarted)
|
||||
return
|
||||
watchText.running = false
|
||||
watchImage.running = false
|
||||
watchersStarted = false
|
||||
}
|
||||
|
||||
function list(maxPreviewWidth) {
|
||||
if (!root.active) { return }
|
||||
if (listProc.running) return
|
||||
if (!root.active) {
|
||||
return
|
||||
}
|
||||
if (listProc.running)
|
||||
return
|
||||
loading = true
|
||||
const width = maxPreviewWidth || 100
|
||||
listProc.command = ["cliphist", "list", "-preview-width", String(width)]
|
||||
|
|
@ -183,18 +213,24 @@ Singleton {
|
|||
function decodeToDataUrl(id, mime, cb) {
|
||||
// If cached, return immediately
|
||||
if (root.imageDataById[id]) {
|
||||
if (cb) cb(root.imageDataById[id])
|
||||
if (cb)
|
||||
cb(root.imageDataById[id])
|
||||
return
|
||||
}
|
||||
// Queue request; ensures single process handles sequentially
|
||||
root._b64Queue.push({ id, mime: mime || "image/*", cb })
|
||||
root._b64Queue.push({
|
||||
"id": id,
|
||||
"mime": mime || "image/*",
|
||||
"cb": cb
|
||||
})
|
||||
if (!decodeB64Proc.running && root._b64CurrentCb === null) {
|
||||
_startNextB64()
|
||||
}
|
||||
}
|
||||
|
||||
function _startNextB64() {
|
||||
if (root._b64Queue.length === 0) return
|
||||
if (root._b64Queue.length === 0)
|
||||
return
|
||||
const job = root._b64Queue.shift()
|
||||
root._b64CurrentCb = job.cb
|
||||
root._b64CurrentMime = job.mime
|
||||
|
|
@ -219,5 +255,3 @@ Singleton {
|
|||
Qt.callLater(() => list())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -131,6 +131,7 @@ Singleton {
|
|||
}
|
||||
}
|
||||
} catch (e2) {
|
||||
|
||||
// ignore occupancy errors; fall back to false
|
||||
}
|
||||
for (var i = 0; i < hlWorkspaces.length; i++) {
|
||||
|
|
@ -284,10 +285,10 @@ Singleton {
|
|||
} else if (event.WindowOpenedOrChanged) {
|
||||
try {
|
||||
const windowData = event.WindowOpenedOrChanged.window
|
||||
|
||||
|
||||
// Find if this window already exists
|
||||
const existingIndex = windows.findIndex(w => w.id === windowData.id)
|
||||
|
||||
|
||||
const newWindow = {
|
||||
"id": windowData.id,
|
||||
"title": windowData.title || "",
|
||||
|
|
@ -295,7 +296,7 @@ Singleton {
|
|||
"workspaceId": windowData.workspace_id || null,
|
||||
"isFocused": windowData.is_focused === true
|
||||
}
|
||||
|
||||
|
||||
if (existingIndex >= 0) {
|
||||
// Update existing window
|
||||
windows[existingIndex] = newWindow
|
||||
|
|
@ -304,14 +305,14 @@ Singleton {
|
|||
windows.push(newWindow)
|
||||
windows.sort((a, b) => a.id - b.id)
|
||||
}
|
||||
|
||||
|
||||
// Update focused window index if this window is focused
|
||||
if (newWindow.isFocused) {
|
||||
focusedWindowIndex = windows.findIndex(w => w.id === windowData.id)
|
||||
updateFocusedWindowTitle()
|
||||
activeWindowChanged()
|
||||
}
|
||||
|
||||
|
||||
windowListChanged()
|
||||
} catch (e) {
|
||||
Logger.error("Compositor", "Error parsing WindowOpenedOrChanged event:", e)
|
||||
|
|
@ -319,7 +320,7 @@ Singleton {
|
|||
} else if (event.WindowClosed) {
|
||||
try {
|
||||
const windowId = event.WindowClosed.id
|
||||
|
||||
|
||||
// Remove the window from the list
|
||||
const windowIndex = windows.findIndex(w => w.id === windowId)
|
||||
if (windowIndex >= 0) {
|
||||
|
|
@ -329,15 +330,15 @@ Singleton {
|
|||
updateFocusedWindowTitle()
|
||||
activeWindowChanged()
|
||||
}
|
||||
|
||||
|
||||
// Remove the window
|
||||
windows.splice(windowIndex, 1)
|
||||
|
||||
|
||||
// Adjust focused window index if needed
|
||||
if (focusedWindowIndex > windowIndex) {
|
||||
focusedWindowIndex--
|
||||
}
|
||||
|
||||
|
||||
windowListChanged()
|
||||
}
|
||||
} catch (e) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue