fix: simplify skip_content table

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zeditor"
-version = "0.1.2-a"
+version = "0.1.2-b"
 edition = "2021"
 
 [dependencies]

src/db.rs

@@ -1,5 +1,4 @@
 use crate::env::ZEDITOR_HOME;
-use crate::replace::Replacement;
 use crate::skip::SkipContent;
 use rusqlite::{params, Connection, Result};
 use std::collections::{HashMap, HashSet};
@@ -27,8 +26,7 @@ impl Db {
             hash    BLOB NOT NULL,
             start   INTEGER NOT NULL,
             end     INTEGER NOT NULL,
-            search  TEXT NOT NULL,
-            PRIMARY KEY (hash, start, end, search)
+            PRIMARY KEY (hash, start, end)
         ) STRICT",
             [],
         )?;
@@ -52,31 +50,28 @@ impl Db {
 
     pub fn write_perm_skip(&self, skip: SkipContent) -> Result<()> {
         self.conn.execute(
-            "INSERT INTO skip_content (hash, start, end, search) 
-                    VALUES (?1, ?2, ?3, ?4)",
-            params![skip.0.as_bytes(), skip.1.start, skip.1.end, skip.1.term],
+            "INSERT INTO skip_content (hash, start, end) 
+                    VALUES (?1, ?2, ?3)",
+            params![skip.hash.as_bytes(), skip.start, skip.end],
         )?;
         Ok(())
     }
 
     pub fn get_skip_contents(&self) -> Result<HashSet<SkipContent>> {
         let mut stmt = self
             .conn
-            .prepare("SELECT hash, start, end, search FROM skip_content")?;
+            .prepare("SELECT hash, start, end FROM skip_content")?;
         let mut rows = stmt.query([])?;
 
         let mut out = HashSet::new();
         while let Some(row) = rows.next()? {
             let hash_bytes: [u8; 32] = row.get(0)?;
             let hash: blake3::Hash = hash_bytes.into();
-            out.insert(SkipContent(
+            out.insert(SkipContent {
                 hash,
-                Replacement {
-                    start: row.get(1)?,
-                    end: row.get(2)?,
-                    term: row.get(3)?,
-                },
-            ));
+                start: row.get(1)?,
+                end: row.get(2)?,
+            });
         }
 
         Ok(out)

src/skip.rs

@@ -1,10 +1,13 @@
 use crate::db::Db;
-use crate::replace::Replacement;
 use std::collections::HashSet;
 use std::sync::{Arc, Mutex};
 
 #[derive(Eq, Hash, PartialEq, Clone)]
-pub struct SkipContent(pub blake3::Hash, pub Replacement);
+pub struct SkipContent {
+    pub hash: blake3::Hash,
+    pub start: usize,
+    pub end: usize,
+}
 
 pub struct SkipRepo {
     db: Arc<Mutex<Db>>,
@@ -36,6 +39,9 @@ impl SkipRepo {
 
 impl From<crate::search::Hit> for SkipContent {
     fn from(hit: crate::search::Hit) -> Self {
-        Self(hit.content_hash, hit.into())
+        let hash = hit.content_hash;
+        let start = hit.start;
+        let end = hit.end;
+        Self { hash, start, end }
     }
 }