asp/keep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add combined mime info support and remove metadata filtering

Browse Source 
Co-authored-by: aider (openai/andrew/openrouter/qwen/qwen3-coder) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-08-18 08:47:04 -03:00
parent ffd5fb12cc
commit 1e4e039672
1 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/meta_plugin/magic.rs
View File

@@ -60,6 +60,7 @@ impl MagicFileMetaPlugin {
// Save file type // Save file type
if let Ok(file_type) = self.get_magic_result(CookieFlags::empty()) { if let Ok(file_type) = self.get_magic_result(CookieFlags::empty()) {
if !file_type.is_empty() {
let meta = crate::db::Meta { let meta = crate::db::Meta {
id: item_id, id: item_id,
name: "magic_file_type".to_string(), name: "magic_file_type".to_string(),
@@ -67,9 +68,11 @@ impl MagicFileMetaPlugin {
}; };
let _ = crate::db::store_meta(conn_ref, meta); let _ = crate::db::store_meta(conn_ref, meta);
} }
}
// Save MIME type // Save MIME type
if let Ok(mime_type) = self.get_magic_result(CookieFlags::MIME_TYPE) { if let Ok(mime_type) = self.get_magic_result(CookieFlags::MIME_TYPE) {
if !mime_type.is_empty() {
let meta = crate::db::Meta { let meta = crate::db::Meta {
id: item_id, id: item_id,
name: "magic_mime_type".to_string(), name: "magic_mime_type".to_string(),
@@ -77,9 +80,11 @@ impl MagicFileMetaPlugin {
}; };
let _ = crate::db::store_meta(conn_ref, meta); let _ = crate::db::store_meta(conn_ref, meta);
} }
}
// Save MIME encoding // Save MIME encoding
if let Ok(mime_encoding) = self.get_magic_result(CookieFlags::MIME_ENCODING) { if let Ok(mime_encoding) = self.get_magic_result(CookieFlags::MIME_ENCODING) {
if !mime_encoding.is_empty() {
let meta = crate::db::Meta { let meta = crate::db::Meta {
id: item_id, id: item_id,
name: "magic_mime_encoding".to_string(), name: "magic_mime_encoding".to_string(),
@@ -87,6 +92,19 @@ impl MagicFileMetaPlugin {
}; };
let _ = crate::db::store_meta(conn_ref, meta); let _ = crate::db::store_meta(conn_ref, meta);
} }
}
// Save combined MIME info (type and encoding together)
if let Ok(mime_combined) = self.get_magic_result(CookieFlags::MIME) {
if !mime_combined.is_empty() {
let meta = crate::db::Meta {
id: item_id,
name: "magic_mime_combined".to_string(),
value: mime_combined,
};
let _ = crate::db::store_meta(conn_ref, meta);
}
}
self.is_saved = true; self.is_saved = true;
} }
@@ -105,7 +123,7 @@ impl MetaPlugin for MagicFileMetaPlugin {
self.conn = Some(conn as *const _ as *mut Connection); self.conn = Some(conn as *const _ as *mut Connection);
// Initialize magic cookie with flags for comprehensive detection // Initialize magic cookie with flags for comprehensive detection
let cookie = Cookie::open(CookieFlags::MIME_TYPE | CookieFlags::MIME_ENCODING) let cookie = Cookie::open(CookieFlags::MIME_TYPE | CookieFlags::MIME_ENCODING | CookieFlags::MIME)
.map_err(|e| anyhow::anyhow!("Failed to open magic cookie: {}", e))?; .map_err(|e| anyhow::anyhow!("Failed to open magic cookie: {}", e))?;
cookie.load(&[] as &[&str]) cookie.load(&[] as &[&str])
.map_err(|e| anyhow::anyhow!("Failed to load magic database: {}", e))?; .map_err(|e| anyhow::anyhow!("Failed to load magic database: {}", e))?;