dan/eufon
1
0
Fork 0
Code Issues Pull Requests Releases Activity

saturn: Sort apps by name

Browse Source 
All of this done through using Lists from penlight
This commit is contained in:
Samuel Dionne-Riel 2022-01-25 00:47:00 -05:00 committed by Daniel Barlow
parent 3574f3930f
commit 8af2a7de45
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
saturn/main.fnl
View File

@ -91,6 +91,7 @@
(local inifile (require :inifile)) (local inifile (require :inifile))
(local List (require "pl.List")) (local List (require "pl.List"))
(local stringx (require "pl.stringx")) (local stringx (require "pl.stringx"))
(local tablex (require "pl.tablex"))
(local inspect (require :inspect)) (local inspect (require :inspect))
(local posix (require :posix)) (local posix (require :posix))
@ -185,19 +186,26 @@
)) ))
(fn all-apps [] (fn all-apps []
;; Each desktop entry representing an application is identified
;; by its desktop file ID, which is based on its filename.
;; — https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#desktop-file-id
"Provides apps in a List, sorted by name"
(var apps-table {}) (var apps-table {})
;; Reversing the data dirs gives priority to the first elements. ;; Reversing the data dirs gives priority to the first elements.
;; This means conflicting `.desktop` files (or: desktop file ID) are given ;; This means conflicting `.desktop` files (or: desktop file ID) are given
;; priority to the first elements by "simply" reading it last. ;; priority to the first elements by "simply" reading it last.
(each [path (List.iter (List.reverse (xdg-data-dirs)))] (each [path (List.iter (List.reverse (xdg-data-dirs)))]
(let [apps (.. path "/applications/")] (let [apps-dir (.. path "/applications/")]
(when (lfs.attributes apps) (when (lfs.attributes apps-dir)
(each [f (lfs.dir apps)] (each [f (lfs.dir apps-dir)]
(when (= (f:sub -8) ".desktop") (when (= (f:sub -8) ".desktop")
(let [attrs (read-desktop-file (.. apps f))] (let [attrs (read-desktop-file (.. apps-dir f))]
(when (not attrs.NoDisplay) (when (not attrs.NoDisplay)
(tset apps-table attrs.Name attrs)))))))) (tset apps-table attrs.ID attrs))))))))
apps-table) ;; We have a table indexed by IDs, we don't care about the indexing.
;; Make a List and sort it by name.
(List.sort (List (tablex.values apps-table))
(fn [a b] (< (string.upper a.Name) (string.upper b.Name)))))
;; Exec entries in desktop files may contain %u %f and other characters ;; Exec entries in desktop files may contain %u %f and other characters
;; in which the launcher is supposed to interpolate filenames/urls etc. ;; in which the launcher is supposed to interpolate filenames/urls etc.
@ -266,7 +274,7 @@
:row_spacing 5 :row_spacing 5
}) })
scrolled-window (Gtk.ScrolledWindow {})] scrolled-window (Gtk.ScrolledWindow {})]
(each [_ app (pairs (all-apps))] (each [app (List.iter (all-apps))]
(grid:insert (button-for app) -1)) (grid:insert (button-for app) -1))
(scrolled-window:add grid) (scrolled-window:add grid)
(window:add scrolled-window)) (window:add scrolled-window))