Mirror/rayhunter
1
0
Fork 0
mirror of https://github.com/EFForg/rayhunter.git synced 2026-06-06 13:11:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Refactor record deletion to use FileKind

Browse Source
This commit is contained in:
Markus Unterwaditzer
2026-05-19 23:36:08 +02:00
committed by Markus Unterwaditzer
parent 7aaa7e589e
commit 4bad8356ac
2 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/src/qmdl_store.rs
+17 -29
View File
@@ -528,18 +528,13 @@ impl RecordingStore {
}; };
let entry_to_delete = self.manifest.entries.remove(entry_to_delete_idx); let entry_to_delete = self.manifest.entries.remove(entry_to_delete_idx);
self.write_manifest().await?; self.write_manifest().await?;
let qmdl_filepath = entry_to_delete.get_qmdl_filepath(&self.path);
let analysis_filepath = entry_to_delete.get_analysis_filepath(&self.path); for &file_kind in FileKind::ALL {
let gps_filepath = entry_to_delete.get_gps_filepath(&self.path); let filepath = file_kind.get_filepath(&entry_to_delete.name, &self.path);
remove_file_if_exists(&qmdl_filepath) remove_file_if_exists(&filepath)
.await .await
.map_err(RecordingStoreError::DeleteFileError)?; .map_err(RecordingStoreError::DeleteFileError)?;
remove_file_if_exists(&analysis_filepath) }
.await
.map_err(RecordingStoreError::DeleteFileError)?;
remove_file_if_exists(&gps_filepath)
.await
.map_err(RecordingStoreError::DeleteFileError)?;
Ok(()) Ok(())
} }
@@ -550,25 +545,18 @@ impl RecordingStore {
let mut keep = Vec::new(); let mut keep = Vec::new();
for entry in &self.manifest.entries { 'entries: for entry in &self.manifest.entries {
let qmdl_filepath = entry.get_qmdl_filepath(&self.path); for &file_kind in FileKind::ALL {
let analysis_filepath = entry.get_analysis_filepath(&self.path); let filepath = file_kind.get_filepath(&entry.name, &self.path);
if let Err(e) = remove_file_if_exists(&filepath).await {
if let Err(e) = remove_file_if_exists(&qmdl_filepath).await { log::warn!("failed to remove {filepath:?}: {e:?}");
log::warn!("failed to remove {qmdl_filepath:?}: {e:?}"); // Some error happened with deleting this entry, abort and go to the next one.
keep.push(true); // Also *keep* the manifest entry.
continue; keep.push(true);
continue 'entries;
}
} }
if let Err(e) = remove_file_if_exists(&analysis_filepath).await {
log::warn!("failed to remove {analysis_filepath:?}: {e:?}");
keep.push(true);
continue;
}
let gps_filepath = entry.get_gps_filepath(&self.path);
remove_file_if_exists(&gps_filepath).await.ok();
keep.push(false); keep.push(false);
} }
daemon/src/server.rs
+6
View File
@@ -359,8 +359,14 @@ pub async fn get_zip(
let result: Result<(), Error> = async { let result: Result<(), Error> = async {
let mut zip = ZipFileWriter::with_tokio(writer); let mut zip = ZipFileWriter::with_tokio(writer);
const EXCLUDED_FROM_ZIP: &[FileKind] = &[FileKind::Analysis];
// Add stored files // Add stored files
for &file_kind in FileKind::ALL { for &file_kind in FileKind::ALL {
if EXCLUDED_FROM_ZIP.contains(&file_kind) {
continue;
}
let file_opt = { let file_opt = {
let qmdl_store = qmdl_store_lock.read().await; let qmdl_store = qmdl_store_lock.read().await;
qmdl_store.open_file(entry_index, file_kind).await? qmdl_store.open_file(entry_index, file_kind).await?