admin/vibetorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 194 Wiki Activity

fix(files): use refetch callback instead of Action to avoid reactive disposal panic
Some checks failed
Build MIPS Binary / build (push) Failing after 1m10s
Details

Browse Source
This commit is contained in:
spinline
2026-02-21 01:29:26 +03:00
parent 7f8c721115
commit 598f038ea6
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
frontend/src/components/torrent/files.rs
View File

@@ -15,10 +15,9 @@ pub fn TorrentFilesTab(hash: String) -> impl IntoView {
|h| async move { shared::server_fns::torrent::get_files(h).await.unwrap_or_default() } |h| async move { shared::server_fns::torrent::get_files(h).await.unwrap_or_default() }
); );
// Refresh action // Callback to trigger a refetch — safe, doesn't destroy existing components
let refresh_files = Action::new(|h: &String| { let on_refresh = Callback::new(move |_: ()| {
let h = h.clone(); files_resource.refetch();
async move { shared::server_fns::torrent::get_files(h).await.unwrap_or_default() }
}); });
let stored_hash = StoredValue::new(hash); let stored_hash = StoredValue::new(hash);
@@ -26,10 +25,7 @@ pub fn TorrentFilesTab(hash: String) -> impl IntoView {
view! { view! {
<Suspense fallback=move || view! { <FilesFallback /> }> <Suspense fallback=move || view! { <FilesFallback /> }>
{move || { {move || {
let files = match refresh_files.value().get() { let files = files_resource.get().unwrap_or_default();
Some(f) => f,
None => files_resource.get().unwrap_or_default(),
};
if files.is_empty() { if files.is_empty() {
return view! { return view! {
@@ -61,12 +57,11 @@ pub fn TorrentFilesTab(hash: String) -> impl IntoView {
key=|f| f.index key=|f| f.index
children={move |f| { children={move |f| {
let p_hash = stored_hash.get_value(); let p_hash = stored_hash.get_value();
let r_files = refresh_files.clone();
view! { view! {
<FileRow <FileRow
file=f file=f
hash=p_hash hash=p_hash
refresh_action=r_files on_refresh=on_refresh.clone()
/> />
} }
}} }}
@@ -86,7 +81,7 @@ pub fn TorrentFilesTab(hash: String) -> impl IntoView {
} }
#[component] #[component]
fn FileRow(file: TorrentFile, hash: String, refresh_action: Action<String, Vec<TorrentFile>>) -> impl IntoView { fn FileRow(file: TorrentFile, hash: String, on_refresh: Callback<()>) -> impl IntoView {
let f_idx = file.index; let f_idx = file.index;
let path_clone = file.path.clone(); let path_clone = file.path.clone();
@@ -107,7 +102,7 @@ fn FileRow(file: TorrentFile, hash: String, refresh_action: Action<String, Vec<T
<FileContextMenu <FileContextMenu
torrent_hash=hash torrent_hash=hash
file_index=f_idx file_index=f_idx
refresh_action=refresh_action on_refresh=on_refresh
set_priority=set_priority set_priority=set_priority
> >
<TableRow class="hover:bg-muted/50 transition-colors group"> <TableRow class="hover:bg-muted/50 transition-colors group">
@@ -141,7 +136,7 @@ fn FileContextMenu(
children: Children, children: Children,
torrent_hash: String, torrent_hash: String,
file_index: u32, file_index: u32,
refresh_action: Action<String, Vec<TorrentFile>>, on_refresh: Callback<()>,
set_priority: Action<(String, u32, u8), Result<(), ServerFnError>>, set_priority: Action<(String, u32, u8), Result<(), ServerFnError>>,
) -> impl IntoView { ) -> impl IntoView {
let hash_c1 = torrent_hash.clone(); let hash_c1 = torrent_hash.clone();
@@ -159,11 +154,11 @@ fn FileContextMenu(
<ContextMenuGroup> <ContextMenuGroup>
<ContextMenuItem on:click={ <ContextMenuItem on:click={
let h = hash_c1; let h = hash_c1;
let ra = refresh_action.clone();
let sp = set_priority.clone(); let sp = set_priority.clone();
let ra = on_refresh.clone();
move |_| { move |_| {
sp.dispatch((h.clone(), file_index, 2)); sp.dispatch((h.clone(), file_index, 2));
ra.dispatch(h.clone()); ra.run(());
crate::components::ui::context_menu::close_context_menu(); crate::components::ui::context_menu::close_context_menu();
} }
}> }>
@@ -173,11 +168,11 @@ fn FileContextMenu(
<ContextMenuItem on:click={ <ContextMenuItem on:click={
let h = hash_c2; let h = hash_c2;
let ra = refresh_action.clone();
let sp = set_priority.clone(); let sp = set_priority.clone();
let ra = on_refresh.clone();
move |_| { move |_| {
sp.dispatch((h.clone(), file_index, 1)); sp.dispatch((h.clone(), file_index, 1));
ra.dispatch(h.clone()); ra.run(());
crate::components::ui::context_menu::close_context_menu(); crate::components::ui::context_menu::close_context_menu();
} }
}> }>
@@ -187,11 +182,11 @@ fn FileContextMenu(
<ContextMenuItem class="text-destructive focus:bg-destructive/10" on:click={ <ContextMenuItem class="text-destructive focus:bg-destructive/10" on:click={
let h = hash_c3; let h = hash_c3;
let ra = refresh_action.clone();
let sp = set_priority.clone(); let sp = set_priority.clone();
let ra = on_refresh.clone();
move |_| { move |_| {
sp.dispatch((h.clone(), file_index, 0)); sp.dispatch((h.clone(), file_index, 0));
ra.dispatch(h.clone()); ra.run(());
crate::components::ui::context_menu::close_context_menu(); crate::components::ui::context_menu::close_context_menu();
} }
}> }>