add more headers

intuis · Jul 5, 2024 · 1477010 · 1477010
1 parent cc095a1
commit 1477010
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 15 deletions.
diff --git a/rm-config/defaults/config.toml b/rm-config/defaults/config.toml
@@ -29,6 +29,6 @@ free_space_refresh = 10
 
 [torrents_tab]
 # Available fields:
-# Name, SizeWhenDone, Progress, DownloadRate, UploadRate, DownloadDir,
-# Padding
+# Id, Name, SizeWhenDone, Progress, DownloadRate, UploadRate, DownloadDir,
+# Padding, UploadRatio, UploadedEver
 headers = ["Name", "SizeWhenDone", "Progress", "DownloadRate", "UploadRate"]
diff --git a/rm-config/src/main_config.rs b/rm-config/src/main_config.rs
@@ -62,6 +62,9 @@ pub enum Header {
     UploadRate,
     DownloadDir,
     Padding,
+    UploadRatio,
+    UploadedEver,
+    Id,
 }
 
 impl Header {
@@ -75,6 +78,9 @@ impl Header {
             Header::UploadRate => Constraint::Length(12),
             Header::DownloadDir => Constraint::Max(70),
             Header::Padding => Constraint::Length(2),
+            Header::UploadRatio => Constraint::Length(6),
+            Header::UploadedEver => Constraint::Length(12),
+            Header::Id => Constraint::Length(4),
         }
     }
 
@@ -88,6 +94,9 @@ impl Header {
             Header::UploadRate => "Upload",
             Header::DownloadDir => "Directory",
             Header::Padding => "",
+            Header::UploadRatio => "Ratio",
+            Header::UploadedEver => "Up Ever",
+            Header::Id => "Id",
         }
     }
 }

diff --git a/rm-main/src/transmission/fetchers.rs b/rm-main/src/transmission/fetchers.rs
@@ -72,6 +72,7 @@ pub async fn torrents(ctx: app::Ctx, table_manager: Arc<Mutex<TableManager>>) {
             TorrentGetField::RateDownload,
             TorrentGetField::Status,
             TorrentGetField::DownloadDir,
+            TorrentGetField::UploadedEver,
         ];
         let rpc_response = ctx
             .client

diff --git a/rm-main/src/ui/tabs/torrents/rustmission_torrent.rs b/rm-main/src/ui/tabs/torrents/rustmission_torrent.rs
@@ -18,26 +18,15 @@ pub struct RustmissionTorrent {
     pub eta_secs: String,
     pub download_speed: String,
     pub upload_speed: String,
+    pub uploaded_ever: String,
+    pub upload_ratio: String,
     status: TorrentStatus,
     pub style: Style,
     pub id: Id,
     pub download_dir: String,
 }
 
 impl RustmissionTorrent {
-    fn header_to_line(&self, header: Header) -> Line {
-        match header {
-            Header::Name => Line::from(self.torrent_name.as_str()),
-            Header::SizeWhenDone => Line::from(self.size_when_done.as_str()),
-            Header::Progress => Line::from(self.progress.as_str()),
-            Header::Eta => Line::from(self.eta_secs.as_str()),
-            Header::DownloadRate => Line::from(download_speed_format(&self.download_speed)),
-            Header::UploadRate => Line::from(upload_speed_format(&self.upload_speed)),
-            Header::DownloadDir => Line::from(self.download_dir.as_str()),
-            Header::Padding => Line::raw(""),
-        }
-    }
-
     pub fn to_row(&self, headers: &Vec<Header>) -> ratatui::widgets::Row {
         headers
             .iter()
@@ -75,6 +64,25 @@ impl RustmissionTorrent {
         Row::new(cells)
     }
 
+    fn header_to_line(&self, header: Header) -> Line {
+        match header {
+            Header::Name => Line::from(self.torrent_name.as_str()),
+            Header::SizeWhenDone => Line::from(self.size_when_done.as_str()),
+            Header::Progress => Line::from(self.progress.as_str()),
+            Header::Eta => Line::from(self.eta_secs.as_str()),
+            Header::DownloadRate => Line::from(download_speed_format(&self.download_speed)),
+            Header::UploadRate => Line::from(upload_speed_format(&self.upload_speed)),
+            Header::DownloadDir => Line::from(self.download_dir.as_str()),
+            Header::Padding => Line::raw(""),
+            Header::Id => match &self.id {
+                Id::Id(id) => Line::from(id.to_string()),
+                Id::Hash(hash) => Line::from(hash.as_str()),
+            },
+            Header::UploadRatio => Line::from(self.upload_ratio.as_str()),
+            Header::UploadedEver => Line::from(self.uploaded_ever.as_str()),
+        }
+    }
+
     pub const fn status(&self) -> TorrentStatus {
         self.status
     }
@@ -128,6 +136,13 @@ impl From<&Torrent> for RustmissionTorrent {
 
         let download_dir = t.download_dir.clone().expect("field requested");
 
+        let uploaded_ever = bytes_to_human_format(t.uploaded_ever.expect("field requested"));
+
+        let upload_ratio = {
+            let ratio = t.upload_ratio.expect("field requested");
+            format!("{:.1}", ratio)
+        };
+
         Self {
             torrent_name,
             size_when_done,
@@ -139,6 +154,8 @@ impl From<&Torrent> for RustmissionTorrent {
             style,
             id,
             download_dir,
+            uploaded_ever,
+            upload_ratio,
         }
     }
 }