Карты
@@ -3787,6 +3808,17 @@ async function renderSettings(container) {
// Profile button → open profile modal
container.querySelector("#s-open-profile").onclick = () => showProfileModal();
+ // RDI standard selector
+ const rdiSel = container.querySelector("#s-rdi-standard");
+ if (rdiSel) {
+ rdiSel.value = state.profile.rdi_standard || "RU";
+ rdiSel.onchange = async () => {
+ await DB.setProfileValue("rdi_standard", rdiSel.value);
+ state.profile.rdi_standard = rdiSel.value;
+ await BMR.loadRDI(rdiSel.value);
+ };
+ }
+
// Offline toggle
const offToggle = container.querySelector("#s-offline-toggle");
offToggle.onclick = () => {
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 2c19a1c..57b93a3 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -120,21 +120,7 @@ fn import_seed_products(app: tauri::AppHandle) -> Result {
};
let main_db = rusqlite::Connection::open(&main_path).map_err(|e| e.to_string())?;
- let current_version: i64 = main_db.query_row("SELECT COALESCE((SELECT value FROM profile WHERE key='seed_version'), '0')", [], |r| {
- let s: String = r.get(0)?;
- Ok(s.parse::().unwrap_or(0))
- }
- ).unwrap_or(0);
-
- if current_version >= seed_version {return Ok(format!("up-to-date:v{}", current_version));}
-
- let total: usize = seed_db.query_row("SELECT COUNT(*) FROM products", [], |r| r.get(0))
- .map_err(|e| e.to_string())?;
-
- // Emit initial progress
- // Bulk import — no per-row progress needed (takes <5 seconds)
-
- // Ensure all columns exist in main DB (including micronutrients from ION import)
+ // Ensure all columns exist in main DB
let extra_cols = [
"composition TEXT", "name_lower TEXT", "category TEXT",
"sodium_mg REAL", "potassium_mg REAL", "calcium_mg REAL",
@@ -148,19 +134,11 @@ fn import_seed_products(app: tauri::AppHandle) -> Result {
let _ = main_db.execute(&format!("ALTER TABLE products ADD COLUMN {}", col), []);
}
- // ATTACH seed DB to main DB and do bulk INSERT + UPDATE in SQL (no per-row loop)
- let seed_str = seed_path.to_str().unwrap_or_default().to_string();
- main_db.execute("ATTACH DATABASE ?1 AS seed", rusqlite::params![seed_str]).map_err(|e| e.to_string())?;
+ // Dedup ALWAYS runs (even if seed version matches) — fixes legacy duplicates.
+ // Fast: <0.2s with index. No-op if no dupes exist.
+ let _ = main_db.execute(
+ "CREATE INDEX IF NOT EXISTS idx_products_name_lower ON products(name_lower)", []);
- main_db.execute("BEGIN", []).map_err(|e| e.to_string())?;
-
- // Create index for fast lookups during dedup and insert
- let _ = main_db.execute_batch(
- "CREATE INDEX IF NOT EXISTS idx_products_name_lower ON main.products(name_lower);"
- );
-
- // Dedup existing products by (name_lower, source, store_id).
- // Each statement separate — execute_batch can fail silently on multi-statement strings.
main_db.execute(
"UPDATE food_log SET product_id = (
SELECT MIN(p2.id) FROM products p2
@@ -190,12 +168,30 @@ fn import_seed_products(app: tauri::AppHandle) -> Result {
GROUP BY name_lower, source, COALESCE(store_id,'')
)", []).map_err(|e| format!("dedup delete: {}", e))?;
- // UNIQUE index to prevent future duplicates
- main_db.execute(
+ let _ = main_db.execute(
"CREATE UNIQUE INDEX IF NOT EXISTS idx_products_dedup
ON products(name_lower, source, COALESCE(store_id, ''))
- WHERE name_lower IS NOT NULL", [])
- .map_err(|e| format!("unique index: {}", e))?;
+ WHERE name_lower IS NOT NULL", []);
+
+ // Check seed version — skip import if already up to date
+ let current_version: i64 = main_db.query_row(
+ "SELECT COALESCE((SELECT value FROM profile WHERE key='seed_version'), '0')",
+ [], |r| { let s: String = r.get(0)?; Ok(s.parse::().unwrap_or(0)) }
+ ).unwrap_or(0);
+
+ if current_version >= seed_version {
+ return Ok(format!("up-to-date:v{}", current_version));
+ }
+
+ // ATTACH seed DB for import
+ let seed_str = seed_path.to_str().unwrap_or_default().to_string();
+ main_db.execute("ATTACH DATABASE ?1 AS seed", rusqlite::params![seed_str])
+ .map_err(|e| e.to_string())?;
+
+ let total: usize = seed_db.query_row("SELECT COUNT(*) FROM products", [], |r| r.get(0))
+ .map_err(|e| e.to_string())?;
+
+ main_db.execute("BEGIN", []).map_err(|e| e.to_string())?;
// Bulk INSERT new products from seed (INSERT OR IGNORE now works with unique index)
let inserted = main_db.execute(