Compare commits
3 Commits
release-20
...
release-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
92720c15b3 | ||
|
|
5e59f66056 | ||
|
|
f2ca741188 |
80
.github/workflows/build-mips.yml
vendored
80
.github/workflows/build-mips.yml
vendored
@@ -1,80 +0,0 @@
|
|||||||
name: Build MIPS Binary
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ "main" ]
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
env:
|
|
||||||
CARGO_TERM_COLOR: always
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Debug - List Files (Pre-Build)
|
|
||||||
run: ls -R
|
|
||||||
|
|
||||||
- name: Setup Node.js
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: '20'
|
|
||||||
|
|
||||||
- name: Install Rust
|
|
||||||
uses: dtolnay/rust-toolchain@nightly
|
|
||||||
with:
|
|
||||||
targets: wasm32-unknown-unknown
|
|
||||||
components: rust-src
|
|
||||||
|
|
||||||
- name: Rust Cache
|
|
||||||
uses: Swatinem/rust-cache@v2
|
|
||||||
|
|
||||||
- name: Install Trunk
|
|
||||||
uses: jetli/trunk-action@v0.5.0
|
|
||||||
with:
|
|
||||||
version: 'latest'
|
|
||||||
|
|
||||||
- name: Build Frontend
|
|
||||||
run: |
|
|
||||||
cd frontend
|
|
||||||
npm install
|
|
||||||
trunk build --release
|
|
||||||
|
|
||||||
- name: Install Cross
|
|
||||||
run: cargo install cross
|
|
||||||
|
|
||||||
- name: Build Backend (MIPS)
|
|
||||||
env:
|
|
||||||
RUSTUP_TOOLCHAIN: nightly
|
|
||||||
CROSS_NO_WARNINGS: 0
|
|
||||||
run: |
|
|
||||||
cd backend
|
|
||||||
cross build --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort
|
|
||||||
|
|
||||||
- name: Debug - List Files
|
|
||||||
run: |
|
|
||||||
echo "Listing target directory..."
|
|
||||||
find target -maxdepth 5 || true
|
|
||||||
ls -R target/mips-unknown-linux-musl/release || true
|
|
||||||
|
|
||||||
- name: Rename Binary
|
|
||||||
run: mv target/mips-unknown-linux-musl/release/backend target/mips-unknown-linux-musl/release/vibetorrent-mips
|
|
||||||
|
|
||||||
- name: Generate Tag
|
|
||||||
id: tag
|
|
||||||
run: echo "release_tag=release-$(date +'%Y%m%d-%H%M')" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Create Release
|
|
||||||
uses: softprops/action-gh-release@v1
|
|
||||||
with:
|
|
||||||
tag_name: ${{ steps.tag.outputs.release_tag }}
|
|
||||||
name: Release ${{ steps.tag.outputs.release_tag }}
|
|
||||||
files: target/mips-unknown-linux-musl/release/vibetorrent-mips
|
|
||||||
draft: false
|
|
||||||
prerelease: false
|
|
||||||
@@ -16,6 +16,8 @@ RUN apt-get update && apt-get install -y \
|
|||||||
xz-utils \
|
xz-utils \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
|
file \
|
||||||
|
jq \
|
||||||
# Needed for some crate compilations
|
# Needed for some crate compilations
|
||||||
protobuf-compiler \
|
protobuf-compiler \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|||||||
@@ -109,192 +109,80 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
// Signal-based dropdown state: 0=none, 1=download, 2=upload, 3=theme
|
// Signal-based dropdown state: 0=none, 1=download, 2=upload, 3=theme
|
||||||
let (active_dropdown, set_active_dropdown) = create_signal(0u8);
|
let (active_dropdown, set_active_dropdown) = create_signal(0u8);
|
||||||
// Guard to prevent global close from firing right after toggle opens
|
|
||||||
let skip_next_close = store_value(false);
|
// Toggle a specific dropdown
|
||||||
|
let toggle = move |id: u8| {
|
||||||
// Toggle a specific dropdown
|
let current = active_dropdown.get_untracked();
|
||||||
let toggle = move |id: u8| {
|
if current == id {
|
||||||
let current = active_dropdown.get_untracked();
|
set_active_dropdown.set(0);
|
||||||
if current == id {
|
} else {
|
||||||
|
set_active_dropdown.set(id);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Close all dropdowns
|
||||||
|
let close_all = move || {
|
||||||
set_active_dropdown.set(0);
|
set_active_dropdown.set(0);
|
||||||
} else {
|
};
|
||||||
set_active_dropdown.set(id);
|
|
||||||
// Mark that the next global close should be skipped
|
|
||||||
skip_next_close.set_value(true);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Close all dropdowns
|
|
||||||
let close_all = move || {
|
|
||||||
set_active_dropdown.set(0);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Close dropdowns when tapping outside — uses click (fires after pointerdown)
|
view! {
|
||||||
let _ = window_event_listener(ev::click, move |_| {
|
// Transparent overlay to close dropdowns when clicking outside
|
||||||
if skip_next_close.get_value() {
|
<Show when=move || active_dropdown.get() != 0>
|
||||||
skip_next_close.set_value(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
set_active_dropdown.set(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
view! {
|
|
||||||
<div class="fixed bottom-0 left-0 right-0 h-8 min-h-8 bg-base-200 border-t border-base-300 flex items-center px-4 text-xs gap-4 text-base-content/70 z-[99]">
|
|
||||||
|
|
||||||
// --- DOWNLOAD SPEED DROPDOWN ---
|
|
||||||
<div class="relative">
|
|
||||||
<div
|
<div
|
||||||
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
class="fixed inset-0 z-[98] cursor-default"
|
||||||
title="Global Download Speed - Click to Set Limit"
|
on:pointerdown=move |_| close_all()
|
||||||
on:pointerdown=move |e| {
|
></div>
|
||||||
e.stop_propagation();
|
</Show>
|
||||||
toggle(1);
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 13.5L12 21m0 0l-7.5-7.5M12 21V3" />
|
|
||||||
</svg>
|
|
||||||
<span class="font-mono">{move || format_speed(stats.get().down_rate)}</span>
|
|
||||||
<Show when=move || { stats.get().down_limit.unwrap_or(0) > 0 } fallback=|| ()>
|
|
||||||
<span class="text-[10px] opacity-60">
|
|
||||||
{move || format!("(Limit: {})", format_speed(stats.get().down_limit.unwrap_or(0)))}
|
|
||||||
</span>
|
|
||||||
</Show>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ul
|
<div class="fixed bottom-0 left-0 right-0 h-8 min-h-8 bg-base-200 border-t border-base-300 flex items-center px-4 text-xs gap-4 text-base-content/70 z-[99]">
|
||||||
class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
|
|
||||||
style=move || if active_dropdown.get() == 1 { "display: block" } else { "display: none" }
|
|
||||||
on:pointerdown=move |e| e.stop_propagation()
|
|
||||||
>
|
|
||||||
{
|
|
||||||
limits.clone().into_iter().map(|(val, label)| {
|
|
||||||
let is_active = move || {
|
|
||||||
let current = stats.get().down_limit.unwrap_or(0);
|
|
||||||
(current - val).abs() < 1024
|
|
||||||
};
|
|
||||||
view! {
|
|
||||||
<li>
|
|
||||||
<button
|
|
||||||
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
|
|
||||||
on:pointerdown=move |e| {
|
|
||||||
e.stop_propagation();
|
|
||||||
set_limit("down", val);
|
|
||||||
close_all();
|
|
||||||
}
|
|
||||||
>
|
|
||||||
{label}
|
|
||||||
<Show when=is_active fallback=|| ()>
|
|
||||||
<span>"✓"</span>
|
|
||||||
</Show>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
}
|
|
||||||
}).collect::<Vec<_>>()
|
|
||||||
}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
// --- UPLOAD SPEED DROPDOWN ---
|
// --- DOWNLOAD SPEED DROPDOWN ---
|
||||||
<div class="relative">
|
|
||||||
<div
|
|
||||||
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
|
||||||
title="Global Upload Speed - Click to Set Limit"
|
|
||||||
on:pointerdown=move |e| {
|
|
||||||
e.stop_propagation();
|
|
||||||
toggle(2);
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M4.5 10.5L12 3m0 0l7.5 7.5M12 3v18" />
|
|
||||||
</svg>
|
|
||||||
<span class="font-mono">{move || format_speed(stats.get().up_rate)}</span>
|
|
||||||
<Show when=move || { stats.get().up_limit.unwrap_or(0) > 0 } fallback=|| ()>
|
|
||||||
<span class="text-[10px] opacity-60">
|
|
||||||
{move || format!("(Limit: {})", format_speed(stats.get().up_limit.unwrap_or(0)))}
|
|
||||||
</span>
|
|
||||||
</Show>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ul
|
|
||||||
class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
|
|
||||||
style=move || if active_dropdown.get() == 2 { "display: block" } else { "display: none" }
|
|
||||||
on:pointerdown=move |e| e.stop_propagation()
|
|
||||||
>
|
|
||||||
{
|
|
||||||
limits.clone().into_iter().map(|(val, label)| {
|
|
||||||
let is_active = move || {
|
|
||||||
let current = stats.get().up_limit.unwrap_or(0);
|
|
||||||
(current - val).abs() < 1024
|
|
||||||
};
|
|
||||||
view! {
|
|
||||||
<li>
|
|
||||||
<button
|
|
||||||
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
|
|
||||||
on:pointerdown=move |e| {
|
|
||||||
e.stop_propagation();
|
|
||||||
set_limit("up", val);
|
|
||||||
close_all();
|
|
||||||
}
|
|
||||||
>
|
|
||||||
{label}
|
|
||||||
<Show when=is_active fallback=|| ()>
|
|
||||||
<span>"✓"</span>
|
|
||||||
</Show>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
}
|
|
||||||
}).collect::<Vec<_>>()
|
|
||||||
}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="ml-auto flex items-center gap-4">
|
|
||||||
<div class="relative">
|
<div class="relative">
|
||||||
<div
|
<div
|
||||||
class="btn btn-ghost btn-xs btn-square"
|
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
||||||
title="Change Theme"
|
title="Global Download Speed - Click to Set Limit"
|
||||||
on:pointerdown=move |e| {
|
on:pointerdown=move |e| {
|
||||||
e.stop_propagation();
|
e.stop_propagation();
|
||||||
toggle(3);
|
toggle(1);
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M9.53 16.122a3 3 0 0 0-5.78 1.128 2.25 2.25 0 0 1-2.4 2.245 4.5 4.5 0 0 0 8.4-2.245c0-.399-.078-.78-.22-1.128Zm0 0a15.998 15.998 0 0 0 3.388-1.62m-5.043-.025a15.994 15.994 0 0 1 1.622-3.395m3.42 3.42a15.995 15.995 0 0 0 4.764-4.648l3.876-5.814a1.151 1.151 0 0 0-1.597-1.597L14.146 6.32a15.996 15.996 0 0 0-4.649 4.763m3.42 3.42a6.776 6.776 0 0 0-3.42-3.42" />
|
<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 13.5L12 21m0 0l-7.5-7.5M12 21V3" />
|
||||||
</svg>
|
</svg>
|
||||||
|
<span class="font-mono">{move || format_speed(stats.get().down_rate)}</span>
|
||||||
|
<Show when=move || { stats.get().down_limit.unwrap_or(0) > 0 } fallback=|| ()>
|
||||||
|
<span class="text-[10px] opacity-60">
|
||||||
|
{move || format!("(Limit: {})", format_speed(stats.get().down_limit.unwrap_or(0)))}
|
||||||
|
</span>
|
||||||
|
</Show>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ul
|
<ul
|
||||||
class="absolute bottom-full right-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-52 mb-2 border border-base-300 max-h-96 overflow-y-auto"
|
class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
|
||||||
style=move || if active_dropdown.get() == 3 { "display: block" } else { "display: none" }
|
style=move || if active_dropdown.get() == 1 { "display: block" } else { "display: none" }
|
||||||
on:pointerdown=move |e| e.stop_propagation()
|
|
||||||
>
|
>
|
||||||
{
|
{
|
||||||
let themes = vec![
|
limits.clone().into_iter().map(|(val, label)| {
|
||||||
"light", "dark", "dim", "nord", "cupcake", "dracula", "cyberpunk", "emerald", "sunset", "abyss"
|
let is_active = move || {
|
||||||
];
|
let current = stats.get().down_limit.unwrap_or(0);
|
||||||
themes.into_iter().map(|theme| {
|
(current - val).abs() < 1024
|
||||||
|
};
|
||||||
view! {
|
view! {
|
||||||
<li>
|
<li>
|
||||||
<button
|
<button
|
||||||
class=move || if current_theme.get() == theme { "bg-primary/10 text-primary font-bold text-xs capitalize" } else { "text-xs capitalize" }
|
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
|
||||||
on:pointerdown=move |e| {
|
on:pointerdown=move |e| {
|
||||||
e.stop_propagation();
|
e.stop_propagation();
|
||||||
set_current_theme.set(theme.to_string());
|
set_limit("down", val);
|
||||||
if let Some(win) = web_sys::window() {
|
|
||||||
if let Some(doc) = win.document() {
|
|
||||||
let _ = doc.document_element().unwrap().set_attribute("data-theme", theme);
|
|
||||||
}
|
|
||||||
if let Some(storage) = win.local_storage().ok().flatten() {
|
|
||||||
let _ = storage.set_item("vibetorrent_theme", theme);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
close_all();
|
close_all();
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{theme}
|
{label}
|
||||||
|
<Show when=is_active fallback=|| ()>
|
||||||
|
<span>"✓"</span>
|
||||||
|
</Show>
|
||||||
</button>
|
</button>
|
||||||
</li>
|
</li>
|
||||||
}
|
}
|
||||||
@@ -303,14 +191,117 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button
|
// --- UPLOAD SPEED DROPDOWN ---
|
||||||
class="btn btn-ghost btn-xs btn-square"
|
<div class="relative">
|
||||||
|
<div
|
||||||
|
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
||||||
|
title="Global Upload Speed - Click to Set Limit"
|
||||||
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
|
toggle(2);
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M4.5 10.5L12 3m0 0l7.5 7.5M12 3v18" />
|
||||||
|
</svg>
|
||||||
|
<span class="font-mono">{move || format_speed(stats.get().up_rate)}</span>
|
||||||
|
<Show when=move || { stats.get().up_limit.unwrap_or(0) > 0 } fallback=|| ()>
|
||||||
|
<span class="text-[10px] opacity-60">
|
||||||
|
{move || format!("(Limit: {})", format_speed(stats.get().up_limit.unwrap_or(0)))}
|
||||||
|
</span>
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ul
|
||||||
|
class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
|
||||||
|
style=move || if active_dropdown.get() == 2 { "display: block" } else { "display: none" }
|
||||||
|
>
|
||||||
|
{
|
||||||
|
limits.clone().into_iter().map(|(val, label)| {
|
||||||
|
let is_active = move || {
|
||||||
|
let current = stats.get().up_limit.unwrap_or(0);
|
||||||
|
(current - val).abs() < 1024
|
||||||
|
};
|
||||||
|
view! {
|
||||||
|
<li>
|
||||||
|
<button
|
||||||
|
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
|
||||||
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
|
set_limit("up", val);
|
||||||
|
close_all();
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{label}
|
||||||
|
<Show when=is_active fallback=|| ()>
|
||||||
|
<span>"✓"</span>
|
||||||
|
</Show>
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
}
|
||||||
|
}).collect::<Vec<_>>()
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="ml-auto flex items-center gap-4">
|
||||||
|
<div class="relative">
|
||||||
|
<div
|
||||||
|
class="btn btn-ghost btn-xs btn-square"
|
||||||
|
title="Change Theme"
|
||||||
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
|
toggle(3);
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M9.53 16.122a3 3 0 0 0-5.78 1.128 2.25 2.25 0 0 1-2.4 2.245 4.5 4.5 0 0 0 8.4-2.245c0-.399-.078-.78-.22-1.128Zm0 0a15.998 15.998 0 0 0 3.388-1.62m-5.043-.025a15.994 15.994 0 0 1 1.622-3.395m3.42 3.42a15.995 15.995 0 0 0 4.764-4.648l3.876-5.814a1.151 1.151 0 0 0-1.597-1.597L14.146 6.32a15.996 15.996 0 0 0-4.649 4.763m3.42 3.42a6.776 6.776 0 0 0-3.42-3.42" />
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ul
|
||||||
|
class="absolute bottom-full right-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-52 mb-2 border border-base-300 max-h-96 overflow-y-auto"
|
||||||
|
style=move || if active_dropdown.get() == 3 { "display: block" } else { "display: none" }
|
||||||
|
>
|
||||||
|
{
|
||||||
|
let themes = vec![
|
||||||
|
"light", "dark", "dim", "nord", "cupcake", "dracula", "cyberpunk", "emerald", "sunset", "abyss"
|
||||||
|
];
|
||||||
|
themes.into_iter().map(|theme| {
|
||||||
|
view! {
|
||||||
|
<li>
|
||||||
|
<button
|
||||||
|
class=move || if current_theme.get() == theme { "bg-primary/10 text-primary font-bold text-xs capitalize" } else { "text-xs capitalize" }
|
||||||
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
|
set_current_theme.set(theme.to_string());
|
||||||
|
if let Some(win) = web_sys::window() {
|
||||||
|
if let Some(doc) = win.document() {
|
||||||
|
let _ = doc.document_element().unwrap().set_attribute("data-theme", theme);
|
||||||
|
}
|
||||||
|
if let Some(storage) = win.local_storage().ok().flatten() {
|
||||||
|
let _ = storage.set_item("vibetorrent_theme", theme);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
close_all();
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{theme}
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
}
|
||||||
|
}).collect::<Vec<_>>()
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
class="btn btn-ghost btn-xs btn-square"
|
||||||
title="Settings & Notification Permissions"
|
title="Settings & Notification Permissions"
|
||||||
on:click=move |_| {
|
on:click=move |_| {
|
||||||
// Request push notification permission when settings button is clicked
|
// Request push notification permission when settings button is clicked
|
||||||
spawn_local(async {
|
spawn_local(async {
|
||||||
log::info!("Settings button clicked - requesting push notification permission");
|
log::info!("Settings button clicked - requesting push notification permission");
|
||||||
|
|
||||||
// Check current permission state before requesting
|
// Check current permission state before requesting
|
||||||
let window = web_sys::window().expect("window should exist");
|
let window = web_sys::window().expect("window should exist");
|
||||||
let _current_perm = js_sys::Reflect::get(&window, &"Notification".into())
|
let _current_perm = js_sys::Reflect::get(&window, &"Notification".into())
|
||||||
@@ -318,16 +309,16 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
.and_then(|n| js_sys::Reflect::get(&n, &"permission".into()).ok())
|
.and_then(|n| js_sys::Reflect::get(&n, &"permission".into()).ok())
|
||||||
.and_then(|p| p.as_string())
|
.and_then(|p| p.as_string())
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
|
|
||||||
crate::store::subscribe_to_push_notifications().await;
|
crate::store::subscribe_to_push_notifications().await;
|
||||||
|
|
||||||
// Check permission after request
|
// Check permission after request
|
||||||
let new_perm = js_sys::Reflect::get(&window, &"Notification".into())
|
let new_perm = js_sys::Reflect::get(&window, &"Notification".into())
|
||||||
.ok()
|
.ok()
|
||||||
.and_then(|n| js_sys::Reflect::get(&n, &"permission".into()).ok())
|
.and_then(|n| js_sys::Reflect::get(&n, &"permission".into()).ok())
|
||||||
.and_then(|p| p.as_string())
|
.and_then(|p| p.as_string())
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
|
|
||||||
if let Some(store) = use_context::<crate::store::TorrentStore>() {
|
if let Some(store) = use_context::<crate::store::TorrentStore>() {
|
||||||
if new_perm == "granted" {
|
if new_perm == "granted" {
|
||||||
crate::store::show_toast_with_signal(
|
crate::store::show_toast_with_signal(
|
||||||
|
|||||||
@@ -154,14 +154,6 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
|
|
||||||
// Signal-based sort dropdown for mobile
|
// Signal-based sort dropdown for mobile
|
||||||
let (sort_open, set_sort_open) = create_signal(false);
|
let (sort_open, set_sort_open) = create_signal(false);
|
||||||
let sort_skip_close = store_value(false);
|
|
||||||
let _ = window_event_listener(ev::click, move |_| {
|
|
||||||
if sort_skip_close.get_value() {
|
|
||||||
sort_skip_close.set_value(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
set_sort_open.set(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
let sort_arrow = move |col: SortColumn| {
|
let sort_arrow = move |col: SortColumn| {
|
||||||
if sort_col.get() == col {
|
if sort_col.get() == col {
|
||||||
@@ -199,7 +191,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
let (success_msg, error_msg) = get_action_messages(&action);
|
let (success_msg, error_msg) = get_action_messages(&action);
|
||||||
let success_msg = success_msg.to_string();
|
let success_msg = success_msg.to_string();
|
||||||
let error_msg = error_msg.to_string();
|
let error_msg = error_msg.to_string();
|
||||||
|
|
||||||
// Capture notifications signal before async (use_context unavailable in spawn_local)
|
// Capture notifications signal before async (use_context unavailable in spawn_local)
|
||||||
let notifications = store.notifications;
|
let notifications = store.notifications;
|
||||||
|
|
||||||
@@ -332,81 +324,83 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="md:hidden flex flex-col h-full bg-base-200">
|
<div class="md:hidden flex flex-col h-full bg-base-200 relative">
|
||||||
<div class="px-3 py-2 border-b border-base-200 flex justify-between items-center bg-base-100/95 backdrop-blur z-10 shrink-0">
|
// Transparent overlay to close sort dropdown
|
||||||
<span class="text-xs font-bold opacity-50 uppercase tracking-wider">"Torrents"</span>
|
<Show when=move || sort_open.get()>
|
||||||
|
<div
|
||||||
|
class="fixed inset-0 z-[98] cursor-default"
|
||||||
|
on:pointerdown=move |_| set_sort_open.set(false)
|
||||||
|
></div>
|
||||||
|
</Show>
|
||||||
|
|
||||||
<div class="relative">
|
<div class="px-3 py-2 border-b border-base-200 flex justify-between items-center bg-base-100/95 backdrop-blur z-10 shrink-0">
|
||||||
<div
|
<span class="text-xs font-bold opacity-50 uppercase tracking-wider">"Torrents"</span>
|
||||||
role="button"
|
|
||||||
class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
|
|
||||||
on:pointerdown=move |e| {
|
|
||||||
e.stop_propagation();
|
|
||||||
let cur = sort_open.get_untracked();
|
|
||||||
if cur {
|
|
||||||
set_sort_open.set(false);
|
|
||||||
} else {
|
|
||||||
set_sort_open.set(true);
|
|
||||||
sort_skip_close.set_value(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M3 7.5L7.5 3m0 0L12 7.5M7.5 3v13.5m13.5 0L16.5 21m0 0L12 16.5m4.5 4.5V7.5" />
|
|
||||||
</svg>
|
|
||||||
"Sort"
|
|
||||||
</div>
|
|
||||||
<ul
|
|
||||||
class="absolute top-full right-0 z-[100] menu p-2 shadow bg-base-100 rounded-box w-48 mt-1 border border-base-200 text-xs"
|
|
||||||
style=move || if sort_open.get() { "display: block" } else { "display: none" }
|
|
||||||
on:pointerdown=move |e| e.stop_propagation()
|
|
||||||
>
|
|
||||||
<li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
|
|
||||||
{
|
|
||||||
let columns = vec![
|
|
||||||
(SortColumn::Name, "Name"),
|
|
||||||
(SortColumn::Size, "Size"),
|
|
||||||
(SortColumn::Progress, "Progress"),
|
|
||||||
(SortColumn::Status, "Status"),
|
|
||||||
(SortColumn::DownSpeed, "Down Speed"),
|
|
||||||
(SortColumn::UpSpeed, "Up Speed"),
|
|
||||||
(SortColumn::ETA, "ETA"),
|
|
||||||
];
|
|
||||||
|
|
||||||
columns.into_iter().map(|(col, label)| {
|
<div class="relative">
|
||||||
let is_active = move || sort_col.get() == col;
|
<div
|
||||||
let current_dir = move || sort_dir.get();
|
role="button"
|
||||||
|
class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
|
||||||
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
|
let cur = sort_open.get_untracked();
|
||||||
|
set_sort_open.set(!cur);
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M3 7.5L7.5 3m0 0L12 7.5M7.5 3v13.5m13.5 0L16.5 21m0 0L12 16.5m4.5 4.5V7.5" />
|
||||||
|
</svg>
|
||||||
|
"Sort"
|
||||||
|
</div>
|
||||||
|
<ul
|
||||||
|
class="absolute top-full right-0 z-[100] menu p-2 shadow bg-base-100 rounded-box w-48 mt-1 border border-base-200 text-xs"
|
||||||
|
style=move || if sort_open.get() { "display: block" } else { "display: none" }
|
||||||
|
on:pointerdown=move |e| e.stop_propagation()
|
||||||
|
>
|
||||||
|
<li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
|
||||||
|
{
|
||||||
|
let columns = vec![
|
||||||
|
(SortColumn::Name, "Name"),
|
||||||
|
(SortColumn::Size, "Size"),
|
||||||
|
(SortColumn::Progress, "Progress"),
|
||||||
|
(SortColumn::Status, "Status"),
|
||||||
|
(SortColumn::DownSpeed, "Down Speed"),
|
||||||
|
(SortColumn::UpSpeed, "Up Speed"),
|
||||||
|
(SortColumn::ETA, "ETA"),
|
||||||
|
];
|
||||||
|
|
||||||
view! {
|
columns.into_iter().map(|(col, label)| {
|
||||||
<li>
|
let is_active = move || sort_col.get() == col;
|
||||||
<button
|
let current_dir = move || sort_dir.get();
|
||||||
class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
|
|
||||||
on:pointerdown=move |e| {
|
view! {
|
||||||
e.stop_propagation();
|
<li>
|
||||||
handle_sort(col);
|
<button
|
||||||
set_sort_open.set(false);
|
class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
|
||||||
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
|
handle_sort(col);
|
||||||
|
set_sort_open.set(false);
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{label}
|
||||||
|
<Show when=is_active fallback=|| ()>
|
||||||
|
<span class="opacity-70 text-[10px]">
|
||||||
|
{move || match current_dir() {
|
||||||
|
SortDirection::Ascending => "▲",
|
||||||
|
SortDirection::Descending => "▼",
|
||||||
|
}}
|
||||||
|
</span>
|
||||||
|
</Show>
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
}
|
}
|
||||||
>
|
}).collect::<Vec<_>>()
|
||||||
{label}
|
}
|
||||||
<Show when=is_active fallback=|| ()>
|
</ul>
|
||||||
<span class="opacity-70 text-[10px]">
|
</div>
|
||||||
{move || match current_dir() {
|
</div>
|
||||||
SortDirection::Ascending => "▲",
|
|
||||||
SortDirection::Descending => "▼",
|
|
||||||
}}
|
|
||||||
</span>
|
|
||||||
</Show>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
}
|
|
||||||
}).collect::<Vec<_>>()
|
|
||||||
}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3">
|
<div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3"> {move || filtered_torrents().into_iter().map(|t| {
|
||||||
{move || filtered_torrents().into_iter().map(|t| {
|
|
||||||
let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
|
let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
|
||||||
let status_str = format!("{:?}", t.status);
|
let status_str = format!("{:?}", t.status);
|
||||||
let status_badge_class = match t.status {
|
let status_badge_class = match t.status {
|
||||||
@@ -442,7 +436,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
set_menu_position.set((x, y));
|
set_menu_position.set((x, y));
|
||||||
set_selected_hash.set(Some(hash.clone()));
|
set_selected_hash.set(Some(hash.clone()));
|
||||||
set_menu_visible.set(true);
|
set_menu_visible.set(true);
|
||||||
|
|
||||||
// Haptic feedback (iOS Safari doesn't support vibrate)
|
// Haptic feedback (iOS Safari doesn't support vibrate)
|
||||||
let navigator = window().navigator();
|
let navigator = window().navigator();
|
||||||
if js_sys::Reflect::has(&navigator, &wasm_bindgen::JsValue::from_str("vibrate")).unwrap_or(false) {
|
if js_sys::Reflect::has(&navigator, &wasm_bindgen::JsValue::from_str("vibrate")).unwrap_or(false) {
|
||||||
|
|||||||
249
frontend/sw.js
249
frontend/sw.js
@@ -1,127 +1,158 @@
|
|||||||
const CACHE_NAME = 'vibetorrent-v1';
|
const CACHE_NAME = "vibetorrent-v2";
|
||||||
const ASSETS_TO_CACHE = [
|
const ASSETS_TO_CACHE = [
|
||||||
'/',
|
"/",
|
||||||
'/index.html',
|
"/index.html",
|
||||||
'/manifest.json',
|
"/manifest.json",
|
||||||
'/icon-192.png',
|
"/icon-192.png",
|
||||||
'/icon-512.png'
|
"/icon-512.png",
|
||||||
];
|
];
|
||||||
|
|
||||||
// Install event - cache assets
|
// Install event - cache assets
|
||||||
self.addEventListener('install', (event) => {
|
self.addEventListener("install", (event) => {
|
||||||
console.log('[Service Worker] Installing...');
|
console.log("[Service Worker] Installing...");
|
||||||
event.waitUntil(
|
event.waitUntil(
|
||||||
caches.open(CACHE_NAME).then((cache) => {
|
caches
|
||||||
console.log('[Service Worker] Caching static assets');
|
.open(CACHE_NAME)
|
||||||
return cache.addAll(ASSETS_TO_CACHE);
|
.then((cache) => {
|
||||||
}).then(() => {
|
console.log("[Service Worker] Caching static assets");
|
||||||
console.log('[Service Worker] Skip waiting');
|
return cache.addAll(ASSETS_TO_CACHE);
|
||||||
return self.skipWaiting();
|
})
|
||||||
})
|
.then(() => {
|
||||||
);
|
console.log("[Service Worker] Skip waiting");
|
||||||
|
return self.skipWaiting();
|
||||||
|
}),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Activate event - clean old caches
|
// Activate event - clean old caches
|
||||||
self.addEventListener('activate', (event) => {
|
self.addEventListener("activate", (event) => {
|
||||||
console.log('[Service Worker] Activating...');
|
console.log("[Service Worker] Activating...");
|
||||||
event.waitUntil(
|
event.waitUntil(
|
||||||
caches.keys().then((cacheNames) => {
|
caches
|
||||||
return Promise.all(
|
.keys()
|
||||||
cacheNames.map((key) => {
|
.then((cacheNames) => {
|
||||||
if (key !== CACHE_NAME) {
|
return Promise.all(
|
||||||
console.log('[Service Worker] Deleting old cache:', key);
|
cacheNames.map((key) => {
|
||||||
return caches.delete(key);
|
if (key !== CACHE_NAME) {
|
||||||
}
|
console.log("[Service Worker] Deleting old cache:", key);
|
||||||
})
|
return caches.delete(key);
|
||||||
);
|
}
|
||||||
}).then(() => {
|
}),
|
||||||
console.log('[Service Worker] Claiming clients');
|
);
|
||||||
return self.clients.claim();
|
})
|
||||||
})
|
.then(() => {
|
||||||
);
|
console.log("[Service Worker] Claiming clients");
|
||||||
|
return self.clients.claim();
|
||||||
|
}),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Fetch event - network first, cache fallback for API calls
|
// Fetch event - network first for HTML, cache fallback for API calls
|
||||||
self.addEventListener('fetch', (event) => {
|
self.addEventListener("fetch", (event) => {
|
||||||
const url = new URL(event.request.url);
|
const url = new URL(event.request.url);
|
||||||
|
|
||||||
// Network-first strategy for API calls
|
// Network-first strategy for API calls
|
||||||
if (url.pathname.startsWith('/api/')) {
|
if (url.pathname.startsWith("/api/")) {
|
||||||
event.respondWith(
|
|
||||||
fetch(event.request)
|
|
||||||
.catch(() => {
|
|
||||||
// Could return cached API response or offline page
|
|
||||||
return new Response(
|
|
||||||
JSON.stringify({ error: 'Offline' }),
|
|
||||||
{ headers: { 'Content-Type': 'application/json' } }
|
|
||||||
);
|
|
||||||
})
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cache-first strategy for static assets
|
|
||||||
event.respondWith(
|
event.respondWith(
|
||||||
caches.match(event.request).then((response) => {
|
fetch(event.request).catch(() => {
|
||||||
return response || fetch(event.request).then((fetchResponse) => {
|
// Could return cached API response or offline page
|
||||||
// Optionally cache new requests
|
return new Response(JSON.stringify({ error: "Offline" }), {
|
||||||
if (fetchResponse && fetchResponse.status === 200) {
|
headers: { "Content-Type": "application/json" },
|
||||||
const responseToCache = fetchResponse.clone();
|
});
|
||||||
caches.open(CACHE_NAME).then((cache) => {
|
}),
|
||||||
cache.put(event.request, responseToCache);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return fetchResponse;
|
|
||||||
});
|
|
||||||
})
|
|
||||||
);
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Network-first strategy for HTML pages (entry points)
|
||||||
|
// This ensures users always get the latest version of the app
|
||||||
|
if (
|
||||||
|
event.request.mode === "navigate" ||
|
||||||
|
url.pathname.endsWith("index.html") ||
|
||||||
|
url.pathname === "/"
|
||||||
|
) {
|
||||||
|
event.respondWith(
|
||||||
|
fetch(event.request)
|
||||||
|
.then((response) => {
|
||||||
|
// Cache the latest version of the HTML
|
||||||
|
const responseToCache = response.clone();
|
||||||
|
caches.open(CACHE_NAME).then((cache) => {
|
||||||
|
cache.put(event.request, responseToCache);
|
||||||
|
});
|
||||||
|
return response;
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
return caches.match(event.request);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cache-first strategy for static assets (JS, CSS, Images)
|
||||||
|
event.respondWith(
|
||||||
|
caches.match(event.request).then((response) => {
|
||||||
|
return (
|
||||||
|
response ||
|
||||||
|
fetch(event.request).then((fetchResponse) => {
|
||||||
|
// Optionally cache new requests
|
||||||
|
if (fetchResponse && fetchResponse.status === 200) {
|
||||||
|
const responseToCache = fetchResponse.clone();
|
||||||
|
caches.open(CACHE_NAME).then((cache) => {
|
||||||
|
cache.put(event.request, responseToCache);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return fetchResponse;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Notification click event - focus or open app
|
// Notification click event - focus or open app
|
||||||
self.addEventListener('notificationclick', (event) => {
|
self.addEventListener("notificationclick", (event) => {
|
||||||
console.log('[Service Worker] Notification clicked:', event.notification.tag);
|
console.log("[Service Worker] Notification clicked:", event.notification.tag);
|
||||||
event.notification.close();
|
event.notification.close();
|
||||||
|
|
||||||
event.waitUntil(
|
event.waitUntil(
|
||||||
clients.matchAll({ type: 'window', includeUncontrolled: true }).then((clientList) => {
|
clients
|
||||||
// If app is already open, focus it
|
.matchAll({ type: "window", includeUncontrolled: true })
|
||||||
for (let client of clientList) {
|
.then((clientList) => {
|
||||||
if (client.url === '/' && 'focus' in client) {
|
// If app is already open, focus it
|
||||||
return client.focus();
|
for (let client of clientList) {
|
||||||
}
|
if (client.url === "/" && "focus" in client) {
|
||||||
}
|
return client.focus();
|
||||||
// Otherwise open new window
|
}
|
||||||
if (clients.openWindow) {
|
}
|
||||||
return clients.openWindow('/');
|
// Otherwise open new window
|
||||||
}
|
if (clients.openWindow) {
|
||||||
})
|
return clients.openWindow("/");
|
||||||
);
|
}
|
||||||
|
}),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Push notification event
|
// Push notification event
|
||||||
self.addEventListener('push', (event) => {
|
self.addEventListener("push", (event) => {
|
||||||
console.log('[Service Worker] Push notification received');
|
console.log("[Service Worker] Push notification received");
|
||||||
const data = event.data ? event.data.json() : {};
|
const data = event.data ? event.data.json() : {};
|
||||||
|
|
||||||
const title = data.title || 'VibeTorrent';
|
const title = data.title || "VibeTorrent";
|
||||||
const options = {
|
const options = {
|
||||||
body: data.body || 'New notification',
|
body: data.body || "New notification",
|
||||||
icon: data.icon || '/icon-192.png',
|
icon: data.icon || "/icon-192.png",
|
||||||
badge: data.badge || '/icon-192.png',
|
badge: data.badge || "/icon-192.png",
|
||||||
tag: data.tag || 'vibetorrent-notification',
|
tag: data.tag || "vibetorrent-notification",
|
||||||
requireInteraction: false,
|
requireInteraction: false,
|
||||||
// iOS-specific: vibrate pattern (if supported)
|
// iOS-specific: vibrate pattern (if supported)
|
||||||
vibrate: [200, 100, 200],
|
vibrate: [200, 100, 200],
|
||||||
// Add data for notification click handling
|
// Add data for notification click handling
|
||||||
data: {
|
data: {
|
||||||
url: data.url || '/',
|
url: data.url || "/",
|
||||||
timestamp: Date.now()
|
timestamp: Date.now(),
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
console.log('[Service Worker] Showing notification:', title, options);
|
console.log("[Service Worker] Showing notification:", title, options);
|
||||||
|
|
||||||
event.waitUntil(
|
event.waitUntil(self.registration.showNotification(title, options));
|
||||||
self.registration.showNotification(title, options)
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user