First sketch of a Rust re-implementation.
This commit is contained in:
parent
890c19f1dc
commit
af21756cef
4 changed files with 486 additions and 1 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -1 +1,5 @@
|
|||
build/
|
||||
build/
|
||||
|
||||
# Added by cargo
|
||||
|
||||
/target
|
||||
|
|
|
|||
244
Cargo.lock
generated
Normal file
244
Cargo.lock
generated
Normal file
|
|
@ -0,0 +1,244 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 4
|
||||
|
||||
[[package]]
|
||||
name = "anstream"
|
||||
version = "0.6.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"anstyle-parse",
|
||||
"anstyle-query",
|
||||
"anstyle-wincon",
|
||||
"colorchoice",
|
||||
"is_terminal_polyfill",
|
||||
"utf8parse",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstyle"
|
||||
version = "1.0.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-parse"
|
||||
version = "0.2.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
|
||||
dependencies = [
|
||||
"utf8parse",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-query"
|
||||
version = "1.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
|
||||
dependencies = [
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-wincon"
|
||||
version = "3.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"once_cell_polyfill",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.42"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.42"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
"clap_lex",
|
||||
"strsim",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.5.41"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.7.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
|
||||
|
||||
[[package]]
|
||||
name = "colorchoice"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
|
||||
[[package]]
|
||||
name = "is_terminal_polyfill"
|
||||
version = "1.70.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
|
||||
|
||||
[[package]]
|
||||
name = "joyful"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell_polyfill"
|
||||
version = "1.70.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.104"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
|
||||
|
||||
[[package]]
|
||||
name = "utf8parse"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.59.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
|
||||
dependencies = [
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||
7
Cargo.toml
Normal file
7
Cargo.toml
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
[package]
|
||||
name = "joyful"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
clap = { version = "4.5.42", features = ["derive"] }
|
||||
230
src/main.rs
Normal file
230
src/main.rs
Normal file
|
|
@ -0,0 +1,230 @@
|
|||
use clap::Parser;
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(version, about, long_about = None)]
|
||||
struct Args {
|
||||
#[arg(short, long, default_value = "~/.config/joyful/")]
|
||||
config: String,
|
||||
|
||||
#[arg(short, long)]
|
||||
debug: bool,
|
||||
|
||||
#[arg(long, default_value_t = 100)]
|
||||
tts_volume: u8,
|
||||
|
||||
#[arg(long, default_value_t = 50)]
|
||||
tts_pitch: u8,
|
||||
|
||||
#[arg(long, default_value_t = 50)]
|
||||
tts_range: u8,
|
||||
|
||||
#[arg(long, default_value_t = 175)]
|
||||
tts_speed: u8,
|
||||
|
||||
#[arg(long, default_value = "en")]
|
||||
tts_voice: String,
|
||||
}
|
||||
|
||||
fn main() {
|
||||
// Parse Command-line
|
||||
let args = Args::parse();
|
||||
|
||||
// Parse configs
|
||||
|
||||
// Initialize TTS
|
||||
|
||||
// Create Virtual Devices
|
||||
|
||||
// Create Physical Devices
|
||||
|
||||
// Create Rules
|
||||
|
||||
// Create listening threads?
|
||||
|
||||
// Loop: Parse Input
|
||||
}
|
||||
|
||||
// package main
|
||||
|
||||
// import (
|
||||
// "context"
|
||||
// "fmt"
|
||||
// "os"
|
||||
// "strings"
|
||||
// "sync"
|
||||
|
||||
// "github.com/holoplot/go-evdev"
|
||||
// flag "github.com/spf13/pflag"
|
||||
|
||||
// "git.annabunches.net/annabunches/joyful/internal/config"
|
||||
// "git.annabunches.net/annabunches/joyful/internal/logger"
|
||||
// "git.annabunches.net/annabunches/joyful/internal/mappingrules"
|
||||
// "git.annabunches.net/annabunches/joyful/internal/virtualdevice"
|
||||
// )
|
||||
|
||||
// func getConfigDir(dir string) string {
|
||||
// configDir := strings.ReplaceAll(dir, "~", "${HOME}")
|
||||
// return os.ExpandEnv(configDir)
|
||||
// }
|
||||
|
||||
// func readConfig(configDir string) *config.ConfigParser {
|
||||
// parser := &config.ConfigParser{}
|
||||
// err := parser.Parse(configDir)
|
||||
// logger.FatalIfError(err, "Failed to parse config")
|
||||
// return parser
|
||||
// }
|
||||
|
||||
// func initVirtualBuffers(config *config.ConfigParser) (map[string]*virtualdevice.EventBuffer, map[*evdev.InputDevice]*virtualdevice.EventBuffer) {
|
||||
// vDevices := config.CreateVirtualDevices()
|
||||
// if len(vDevices) == 0 {
|
||||
// logger.Log("Warning: no virtual devices found in configuration. No rules will work.")
|
||||
// }
|
||||
|
||||
// vBuffersByName := make(map[string]*virtualdevice.EventBuffer)
|
||||
// vBuffersByDevice := make(map[*evdev.InputDevice]*virtualdevice.EventBuffer)
|
||||
// for name, device := range vDevices {
|
||||
// vBuffersByName[name] = virtualdevice.NewEventBuffer(device)
|
||||
// vBuffersByDevice[device] = vBuffersByName[name]
|
||||
// }
|
||||
// return vBuffersByName, vBuffersByDevice
|
||||
// }
|
||||
|
||||
// // Extracts the evdev devices from a list of virtual buffers and returns them.
|
||||
// func getVirtualDevices(buffers map[string]*virtualdevice.EventBuffer) map[string]*evdev.InputDevice {
|
||||
// devices := make(map[string]*evdev.InputDevice)
|
||||
// for name, buffer := range buffers {
|
||||
// devices[name] = buffer.Device.(*evdev.InputDevice)
|
||||
// }
|
||||
// return devices
|
||||
// }
|
||||
|
||||
// func initPhysicalDevices(config *config.ConfigParser) map[string]*evdev.InputDevice {
|
||||
// pDeviceMap := config.ConnectPhysicalDevices()
|
||||
// if len(pDeviceMap) == 0 {
|
||||
// logger.Log("Warning: no physical devices found in configuration. No rules will work.")
|
||||
// }
|
||||
// return pDeviceMap
|
||||
// }
|
||||
|
||||
// func main() {
|
||||
// // parse command-line
|
||||
// var configFlag string
|
||||
// flag.BoolVarP(&logger.IsDebugMode, "debug", "d", false, "Output very verbose debug messages.")
|
||||
// flag.StringVarP(&configFlag, "config", "c", "~/.config/joyful", "Directory to read configuration from.")
|
||||
// ttsOps := addTTSFlags()
|
||||
// flag.Parse()
|
||||
|
||||
// // parse configs
|
||||
// configDir := getConfigDir(configFlag)
|
||||
// config := readConfig(configDir)
|
||||
|
||||
// // initialize TTS
|
||||
// tts, err := newTTS(ttsOps)
|
||||
// logger.LogIfError(err, "Failed to initialize TTS")
|
||||
|
||||
// // Initialize virtual devices with event buffers
|
||||
// vBuffersByName, vBuffersByDevice := initVirtualBuffers(config)
|
||||
|
||||
// // Initialize physical devices
|
||||
// pDevices := initPhysicalDevices(config)
|
||||
|
||||
// // Load the rules
|
||||
// rules, eventChannel, cancel, wg := loadRules(config, pDevices, getVirtualDevices(vBuffersByName))
|
||||
|
||||
// // initialize the mode variable
|
||||
// mode := config.GetModes()[0]
|
||||
|
||||
// // initialize TTS phrases for modes
|
||||
// for _, m := range config.GetModes() {
|
||||
// tts.AddMessage(m)
|
||||
// logger.LogDebugf("Added TTS message '%s'", m)
|
||||
// }
|
||||
|
||||
// fmt.Println("Joyful Running! Press Ctrl+C to quit. Press Enter to reload rules.")
|
||||
// if len(config.GetModes()) > 1 {
|
||||
// logger.Logf("Initial mode set to '%s'", mode)
|
||||
// }
|
||||
|
||||
// for {
|
||||
// lastMode := mode
|
||||
// // Get an event (blocks if necessary)
|
||||
// channelEvent := <-eventChannel
|
||||
|
||||
// switch channelEvent.Type {
|
||||
// case ChannelEventInput:
|
||||
// switch channelEvent.Event.Type {
|
||||
// case evdev.EV_SYN:
|
||||
// // We've received a SYN_REPORT, so now we send all pending events; since SYN_REPORTs
|
||||
// // might come from multiple input devices, we'll always flush, just to be sure.
|
||||
// for _, buffer := range vBuffersByName {
|
||||
// buffer.SendEvents()
|
||||
// }
|
||||
|
||||
// case evdev.EV_KEY, evdev.EV_ABS:
|
||||
// // We have a matchable event type. Check all the events
|
||||
// for _, rule := range rules {
|
||||
// device, outputEvent := rule.MatchEvent(channelEvent.Device, channelEvent.Event, &mode)
|
||||
// if device == nil || outputEvent == nil {
|
||||
// continue
|
||||
// }
|
||||
// vBuffersByDevice[device].AddEvent(outputEvent)
|
||||
// }
|
||||
// }
|
||||
|
||||
// case ChannelEventTimer:
|
||||
// // Timer events give us the device and event to use directly
|
||||
// vBuffersByDevice[channelEvent.Device].AddEvent(channelEvent.Event)
|
||||
// // If we get a timer event, flush the output device buffer immediately
|
||||
// vBuffersByDevice[channelEvent.Device].SendEvents()
|
||||
|
||||
// case ChannelEventReload:
|
||||
// // stop existing channels
|
||||
// fmt.Println("Reloading rules.")
|
||||
// cancel()
|
||||
// fmt.Println("Waiting for existing listeners to exit. Provide input from each of your devices.")
|
||||
// wg.Wait()
|
||||
// fmt.Println("Listeners exited. Parsing config.")
|
||||
// config := readConfig(configDir) // reload the config
|
||||
// rules, eventChannel, cancel, wg = loadRules(config, pDevices, getVirtualDevices(vBuffersByName))
|
||||
// fmt.Println("Config re-loaded. Only rule changes applied. Device and Mode changes require restart.")
|
||||
// }
|
||||
|
||||
// if lastMode != mode && tts != nil {
|
||||
// tts.Say(mode)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// func loadRules(
|
||||
// config *config.ConfigParser,
|
||||
// pDevices map[string]*evdev.InputDevice,
|
||||
// vDevices map[string]*evdev.InputDevice) ([]mappingrules.MappingRule, <-chan ChannelEvent, func(), *sync.WaitGroup) {
|
||||
|
||||
// var wg sync.WaitGroup
|
||||
// eventChannel := make(chan ChannelEvent, 1000)
|
||||
// ctx, cancel := context.WithCancel(context.Background())
|
||||
|
||||
// // Initialize rules
|
||||
// rules := config.BuildRules(pDevices, vDevices)
|
||||
// logger.Logf("Created %d mapping rules.", len(rules))
|
||||
|
||||
// // start listening for events on devices and timers
|
||||
// for _, device := range pDevices {
|
||||
// wg.Add(1)
|
||||
// go eventWatcher(device, eventChannel, ctx, &wg)
|
||||
// }
|
||||
|
||||
// timerCount := 0
|
||||
// for _, rule := range rules {
|
||||
// if timedRule, ok := rule.(mappingrules.TimedEventEmitter); ok {
|
||||
// wg.Add(1)
|
||||
// go timerWatcher(timedRule, eventChannel, ctx, &wg)
|
||||
// timerCount++
|
||||
// }
|
||||
// }
|
||||
// logger.Logf("Registered %d timers.", timerCount)
|
||||
|
||||
// go consoleWatcher(eventChannel)
|
||||
|
||||
// return rules, eventChannel, cancel, &wg
|
||||
// }
|
||||
Loading…
Add table
Add a link
Reference in a new issue