Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions Backend.qml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,19 @@ Item {

function searchAsync(data, callback) {
nativeSearch.cancel()
var query = String(data && data.query || "").trim()
var rawQuery = String(data && data.query || "")
var query = rawQuery.trim()
var view = data && data.view
if (query && view && view.kind === "emoji") {
emojiSearch.search(Ranker.transliterate(query.toLowerCase()), "medium", function(matches) {
callback(backend.callSync("rootSearch.search", Object.assign({}, data, { fleaHits: matches })))
})
return
}
if (/^[bB]\s+/.test(rawQuery)) {
callback(backend.callSync("rootSearch.search", data))
return
}
if (!query || (view && view.kind !== "root")) {
callback(backend.callSync("rootSearch.search", data))
return
Expand Down Expand Up @@ -146,7 +151,7 @@ Item {
}

function decorated(id) {
var c = backend.candidatesById[id]
var c = backend.candidatesById[id] || (id && id.indexOf("bookmark:") === 0 && bookmarkSource.candidatesById ? bookmarkSource.candidatesById[id] : null)
return c ? RootSearch.decorate(c, backend.searchContext(), backend.deps) : null
}

Expand Down Expand Up @@ -512,13 +517,18 @@ Item {
return { close: true }
}
backend.recordVisit(id, query)
if (candidate.run.setQuery) return { setQuery: candidate.run.setQuery }
if (candidate.run.push && candidate.run.push.kind === "theme") themeSource.refresh()
if (candidate.run.push) return { push: candidate.run.push }
if (candidate.run.summon) backend.summonPlugin(candidate.run.summon, candidate.run.payload || "{}")
return { close: true }
case "fallback":
Util.execArgv(["omarchy-launch-browser", RootSearch.fallbackUrl(candidate, query)])
return { close: true }
case "bookmark":
backend.recordVisit(id, query)
Util.execArgv(["omarchy-launch-browser", candidate.url])
return { close: true }
case "script":
var script = candidate.script
var args = ScriptCommands.argv(script, (data && data.arguments) || {})
Expand Down Expand Up @@ -548,6 +558,9 @@ Item {
case "copy-id":
clipboard.copy(action === "copy-id" ? candidate.appId + ".desktop" : candidate.action)
return { close: true, hud: "Copied to Clipboard" }
case "copy-url":
clipboard.copy(candidate.url)
return { close: true, hud: "Copied URL to Clipboard" }
case "favorite-add":
case "favorite-remove":
case "favorite-up":
Expand Down Expand Up @@ -669,7 +682,11 @@ Item {
else if (view && view.kind === "calculator-history") sections = RootSearch.historySections(calculatorStore.doc.history, query, ctx.nowMs, Calculator.filterHistory)
else {
ctx.filter = String(data && data.filter || "all")
if (query.trim() && ctx.filter === "all") ctx.calculation = backend.calculate(query)
if (/^[bB]\s+/.test(query)) {
ctx.bookmarks = bookmarkSource.candidates
} else if (query.trim() && ctx.filter === "all") {
ctx.calculation = backend.calculate(query)
}
sections = RootSearch.rootSections(backend.candidates, query, ctx, backend.deps)
}
if (view && view.kind === "emoji") return sections
Expand Down Expand Up @@ -901,6 +918,10 @@ Item {
onMessage: function(level, text, metadata) { backend.log(level, "script-commands", text, metadata) }
}

BookmarkSource {
id: bookmarkSource
}

// Launcher.qml shows the result as a toast while the window is open, else a HUD.
ScriptRunner {
id: scriptRunner
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ web searches at the end. `Ctrl+P` filters the root to All, Applications or Comma
**Omarchy Menu** opens the whole menu.
- **Web search.** **Search Google** and **Search DuckDuckGo** (alias `ddg`) take a query in an argument pill:
`Tab` into it, type, `↵`.
- **Browser bookmarks.** Type `b ` (or `b <query>`) to search and open your browser bookmarks (Brave, Chrome,
Chromium, Vivaldi, Edge). Bookmarks update automatically as you add or edit them in your browser. `↵` opens
the bookmark in your browser, and `Ctrl+Shift+C` copies the URL.
- **Confirmations.** Shut Down, Restart, Log Out and Delete All Entries ask first (`↵` confirms, `Esc`
cancels).
- **Feedback.** Results show toasts in the footer (`Ctrl+T` opens their actions, such as Undo after disabling a
Expand Down
129 changes: 129 additions & 0 deletions core/Bookmarks.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
// Browser Bookmarks provider for omacast (Chromium-family: Brave, Chrome, Chromium, Vivaldi, Edge)

function cleanUrl(url) {
return String(url || "")
.replace(/^https?:\/\//i, "")
.replace(/^www\./i, "")
.replace(/\/$/, "")
}

function extractDomain(url) {
try {
var match = String(url || "").match(/^https?:\/\/(?:www\.)?([^\/:]+)/i)
if (match && match[1]) {
var host = match[1].toLowerCase()
var parts = host.split(".")
if (parts.length >= 2) {
var sld = parts[parts.length - 2]
if (parts.length >= 3 && ["co", "com", "gov", "edu", "org", "net"].indexOf(sld) >= 0) {
return parts[parts.length - 3]
}
return sld
}
return host
}
} catch (e) {}
return ""
}

function parseBookmarks(jsonText, browserName) {
if (!jsonText || typeof jsonText !== "string") return []
var data
try {
data = JSON.parse(jsonText)
} catch (e) {
return []
}
var list = []
function walk(node, folderPath) {
if (!node) return
var currentFolder = folderPath
if (node.type === "folder" && node.name) {
currentFolder = folderPath ? folderPath + " › " + node.name : node.name
}
if (node.type === "url" && node.url && node.name) {
list.push({
title: node.name,
url: node.url,
folder: currentFolder || "",
browser: browserName || "Browser"
})
}
if (node.children && Array.isArray(node.children)) {
for (var i = 0; i < node.children.length; i++) {
walk(node.children[i], currentFolder)
}
}
}
if (data.roots) {
for (var key in data.roots) {
walk(data.roots[key], "")
}
}
return list
}

function candidate(item) {
var title = String(item.title || item.url || "Untitled Bookmark").trim()
var url = String(item.url || "").trim()
var clean = cleanUrl(url)
var domain = extractDomain(url)
var browser = item.browser || "Browser"
var alternates = []
if (domain && domain.toLowerCase() !== title.toLowerCase()) alternates.push(domain)
if (clean && clean !== title) alternates.push(clean)

var subtitle = clean
if (item.folder) subtitle = item.folder + " · " + clean

return {
id: "bookmark:" + url,
type: "quicklink",
kind: "bookmark",
title: title,
subtitle: subtitle,
url: url,
alternateTitles: alternates,
keywords: [],
typeLabel: "Bookmark",
glyph: "\uf02e", // nf-fa-bookmark 
glyphFont: "",
rootSearch: { when: "searching" }
}
}

function candidates(jsonText, browserName) {
var items = parseBookmarks(jsonText, browserName)
var seen = {}
var out = []
for (var i = 0; i < items.length; i++) {
var item = items[i]
if (!item.url || seen[item.url]) continue
seen[item.url] = true
out.push(candidate(item))
}
return out
}

function knownPaths(configDir) {
var base = String(configDir || "").replace(/\/$/, "")
return [
{ browser: "Brave", path: base + "/BraveSoftware/Brave-Browser/Default/Bookmarks" },
{ browser: "Chrome", path: base + "/google-chrome/Default/Bookmarks" },
{ browser: "Chromium", path: base + "/chromium/Default/Bookmarks" },
{ browser: "Vivaldi", path: base + "/vivaldi/Default/Bookmarks" },
{ browser: "Edge", path: base + "/microsoft-edge/Default/Bookmarks" },
{ browser: "Opera", path: base + "/opera/Bookmarks" }
]
}

if (typeof module !== "undefined" && module.exports) {
module.exports = {
cleanUrl: cleanUrl,
extractDomain: extractDomain,
parseBookmarks: parseBookmarks,
candidate: candidate,
candidates: candidates,
knownPaths: knownPaths
}
}
47 changes: 43 additions & 4 deletions core/RootSearch.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ function webSearch(fallback, keywords) {
var BUILTINS = [
webSearch(FALLBACKS[0], []),
webSearch(FALLBACKS[1], ["ddg"]),
{
id: "builtin:browser-bookmarks",
title: "Search Browser Bookmarks",
subtitle: "Type “b <query>” to search",
glyph: "",
keywords: ["b", "bookmark", "bookmarks", "browser", "brave", "chrome", "history"],
alias: "b",
run: { setQuery: "b " },
rootSearch: { when: "searching" }
},
{
id: "builtin:omarchy-menu",
title: "Omarchy Menu",
Expand Down Expand Up @@ -306,17 +316,43 @@ function passesFilter(candidate, filter) {
}

function rootSections(candidates, query, ctx, deps) {
var q = String(query || "").trim()
var rawQ = String(query || "")
var q = rawQ.trim()
var filtered = ctx.filter && ctx.filter !== "all"
var opts = rankOptions(ctx)

// Handle "b " or "B " prefix for Browser Bookmarks search
if (/^[bB]\s+/.test(rawQ)) {
var bQuery = rawQ.replace(/^[bB]\s+/, "").trim()
var rawBookmarks = (ctx && ctx.bookmarks) ? ctx.bookmarks : candidates.filter(function(c) { return c.kind === "bookmark" })
var bResults = []
if (bQuery) {
bResults = deps.Ranker.rank(rawBookmarks, bQuery, opts)
} else {
bResults = rawBookmarks.slice(0, 50).map(function(c) { return { candidate: c, record: null } })
}
var bSections = []
if (bResults.length > 0) {
bSections.push({
id: "bookmarks",
title: "Browser Bookmarks" + (bQuery ? " · “" + bQuery + "”" : ""),
rows: bResults
})
}
if (bQuery) {
bSections.push({ id: "fallback-commands", title: "Search web for “" + bQuery + "”…", rows: fallbackRows(bQuery) })
}
return bSections
}

var decorated = []
for (var i = 0; i < candidates.length; i++) {
if (!isEnabled(candidates[i], ctx) || !passesFilter(candidates[i], ctx.filter)) continue
if (!isEnabled(candidates[i], ctx) || !passesFilter(candidates[i], ctx.filter) || candidates[i].kind === "bookmark") continue
decorated.push(decorate(candidates[i], ctx, deps))
}
var opts = rankOptions(ctx)

if (q) {
var searchable = decorated.filter(function(c) { return c.rootSearch.when !== "empty" })
var searchable = decorated.filter(function(c) { return c.rootSearch.when !== "empty" && c.kind !== "bookmark" })
var results = deps.Ranker.rank(searchable, q, opts)
var sections = []
if (ctx.calculation && !filtered) sections.push({ id: "calculator", title: "Calculator", rows: [{ candidate: calculatorCandidate(ctx.calculation), record: null }] })
Expand Down Expand Up @@ -389,12 +425,15 @@ function actionsFor(candidate) {
case "omarchy-link": primary = { id: "open", title: "Open Menu", icon: "" }; break
case "fallback": primary = { id: "open", title: candidate.title, icon: "" }; break
case "script": primary = { id: "open", title: "Run Script", icon: "\uf120" }; break
case "bookmark": primary = { id: "open", title: "Open in Browser", icon: "" }; break
default: primary = { id: "open", title: "Open Command", icon: "" }
}
primary.shortcut = "↵"
primary.section = "primary"
list.push(primary)

if (candidate.kind === "bookmark") list.push({ id: "copy-url", title: "Copy URL", shortcut: "Ctrl Shift C", section: "copy", icon: "" })

if (candidate.kind && candidate.kind.indexOf("omarchy-") === 0)
list.push({ id: "open-in-omarchy-menu", title: "Open in Omarchy Menu", shortcut: "Ctrl ↵", section: "primary", icon: "" })
if (candidate.kind === "fallback") return list
Expand Down
76 changes: 76 additions & 0 deletions services/BookmarkSource.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
import QtQuick
import Quickshell
import Quickshell.Io
import "../core/Bookmarks.js" as Bookmarks

Item {
id: source

property var candidates: []
property var candidatesById: ({})
property int revision: 0
property string bookmarksPath: ""
property string configDir: (Quickshell.env("XDG_CONFIG_HOME") || (Quickshell.env("HOME") + "/.config"))
readonly property string effectivePath: bookmarksPath ? bookmarksPath : activePath
property string activePath: ""
property string activeBrowser: ""

Component.onCompleted: {
if (!bookmarksPath) scanner.running = true
}

Process {
id: scanner
command: ["bash", "-c",
'cfg="' + source.configDir + '"; ' +
'for p in ' +
'"$cfg/BraveSoftware/Brave-Browser/Default/Bookmarks:Brave" ' +
'"$cfg/google-chrome/Default/Bookmarks:Chrome" ' +
'"$cfg/chromium/Default/Bookmarks:Chromium" ' +
'"$cfg/vivaldi/Default/Bookmarks:Vivaldi" ' +
'"$cfg/microsoft-edge/Default/Bookmarks:Edge"; do ' +
' f="${p%%:*}"; b="${p##*:}"; ' +
' if [[ -f "$f" ]]; then printf "%s:%s\\n" "$f" "$b"; break; fi; ' +
'done; :'
]
stdout: StdioCollector {
onStreamFinished: {
var line = text.trim()
if (line) {
var idx = line.lastIndexOf(":")
if (idx > 0) {
source.activePath = line.slice(0, idx)
source.activeBrowser = line.slice(idx + 1)
}
}
}
}
}

FileView {
id: fileView
path: source.effectivePath
watchChanges: true
printErrors: false
onFileChanged: reload()
onLoaded: {
try {
var raw = text()
var list = Bookmarks.candidates(raw, source.activeBrowser)
var map = ({})
for (var i = 0; i < list.length; i++) {
map[list[i].id] = list[i]
}
source.candidates = list
source.candidatesById = map
source.revision++
} catch (e) {
// Ignored unreadable bookmarks
}
}
onLoadFailed: function(error) {
source.candidates = []
source.candidatesById = ({})
}
}
}
Loading