Compare commits
2 Commits
release-20
...
release-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
9cfea2aed5 | ||
|
|
ce212cb2d6 |
@@ -51,6 +51,21 @@ mod fields {
|
||||
|
||||
pub const IDX_LABEL: usize = 12;
|
||||
pub const CMD_LABEL: &str = "d.custom1=";
|
||||
|
||||
pub const IDX_RATIO: usize = 13;
|
||||
pub const CMD_RATIO: &str = "d.ratio=";
|
||||
|
||||
pub const IDX_UPLOADED: usize = 14;
|
||||
pub const CMD_UPLOADED: &str = "d.up.total=";
|
||||
|
||||
pub const IDX_WASTED: usize = 15;
|
||||
pub const CMD_WASTED: &str = "d.skip.total=";
|
||||
|
||||
pub const IDX_SAVE_PATH: usize = 16;
|
||||
pub const CMD_SAVE_PATH: &str = "d.base_path=";
|
||||
|
||||
pub const IDX_FREE_DISK: usize = 17;
|
||||
pub const CMD_FREE_DISK: &str = "d.free_diskspace=";
|
||||
}
|
||||
|
||||
use fields::*;
|
||||
@@ -72,6 +87,11 @@ const RTORRENT_FIELDS: &[&str] = &[
|
||||
CMD_CREATION_DATE,
|
||||
CMD_HASHING,
|
||||
CMD_LABEL,
|
||||
CMD_RATIO,
|
||||
CMD_UPLOADED,
|
||||
CMD_WASTED,
|
||||
CMD_SAVE_PATH,
|
||||
CMD_FREE_DISK,
|
||||
];
|
||||
|
||||
fn parse_long(s: Option<&String>) -> i64 {
|
||||
@@ -98,6 +118,11 @@ fn from_rtorrent_row(row: Vec<String>) -> Torrent {
|
||||
let added_date = parse_long(row.get(IDX_CREATION_DATE));
|
||||
let is_hashing = parse_long(row.get(IDX_HASHING));
|
||||
let label_raw = parse_string(row.get(IDX_LABEL));
|
||||
let ratio = parse_long(row.get(IDX_RATIO)) as f64 / 1000.0;
|
||||
let uploaded = parse_long(row.get(IDX_UPLOADED));
|
||||
let wasted = parse_long(row.get(IDX_WASTED));
|
||||
let save_path = parse_string(row.get(IDX_SAVE_PATH));
|
||||
let free_disk_space = parse_long(row.get(IDX_FREE_DISK));
|
||||
|
||||
let label = if label_raw.is_empty() {
|
||||
None
|
||||
@@ -144,6 +169,11 @@ fn from_rtorrent_row(row: Vec<String>) -> Torrent {
|
||||
error_message: message,
|
||||
added_date,
|
||||
label,
|
||||
ratio,
|
||||
uploaded,
|
||||
wasted,
|
||||
save_path,
|
||||
free_disk_space,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -89,16 +89,59 @@ pub fn TorrentDetailsSheet() -> impl IntoView {
|
||||
error_message: "".to_string(),
|
||||
added_date: 0,
|
||||
label: None,
|
||||
ratio: 0.0,
|
||||
uploaded: 0,
|
||||
wasted: 0,
|
||||
save_path: "Yükleniyor...".to_string(),
|
||||
free_disk_space: 0,
|
||||
});
|
||||
|
||||
view! {
|
||||
<div class="grid grid-cols-2 md:grid-cols-4 gap-6">
|
||||
<InfoItem label="İndirilen / Toplam" value=format!("{} / {}", format_bytes(t.completed), format_bytes(t.size)) />
|
||||
<InfoItem label="İndirme Hızı" value=format_speed(t.down_rate) class="text-blue-500" />
|
||||
<InfoItem label="Gönderme Hızı" value=format_speed(t.up_rate) class="text-green-500" />
|
||||
<InfoItem label="Eklenme Tarihi" value=format_date(t.added_date) />
|
||||
<InfoItem label="Kalan Süre" value=format_duration(t.eta) />
|
||||
<InfoItem label="Hash" value=t.hash class="col-span-2 md:col-span-4 break-all font-mono text-xs" />
|
||||
<div class="flex flex-col gap-6">
|
||||
// Aktarım
|
||||
<div>
|
||||
<h3 class="text-sm font-bold border-b pb-2 mb-4">"Aktarım"</h3>
|
||||
<div class="grid grid-cols-2 md:grid-cols-4 gap-4">
|
||||
<InfoItem label="Geçen Süre" value="N/A".to_string() />
|
||||
<InfoItem label="Kalan" value=format_duration(t.eta) />
|
||||
<InfoItem label="Paylaşım Oranı" value=format!("{:.3}", t.ratio) />
|
||||
<div class="hidden md:block"></div>
|
||||
|
||||
<InfoItem label="İndirilen" value=format_bytes(t.completed) />
|
||||
<InfoItem label="İndirme Hızı" value=format_speed(t.down_rate) class="text-blue-500" />
|
||||
<InfoItem label="Boşa Giden" value=format_bytes(t.wasted) />
|
||||
<div class="hidden md:block"></div>
|
||||
|
||||
<InfoItem label="Gönderilen" value=format_bytes(t.uploaded) />
|
||||
<InfoItem label="Gönderme Hızı" value=format_speed(t.up_rate) class="text-green-500" />
|
||||
<div class="hidden md:block"></div>
|
||||
<div class="hidden md:block"></div>
|
||||
|
||||
<InfoItem label="Ortaklar" value="0 / 0 bağlı".to_string() />
|
||||
<InfoItem label="Eşler" value="0 / 0 bağlı".to_string() />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
// İzleyici
|
||||
<div>
|
||||
<h3 class="text-sm font-bold border-b pb-2 mb-4">"İzleyici"</h3>
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||
<InfoItem label="İzleyici URL'si" value="İzleyiciler sekmesine bakınız".to_string() class="col-span-1 md:col-span-2 break-all text-xs" />
|
||||
<InfoItem label="İzleyici Durumu" value="N/A".to_string() />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
// Genel
|
||||
<div>
|
||||
<h3 class="text-sm font-bold border-b pb-2 mb-4">"Genel"</h3>
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||
<InfoItem label="Kaydedilen Yer" value=t.save_path class="col-span-1 md:col-span-2 break-all font-mono text-xs" />
|
||||
<InfoItem label="Boş Disk Alanı" value=format_bytes(t.free_disk_space) />
|
||||
<InfoItem label="Oluşturulma Tarihi" value=format_date(t.added_date) />
|
||||
<InfoItem label="Hash" value=t.hash class="col-span-1 md:col-span-2 break-all font-mono text-xs" />
|
||||
<InfoItem label="Yorum" value="Yok".to_string() class="col-span-1 md:col-span-2 break-words text-xs" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}}
|
||||
@@ -122,10 +165,19 @@ pub fn TorrentDetailsSheet() -> impl IntoView {
|
||||
</TabsContent>
|
||||
|
||||
<TabsContent value="trackers" class="h-full">
|
||||
<div class="flex flex-col items-center justify-center h-48 opacity-60">
|
||||
<icons::Settings2 class="size-12 mb-3 text-muted-foreground" />
|
||||
<p class="text-sm font-medium">"İzleyici listesi yakında eklenecek"</p>
|
||||
</div>
|
||||
{move || match selected_torrent.get() {
|
||||
Some(t) => leptos::either::Either::Left(view! {
|
||||
<div class="h-full overflow-y-auto pr-2 pb-8">
|
||||
<crate::components::torrent::trackers::TorrentTrackersTab hash=t.hash />
|
||||
</div>
|
||||
}),
|
||||
None => leptos::either::Either::Right(view! {
|
||||
<div class="flex flex-col items-center justify-center h-48 opacity-60">
|
||||
<icons::Settings2 class="size-12 mb-3 text-muted-foreground" />
|
||||
<p class="text-sm font-medium">"İzleyici yükleniyor..."</p>
|
||||
</div>
|
||||
}),
|
||||
}}
|
||||
</TabsContent>
|
||||
|
||||
<TabsContent value="peers" class="h-full">
|
||||
|
||||
@@ -2,3 +2,4 @@ pub mod table;
|
||||
pub mod add_torrent;
|
||||
pub mod details;
|
||||
pub mod files;
|
||||
pub mod trackers;
|
||||
|
||||
121
frontend/src/components/torrent/trackers.rs
Normal file
121
frontend/src/components/torrent/trackers.rs
Normal file
@@ -0,0 +1,121 @@
|
||||
use leptos::prelude::*;
|
||||
use crate::components::ui::table::*;
|
||||
use crate::components::ui::shimmer::*;
|
||||
use shared::TorrentTracker;
|
||||
|
||||
#[component]
|
||||
pub fn TorrentTrackersTab(hash: String) -> impl IntoView {
|
||||
let hash_clone = hash.clone();
|
||||
|
||||
let trackers_resource = Resource::new(
|
||||
move || hash_clone.clone(),
|
||||
|h| async move { shared::server_fns::torrent::get_trackers(h).await.unwrap_or_default() }
|
||||
);
|
||||
|
||||
view! {
|
||||
<Suspense fallback=move || view! { <TrackersFallback /> }>
|
||||
{move || {
|
||||
let trackers = trackers_resource.get().unwrap_or_default();
|
||||
|
||||
if trackers.is_empty() {
|
||||
return view! {
|
||||
<div class="flex flex-col items-center justify-center h-48 opacity-60">
|
||||
<icons::Settings2 class="size-12 mb-3 text-muted-foreground" />
|
||||
<p class="text-sm font-medium">"Bu torrent için izleyici bulunamadı."</p>
|
||||
</div>
|
||||
}.into_any();
|
||||
}
|
||||
|
||||
view! {
|
||||
<div class="h-full overflow-auto">
|
||||
<TableWrapper class="bg-card/50 whitespace-nowrap">
|
||||
<Table>
|
||||
<TableHeader class="sticky top-0 bg-muted/80 backdrop-blur-sm z-10">
|
||||
<TableRow class="hover:bg-transparent text-xs">
|
||||
<TableHead>"İsim"</TableHead>
|
||||
<TableHead class="text-center">"Tür"</TableHead>
|
||||
<TableHead class="text-center">"Etkin"</TableHead>
|
||||
<TableHead class="text-center">"Grup"</TableHead>
|
||||
<TableHead class="text-center">"Ortaklar"</TableHead>
|
||||
<TableHead class="text-center">"Eşler"</TableHead>
|
||||
<TableHead class="text-center">"İndirilen"</TableHead>
|
||||
<TableHead class="text-center">"Son Güncelleme"</TableHead>
|
||||
<TableHead class="text-center">"Sıklık"</TableHead>
|
||||
<TableHead class="text-center">"Özel"</TableHead>
|
||||
</TableRow>
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
<For
|
||||
each=move || trackers.clone()
|
||||
key=|t| t.url.clone()
|
||||
children=move |t| {
|
||||
let t_type = if t.url.starts_with("http") { "http" }
|
||||
else if t.url.starts_with("udp") { "udp" }
|
||||
else if t.url.starts_with("dht") { "dht" }
|
||||
else { "diğer" };
|
||||
let is_enabled = if t.is_enabled { "evet" } else { "hayır" };
|
||||
|
||||
// Format timestamp difference for last update
|
||||
let now = chrono::Utc::now().timestamp();
|
||||
let diff = now - t.last_updated;
|
||||
let last_update_str = if t.last_updated == 0 {
|
||||
"Güncellenmedi".to_string()
|
||||
} else if diff >= 0 {
|
||||
format_duration_short(diff)
|
||||
} else {
|
||||
"N/A".to_string()
|
||||
};
|
||||
|
||||
let url_clone = t.url.clone();
|
||||
view! {
|
||||
<TableRow class="hover:bg-muted/50 transition-colors group text-xs text-muted-foreground">
|
||||
<TableCell class="font-medium text-foreground max-w-[200px] md:max-w-md truncate" attr:title=url_clone>
|
||||
{t.url.clone()}
|
||||
</TableCell>
|
||||
<TableCell class="text-center">{t_type}</TableCell>
|
||||
<TableCell class="text-center">{is_enabled}</TableCell>
|
||||
<TableCell class="text-center">{t.group}</TableCell>
|
||||
<TableCell class="text-center">{t.seeders}</TableCell>
|
||||
<TableCell class="text-center">{t.peers}</TableCell>
|
||||
<TableCell class="text-center">{t.downloaded}</TableCell>
|
||||
<TableCell class="text-center">{last_update_str}</TableCell>
|
||||
<TableCell class="text-center">{format_duration_short(t.interval)}</TableCell>
|
||||
<TableCell class="text-center">"bilinmiyor"</TableCell> // Özel flag isn't cleanly via XMLRPC per tracker usually
|
||||
</TableRow>
|
||||
}
|
||||
}
|
||||
/>
|
||||
</TableBody>
|
||||
</Table>
|
||||
</TableWrapper>
|
||||
</div>
|
||||
}.into_any()
|
||||
}}
|
||||
</Suspense>
|
||||
}
|
||||
}
|
||||
|
||||
#[component]
|
||||
fn TrackersFallback() -> impl IntoView {
|
||||
view! {
|
||||
<Shimmer loading=Signal::derive(|| true) class="space-y-2">
|
||||
<div class="h-10 w-full bg-muted/20 rounded-md"></div>
|
||||
<div class="h-10 w-full bg-muted/20 rounded-md"></div>
|
||||
<div class="h-10 w-full bg-muted/20 rounded-md"></div>
|
||||
<div class="h-10 w-full bg-muted/20 rounded-md"></div>
|
||||
</Shimmer>
|
||||
}
|
||||
}
|
||||
|
||||
fn format_duration_short(seconds: i64) -> String {
|
||||
if seconds <= 0 { return "0sn".to_string(); }
|
||||
let days = seconds / 86400;
|
||||
let hours = (seconds % 86400) / 3600;
|
||||
let minutes = (seconds % 3600) / 60;
|
||||
let secs = seconds % 60;
|
||||
|
||||
if days > 0 { format!("{}g {}s", days, hours) }
|
||||
else if hours > 0 { format!("{}s {}dk", hours, minutes) }
|
||||
else if minutes > 0 { format!("{}dk {}sn", minutes, secs) }
|
||||
else { format!("{}sn", secs) }
|
||||
}
|
||||
@@ -42,6 +42,11 @@ pub struct Torrent {
|
||||
pub error_message: String,
|
||||
pub added_date: i64,
|
||||
pub label: Option<String>,
|
||||
pub ratio: f64,
|
||||
pub uploaded: i64,
|
||||
pub wasted: i64,
|
||||
pub save_path: String,
|
||||
pub free_disk_space: i64,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, ToSchema)]
|
||||
@@ -121,6 +126,13 @@ pub struct TorrentTracker {
|
||||
pub url: String,
|
||||
pub status: String,
|
||||
pub message: String,
|
||||
pub is_enabled: bool,
|
||||
pub group: i64,
|
||||
pub seeders: i64,
|
||||
pub peers: i64,
|
||||
pub downloaded: i64,
|
||||
pub last_updated: i64,
|
||||
pub interval: i64,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, ToSchema)]
|
||||
|
||||
@@ -193,7 +193,13 @@ pub async fn get_trackers(hash: String) -> Result<Vec<TorrentTracker>, ServerFnE
|
||||
RpcParam::from(hash.as_str()),
|
||||
RpcParam::from(""),
|
||||
RpcParam::from("t.url="),
|
||||
RpcParam::from("t.is_enabled="),
|
||||
RpcParam::from("t.group="),
|
||||
RpcParam::from("t.scrape_complete="),
|
||||
RpcParam::from("t.scrape_incomplete="),
|
||||
RpcParam::from("t.scrape_downloaded="),
|
||||
RpcParam::from("t.activity_date_last="),
|
||||
RpcParam::from("t.normal_interval="),
|
||||
RpcParam::from("t.message="),
|
||||
];
|
||||
|
||||
@@ -209,8 +215,15 @@ pub async fn get_trackers(hash: String) -> Result<Vec<TorrentTracker>, ServerFnE
|
||||
.into_iter()
|
||||
.map(|row| TorrentTracker {
|
||||
url: row.get(0).cloned().unwrap_or_default(),
|
||||
status: "Unknown".to_string(),
|
||||
message: row.get(2).cloned().unwrap_or_default(),
|
||||
is_enabled: row.get(1).and_then(|s| s.parse::<i64>().ok()).unwrap_or(0) != 0,
|
||||
group: row.get(2).and_then(|s| s.parse().ok()).unwrap_or(0),
|
||||
seeders: row.get(3).and_then(|s| s.parse().ok()).unwrap_or(0),
|
||||
peers: row.get(4).and_then(|s| s.parse().ok()).unwrap_or(0),
|
||||
downloaded: row.get(5).and_then(|s| s.parse().ok()).unwrap_or(0),
|
||||
last_updated: row.get(6).and_then(|s| s.parse().ok()).unwrap_or(0),
|
||||
interval: row.get(7).and_then(|s| s.parse().ok()).unwrap_or(0),
|
||||
status: "Unknown".to_string(), // Can derive from message or activity later, or keep unknown
|
||||
message: row.get(8).cloned().unwrap_or_default(),
|
||||
})
|
||||
.collect())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user