mirror of
https://github.com/AppFlowy-IO/AppFlowy.git
synced 2024-08-30 18:12:39 +00:00
feat: folder search mvp (#4665)
* feat: implement folder indexer * feat: sqlite search views using fts5 * feat: add view indexing to user manager * feat: implement folder indexer * feat: add sqlite search documents * feat: add document indexing to user manager * feat: add document indexing to folder indexer * chore: update collab rev * feat: search frontend integration * refactor: search index * test: add event test * chore: fix ci * feat: initial command palette overlay impl (#4619) * chore: test search engine * chore: initial structure * chore: replace old search request * chore: enable log for lib-dispatch * chore: move search manager to core * feat: move traits and responsibility to search crate * feat: move search to search crate * feat: replace sqlite with tantivy * feat: deserialize tantivy documents * chore: fixes after rebase * chore: clean code * feat: fetch and sort results * fix: code review + cleaning * feat: support custom icons * feat: support view layout icons * feat: rename bloc and fix indexing * fix: prettify dialog * feat: score results * chore: update collab rev * feat: add recent view history to command palette * test: add integration_tests * fix: clippy changes * fix: focus traversal in cmd palette * fix: remove file after merging main * chore: code review and panic-safe * feat: index all views if index does not exist * chore: improve logic with conditional * chore: add is_empty check * chore: abstract logic from folder manager init * chore: update collab rev * chore: code review * chore: fixes after merge + update lock file * chore: revert cargo lock * fix: set icon type when removing icon * fix: code review + dependency inversion * fix: remove icon fix for not persisting icon type * test: simple tests manipulating views * test: create 100 views * fix: tauri build * chore: create 1000 views * chore: create util methods * chore: test * chore: test * chore: remove logs * chore: fix build.rs * chore: export models * chore: enable clear cache on Rust-CI * fix: navigate to newly created views * fix: force disable setting workspace listener on rebuilds * fix: remove late final * fix: missing returns * fix: localization and minor fixes * test: add index assert to large test * fix: missing section param after merging main * chore: try fix unzip file error * chore: lower the test * feat: show hint when result is in trash --------- Co-authored-by: nathan <nathan@appflowy.io> Co-authored-by: Jiraffe7 <twajxjiraffe@gmail.com> Co-authored-by: Lucas.Xu <lucas.xu@appflowy.io>
This commit is contained in:
@ -120,7 +120,7 @@ pub fn unzip_and_replace(
|
||||
|
||||
// Unzip the file
|
||||
let file = File::open(zip_path.as_ref())
|
||||
.context(format!("Can't find the zip file: {:?}", zip_path.as_ref()))?;
|
||||
.with_context(|| format!("Can't find the zip file: {:?}", zip_path.as_ref()))?;
|
||||
let mut archive = ZipArchive::new(file).context("Unzip file fail")?;
|
||||
|
||||
for i in 0..archive.len() {
|
||||
@ -143,14 +143,43 @@ pub fn unzip_and_replace(
|
||||
// Replace the contents of the target folder
|
||||
if target_folder.exists() {
|
||||
fs::remove_dir_all(target_folder)
|
||||
.context(format!("Remove all files in {:?}", target_folder))?;
|
||||
.with_context(|| format!("Remove all files in {:?}", target_folder))?;
|
||||
}
|
||||
|
||||
fs::create_dir_all(target_folder)?;
|
||||
for entry in fs::read_dir(temp_dir.path())? {
|
||||
let entry = entry?;
|
||||
fs::rename(entry.path(), target_folder.join(entry.file_name()))?;
|
||||
let target_file = target_folder.join(entry.file_name());
|
||||
|
||||
// Use a copy and delete approach instead of fs::rename
|
||||
if entry.path().is_dir() {
|
||||
// Recursively copy directory contents
|
||||
copy_dir_all(entry.path(), &target_file)?;
|
||||
} else {
|
||||
fs::copy(entry.path(), &target_file)?;
|
||||
}
|
||||
// Remove the original file/directory after copying
|
||||
if entry.path().is_dir() {
|
||||
fs::remove_dir_all(entry.path())?;
|
||||
} else {
|
||||
fs::remove_file(entry.path())?;
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// Helper function for recursively copying directories
|
||||
fn copy_dir_all(src: PathBuf, dst: &Path) -> io::Result<()> {
|
||||
fs::create_dir_all(dst)?;
|
||||
for entry in fs::read_dir(src)? {
|
||||
let entry = entry?;
|
||||
let ty = entry.file_type()?;
|
||||
if ty.is_dir() {
|
||||
copy_dir_all(entry.path(), &dst.join(entry.file_name()))?;
|
||||
} else {
|
||||
fs::copy(entry.path(), dst.join(entry.file_name()))?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
Reference in New Issue
Block a user