Compare commits
2 Commits
release-20
...
release-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e23585dfea | ||
|
|
9d5092649f |
@@ -21,7 +21,7 @@ wasm-bindgen = "0.2"
|
|||||||
wasm-bindgen-futures = "0.4"
|
wasm-bindgen-futures = "0.4"
|
||||||
uuid = { version = "1", features = ["v4", "js"] }
|
uuid = { version = "1", features = ["v4", "js"] }
|
||||||
futures = "0.3"
|
futures = "0.3"
|
||||||
chrono = { version = "0.4", features = ["serde", "wasm-bindgen"] }
|
chrono = { version = "0.4", features = ["serde"] }
|
||||||
web-sys = { version = "0.3", features = [
|
web-sys = { version = "0.3", features = [
|
||||||
"HtmlDivElement",
|
"HtmlDivElement",
|
||||||
"HtmlUListElement",
|
"HtmlUListElement",
|
||||||
|
|||||||
@@ -46,11 +46,19 @@ fn format_duration(seconds: i64) -> String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn format_date(timestamp: i64) -> String {
|
fn format_date(timestamp: i64) -> String {
|
||||||
let dt = chrono::DateTime::from_timestamp(timestamp, 0);
|
if timestamp <= 0 {
|
||||||
match dt {
|
return "-".to_string();
|
||||||
Some(dt) => dt.format("%d/%m/%Y %H:%M").to_string(),
|
|
||||||
None => "N/A".to_string(),
|
|
||||||
}
|
}
|
||||||
|
let date = js_sys::Date::new(&wasm_bindgen::JsValue::from_f64((timestamp * 1000) as f64));
|
||||||
|
|
||||||
|
// Simple formatting: YYYY-MM-DD HH:mm
|
||||||
|
let year = date.get_full_year();
|
||||||
|
let month = date.get_month() + 1; // 0-based
|
||||||
|
let day = date.get_date();
|
||||||
|
let hours = date.get_hours();
|
||||||
|
let minutes = date.get_minutes();
|
||||||
|
|
||||||
|
format!("{:04}-{:02}-{:02} {:02}:{:02}", year, month, day, hours, minutes)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
@@ -62,7 +70,7 @@ enum SortColumn {
|
|||||||
DownSpeed,
|
DownSpeed,
|
||||||
UpSpeed,
|
UpSpeed,
|
||||||
ETA,
|
ETA,
|
||||||
AddedDate,
|
Added,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
@@ -75,7 +83,7 @@ enum SortDirection {
|
|||||||
pub fn TorrentTable() -> impl IntoView {
|
pub fn TorrentTable() -> impl IntoView {
|
||||||
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
||||||
|
|
||||||
let sort_col = create_rw_signal(SortColumn::AddedDate);
|
let sort_col = create_rw_signal(SortColumn::Added);
|
||||||
let sort_dir = create_rw_signal(SortDirection::Descending);
|
let sort_dir = create_rw_signal(SortDirection::Descending);
|
||||||
|
|
||||||
let filtered_torrents = move || {
|
let filtered_torrents = move || {
|
||||||
@@ -136,7 +144,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
let b_eta = if b.eta <= 0 { i64::MAX } else { b.eta };
|
let b_eta = if b.eta <= 0 { i64::MAX } else { b.eta };
|
||||||
a_eta.cmp(&b_eta)
|
a_eta.cmp(&b_eta)
|
||||||
}
|
}
|
||||||
SortColumn::AddedDate => a.added_date.cmp(&b.added_date),
|
SortColumn::Added => a.added_date.cmp(&b.added_date),
|
||||||
};
|
};
|
||||||
if dir == SortDirection::Descending {
|
if dir == SortDirection::Descending {
|
||||||
cmp.reverse()
|
cmp.reverse()
|
||||||
@@ -274,8 +282,8 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::ETA)>
|
<th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::ETA)>
|
||||||
<div class="flex items-center">"ETA" {move || sort_arrow(SortColumn::ETA)}</div>
|
<div class="flex items-center">"ETA" {move || sort_arrow(SortColumn::ETA)}</div>
|
||||||
</th>
|
</th>
|
||||||
<th class="w-32 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::AddedDate)>
|
<th class="w-32 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::Added)>
|
||||||
<div class="flex items-center">"Date" {move || sort_arrow(SortColumn::AddedDate)}</div>
|
<div class="flex items-center">"Added" {move || sort_arrow(SortColumn::Added)}</div>
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@@ -330,7 +338,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
|
<td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
|
||||||
<td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
|
<td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
|
||||||
<td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
|
<td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
|
||||||
<td class="text-right font-mono text-[11px] opacity-80 whitespace-nowrap">{format_date(t.added_date)}</td>
|
<td class="text-right font-mono text-[11px] opacity-60 whitespace-nowrap">{format_date(t.added_date)}</td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
}).collect::<Vec<_>>()}
|
}).collect::<Vec<_>>()}
|
||||||
@@ -343,7 +351,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<Show when=move || sort_open.get()>
|
<Show when=move || sort_open.get()>
|
||||||
<div
|
<div
|
||||||
class="fixed inset-0 z-[98] cursor-default"
|
class="fixed inset-0 z-[98] cursor-default"
|
||||||
on:click=move |_| set_sort_open.set(false)
|
on:pointerdown=move |_| set_sort_open.set(false)
|
||||||
></div>
|
></div>
|
||||||
</Show>
|
</Show>
|
||||||
|
|
||||||
@@ -354,7 +362,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
|
class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
|
||||||
on:click=move |e| {
|
on:pointerdown=move |e| {
|
||||||
e.stop_propagation();
|
e.stop_propagation();
|
||||||
let cur = sort_open.get_untracked();
|
let cur = sort_open.get_untracked();
|
||||||
set_sort_open.set(!cur);
|
set_sort_open.set(!cur);
|
||||||
@@ -373,6 +381,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
|
<li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
|
||||||
{
|
{
|
||||||
let columns = vec![
|
let columns = vec![
|
||||||
|
(SortColumn::Added, "Date Added"),
|
||||||
(SortColumn::Name, "Name"),
|
(SortColumn::Name, "Name"),
|
||||||
(SortColumn::Size, "Size"),
|
(SortColumn::Size, "Size"),
|
||||||
(SortColumn::Progress, "Progress"),
|
(SortColumn::Progress, "Progress"),
|
||||||
@@ -380,7 +389,6 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
(SortColumn::DownSpeed, "Down Speed"),
|
(SortColumn::DownSpeed, "Down Speed"),
|
||||||
(SortColumn::UpSpeed, "Up Speed"),
|
(SortColumn::UpSpeed, "Up Speed"),
|
||||||
(SortColumn::ETA, "ETA"),
|
(SortColumn::ETA, "ETA"),
|
||||||
(SortColumn::AddedDate, "Date"),
|
|
||||||
];
|
];
|
||||||
|
|
||||||
columns.into_iter().map(|(col, label)| {
|
columns.into_iter().map(|(col, label)| {
|
||||||
@@ -391,8 +399,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<li>
|
<li>
|
||||||
<button
|
<button
|
||||||
class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
|
class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
|
||||||
on:click=move |e| {
|
on:pointerdown=move |e| {
|
||||||
e.prevent_default();
|
|
||||||
e.stop_propagation();
|
e.stop_propagation();
|
||||||
handle_sort(col);
|
handle_sort(col);
|
||||||
set_sort_open.set(false);
|
set_sort_open.set(false);
|
||||||
@@ -416,7 +423,8 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<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| {
|
<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| {
|
||||||
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 {
|
||||||
@@ -516,7 +524,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<progress class={format!("progress w-full h-1.5 {}", progress_class)} value={t.percent_complete} max="100"></progress>
|
<progress class={format!("progress w-full h-1.5 {}", progress_class)} value={t.percent_complete} max="100"></progress>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="grid grid-cols-4 gap-2 text-[10px] font-mono opacity-80 pt-1 border-t border-base-200/50">
|
<div class="grid grid-cols-3 gap-2 text-[10px] font-mono opacity-80 pt-1 border-t border-base-200/50">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<span class="text-[9px] opacity-60 uppercase">"Down"</span>
|
<span class="text-[9px] opacity-60 uppercase">"Down"</span>
|
||||||
<span class="text-success">{format_speed(t.down_rate)}</span>
|
<span class="text-success">{format_speed(t.down_rate)}</span>
|
||||||
@@ -525,14 +533,10 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<span class="text-[9px] opacity-60 uppercase">"Up"</span>
|
<span class="text-[9px] opacity-60 uppercase">"Up"</span>
|
||||||
<span class="text-primary">{format_speed(t.up_rate)}</span>
|
<span class="text-primary">{format_speed(t.up_rate)}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col text-center border-r border-base-200/50">
|
<div class="flex flex-col text-right">
|
||||||
<span class="text-[9px] opacity-60 uppercase">"ETA"</span>
|
<span class="text-[9px] opacity-60 uppercase">"ETA"</span>
|
||||||
<span>{format_duration(t.eta)}</span>
|
<span>{format_duration(t.eta)}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col text-right">
|
|
||||||
<span class="text-[9px] opacity-60 uppercase">"Date"</span>
|
|
||||||
<span>{format_date(t.added_date)}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user