Update flake and catch up with recent AGS changes

* Mpris: Add MprisPlayer.metadata

* App: Add FFI get and set methods for cursorTheme, iconTheme, gtkTheme

Author: postsolar

flake.lock

@@ -1,3 +1,21 @@
+// Props
+
+export const iconTheme =
+  () =>
+    App.iconTheme
+
+export const cursorTheme =
+  () =>
+    App.cursorTheme
+
+export const gtkTheme =
+  () =>
+    App.gtkTheme
+
+export const configPath =
+  () =>
+    App.configPath
+
 export const configDir =
   () =>
     App.configDir
@@ -6,6 +24,8 @@ export const windows =
   () =>
     App.windows
 
+// Signals
+
 export const disconnectApp =
   handlerID => () =>
     App.disconnect(handlerID)
@@ -14,6 +34,24 @@ export const connectApp =
   signal => handler => () =>
     App.connect(signal, (_, ...args) => handler(...args))
 
+// Methods
+
+export const addIcons =
+  path => () =>
+    App.addIcons(path)
+
+export const setIconTheme =
+  theme => () =>
+    App.iconTheme = theme
+
+export const setCursorTheme =
+  theme => () =>
+    App.cursorTheme = theme
+
+export const setGtkTheme =
+  theme => () =>
+    App.gtkTheme = theme
+
 export const addWindow =
   window => () =>
     App.addWindow(window)

src/AGS/Service/App.js

@@ -28,6 +28,10 @@ foreign import data App ∷ Service
 
 -- * Props
 
+foreign import iconTheme ∷ Effect String
+foreign import cursorTheme ∷ Effect String
+foreign import gtkTheme ∷ Effect String
+foreign import configPath ∷ Effect String
 foreign import configDir ∷ Effect String
 foreign import windows ∷ Effect (Array Window)
 
@@ -45,6 +49,12 @@ foreign import connectApp ∷ ∀ f. String → f → Effect (HandlerID App)
 
 -- * Methods
 
+foreign import addIcons ∷ String → Effect Unit
+
+foreign import setIconTheme ∷ String → Effect Unit
+foreign import setCursorTheme ∷ String → Effect Unit
+foreign import setGtkTheme ∷ String → Effect Unit
+
 foreign import addWindow ∷ Window → Effect Unit
 foreign import removeWindow ∷ Window → Effect Unit
 

src/AGS/Service/App.purs

@@ -6,6 +6,8 @@ module AGS.Service.Mpris
   , BusName
   , Player
   , PlayerRecord
+  , MprisMetadata
+  , MprisMetadataF
   , fromPlayer
   , playPause
   , play
@@ -25,7 +27,11 @@ import Data.Nullable (Nullable, toMaybe)
 import Effect (Effect)
 import Effect.Uncurried (EffectFn1, EffectFn2)
 import GObject (class GObjectSignal, HandlerID, unsafeConnect)
+import Record as R
+import Record.Studio.MapKind (mapRecordKind)
+import Type.Proxy (Proxy(..))
 import Unsafe.Coerce (unsafeCoerce)
+import Untagged.Union (UndefinedOr, uorToMaybe)
 
 -- *** Mpris
 
@@ -88,6 +94,7 @@ type PlayerRecord =
   , "cover-path" ∷ String
   , entry ∷ String
   , identity ∷ String
+  , metadata ∷ MprisMetadata
   , length ∷ Int
   , "loop-status" ∷ Nullable Boolean
   , name ∷ String
@@ -97,17 +104,48 @@ type PlayerRecord =
   , "track-artists" ∷ Array String
   , "track-cover-url" ∷ String
   , "track-title" ∷ String
+  , "track-album" ∷ String
   , trackid ∷ String
   , volume ∷ Int
   }
 
 foreign import data Player ∷ Type
 
+type MprisMetadata = MprisMetadataF Maybe
+
+type MprisMetadataF f =
+  { "mpris:trackid" ∷ f String
+  , "mpris:length" ∷ f Number
+  , "mpris:artUrl" ∷ f String
+  , "xesam:album" ∷ f String
+  , "xesam:albumArtist" ∷ f String
+  , "xesam:artist" ∷ f (Array String)
+  , "xesam:asText" ∷ f String
+  , "xesam:audioBPM" ∷ f Number
+  , "xesam:autoRating" ∷ f Number
+  , "xesam:comment" ∷ f (Array String)
+  , "xesam:composer" ∷ f (Array String)
+  , "xesam:contentCreated" ∷ f String
+  , "xesam:discNumber" ∷ f Number
+  , "xesam:firstUsed" ∷ f String
+  , "xesam:genre" ∷ f (Array String)
+  , "xesam:lastUsed" ∷ f String
+  , "xesam:lyricist" ∷ f (Array String)
+  , "xesam:title" ∷ f String
+  , "xesam:trackNumber" ∷ f Number
+  , "xesam:url" ∷ f String
+  , "xesam:useCount" ∷ f Number
+  , "xesam:userRating" ∷ f Number
+  }
+
+fromForeignMetadata ∷ MprisMetadataF UndefinedOr → MprisMetadata
+fromForeignMetadata = mapRecordKind uorToMaybe
+
 -- * Props and bindings
 
 -- | Convert a `Player` to a record.
 fromPlayer ∷ Player → PlayerRecord
-fromPlayer = unsafeCoerce
+fromPlayer = R.modify (Proxy @"metadata") fromForeignMetadata <<< unsafeCoerce
 
 -- the dbus name that starts with org.mpris.MediaPlayer2
 instance BindProp Player "bus-name" String where
@@ -131,6 +169,9 @@ instance BindProp Player "trackid" String where
 instance BindProp Player "track-artists" (Array String) where
   bindProp o = unsafeBindProp @"track-artists" o
 
+instance BindProp Player "track-album" String where
+  bindProp o = unsafeBindProp @"track-album" o
+
 instance BindProp Player "track-title" String where
   bindProp o = unsafeBindProp @"track-title" o