Extract assets and conditionalize uinput loading to rmpp

Author: awwaiid

src/embedded_assets.rs

@@ -0,0 +1,29 @@
+use rust_embed::Embed;
+
+#[derive(Embed)]
+#[folder = "prompts/"]
+pub struct AssetPrompts;
+
+#[derive(Embed)]
+#[folder = "utils/"]
+#[include = "rmpp/uinput-*"]
+pub struct AssetUtils;
+
+// Function to provide access to the uinput module data
+pub fn get_uinput_module_data(version: &str) -> Option<Vec<u8>> {
+    let target_module_filename = format!("rmpp/uinput-{}.ko", version);
+    AssetUtils::get(target_module_filename.as_str())
+        .map(|asset| asset.data.to_vec())
+}
+
+pub fn load_config(filename: &str) -> String {
+    log::debug!("Loading config from {}", filename);
+
+    if std::path::Path::new(filename).exists() {
+        std::fs::read_to_string(filename).unwrap()
+    } else {
+        std::str::from_utf8(AssetPrompts::get(filename).unwrap().data.as_ref())
+            .unwrap()
+            .to_string()
+    }
+}

src/lib.rs

@@ -1,4 +1,5 @@
 pub mod device;
+pub mod embedded_assets;
 pub mod keyboard;
 pub mod llm_engine;
 pub mod pen;

src/main.rs

@@ -4,15 +4,14 @@ use clap::Parser;
 use dotenv::dotenv;
 use env_logger;
 use log::{debug, info};
-use rust_embed::Embed;
 use serde_json::Value as json;
 use std::sync::{Arc, Mutex};
 
-use std::io::Write;
 use std::thread::sleep;
 use std::time::Duration;
 
 use ghostwriter::{
+    embedded_assets::load_config,
     keyboard::Keyboard,
     llm_engine::{anthropic::Anthropic, google::Google, openai::OpenAI, LLMEngine},
     pen::Pen,
@@ -26,14 +25,6 @@ use ghostwriter::{
 const VIRTUAL_WIDTH: u32 = 768;
 const VIRTUAL_HEIGHT: u32 = 1024;
 
-#[derive(Embed)]
-#[folder = "prompts/"]
-struct AssetPrompts;
-
-#[derive(Embed)]
-#[folder = "utils/"]
-#[include = "rmpp/uinput-*"]
-pub struct AssetUtils;
 
 #[derive(Parser)]
 #[command(author, version)]
@@ -131,6 +122,7 @@ struct Args {
     log_level: String,
 }
 
+
 fn main() -> Result<()> {
     dotenv().ok();
 
@@ -188,17 +180,6 @@ fn draw_svg(
     Ok(())
 }
 
-fn load_config(filename: &str) -> String {
-    debug!("Loading config from {}", filename);
-
-    if std::path::Path::new(filename).exists() {
-        std::fs::read_to_string(filename).unwrap()
-    } else {
-        std::str::from_utf8(AssetPrompts::get(filename).unwrap().data.as_ref())
-            .unwrap()
-            .to_string()
-    }
-}
 
 fn ghostwriter(args: &Args) -> Result<()> {
     let keyboard = shared!(Keyboard::new(

src/util.rs

@@ -10,6 +10,9 @@ use std::collections::HashMap;
 use std::io::Write;
 use std::sync::Arc;
 
+use crate::device::DeviceModel;
+use crate::embedded_assets::get_uinput_module_data;
+
 pub type OptionMap = HashMap<String, String>;
 
 pub fn svg_to_bitmap(svg_data: &str, width: u32, height: u32) -> Result<Vec<Vec<bool>>> {
@@ -89,6 +92,16 @@ pub fn option_or_env_fallback(
 
 pub fn setup_uinput() -> Result<()> {
     debug!("Checking for uinput module");
+
+    // Use DeviceModel to detect the device type
+    let device_model = DeviceModel::detect();
+    info!("Device model detected: {}", device_model.name());
+
+    if device_model == DeviceModel::Remarkable2 {
+        info!("Device is Remarkable2, skipping uinput module check and installation");
+        return Ok(());
+    }
+
     // Check if uinput module is loaded by looking at the lsmod output
     let output = std::process::Command::new("lsmod")
         .output()
@@ -105,8 +118,7 @@ pub fn setup_uinput() -> Result<()> {
         }
 
         let img_version = std::env::var("IMG_VERSION".to_string())
-            .unwrap()
-            .to_string();
+            .unwrap_or_default();
 
         if img_version.is_empty() {
             return Ok(());
@@ -118,10 +130,12 @@ pub fn setup_uinput() -> Result<()> {
             .collect::<Vec<&str>>()
             .join(".");
 
-        let target_module_filename = format!("rmpp/uinput-{short_version}.ko");
+        // let target_module_filename = format!("rmpp/uinput-{short_version}.ko");
 
-        let uinput_module_asset = crate::AssetUtils::get(target_module_filename.as_str()).unwrap();
-        let raw_uinput_module_data = uinput_module_asset.data.as_ref();
+        // Use the function from embedded_assets module to get the module data
+        let uinput_module_data = get_uinput_module_data(&short_version)
+            .expect(&format!("Uinput module for version {} not found", short_version));
+        let raw_uinput_module_data = uinput_module_data.as_slice();
         let mut uinput_module_file = std::fs::File::create("/tmp/uinput.ko")?;
         uinput_module_file.write_all(raw_uinput_module_data)?;
         uinput_module_file.flush()?;