Simplify database fetch

Fetch database columns directly by name (without getting the column number first)

Author: philippremy

WavyBackgroundsClient/package.json

@@ -1,6 +1,6 @@
 {
   "name": "WavyBackgrounds",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "An app to imitate the dynamic backgrounds from macOS Sonoma",
   "scripts": {
     "start": "vite",

WavyBackgroundsClient/src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "WavyBackgrounds"
-version = "0.1.1"
+version = "0.1.2"
 description = "An app to imitate the dynamic backgrounds from macOS Sonoma"
 authors = ["Philipp Remy"]
 license = "MIT"

WavyBackgroundsClient/src-tauri/Cargo.toml

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "WavyBackgrounds",
-    "version": "0.1.1"
+    "version": "0.1.2"
   },
   "tauri": {
     "systemTray": {

WavyBackgroundsClient/src-tauri/tauri.conf.json

@@ -1,6 +1,6 @@
 [package]
 name = "libResourceManager"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

libDynamicWallpapaper/Cargo.lock

@@ -35,17 +35,13 @@ pub fn get_full_database(app_handle: &AppHandle) -> Option<Vec<WallpaperVideoEnt
     assert!(aerial_db_file.exists(), "It appears we are not on a Sonoma System. Aborting... (Custom Videos are WIP!)");
     let conn = rusqlite::Connection::open_with_flags(aerial_db_file, rusqlite::OpenFlags::SQLITE_OPEN_READ_ONLY).unwrap();
     let mut stmt = conn.prepare("SELECT * FROM ZASSET").unwrap();
-    let fn_col = stmt.column_index("ZACCESSIBILITYLABEL").expect("There is no column called 'ZACCESSIBILITYLABEL'");
-    let urlplist_col = stmt.column_index("ZREMOTEURLS").expect("There is no column called 'ZREMOTEURLS'");
-    let preview_col = stmt.column_index("ZPREVIEWIMAGEURL").expect("There is no column called 'ZPREVIEWIMAGEURL'");
-    let ident_col = stmt.column_index("ZIDENTIFIER").expect("There is no column called 'ZIDENTIFIER'");
     let entry_iter = stmt.query_map([], |row| {
         Ok(WallpaperVideoEntry {
-            friendly_name: row.get::<usize, String>(fn_col).unwrap().to_string(),
-            video_url_plist: row.get::<usize, Vec<u8>>(urlplist_col).unwrap(),
+            friendly_name: row.get::<&str, String>("ZACCESSIBILITYLABEL").unwrap().to_string(),
+            video_url_plist: row.get::<&str, Vec<u8>>("ZREMOTEURLS").unwrap(),
             video_url: String::new(),
-            preview_image_url: row.get::<usize, String>(preview_col).unwrap().to_string(),
-            identifier: row.get::<usize, String>(ident_col).unwrap().to_string(),
+            preview_image_url: row.get::<&str, String>("ZPREVIEWIMAGEURL").unwrap().to_string(),
+            identifier: row.get::<&str, String>("ZIDENTIFIER").unwrap().to_string(),
             preview_image_save_path: None,
             video_save_path: None
         })