refactor: simplify impl

cnblogs · Sep 25, 2023 · 5be3e5a · 5be3e5a
1 parent f66f939
commit 5be3e5a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/src/args/parser.rs b/src/args/parser.rs
@@ -396,7 +396,7 @@ pub fn create_post(args: &Args) -> Option<(&String, &String, bool)> {
     .into_some()
 }
 
-// TODO
+// TODO: fix warn
 #[allow(clippy::type_complexity)]
 pub fn update_post(
     args: &Args,

diff --git a/src/display/colorful.rs b/src/display/colorful.rs
@@ -11,6 +11,7 @@ use crate::args::TimeStyle;
 use crate::infra::iter::IteratorExt;
 use crate::infra::result::IntoResult;
 use crate::infra::str::StrExt;
+use crate::infra::terminal::get_term_width;
 use crate::infra::time::display_cnb_time;
 use anyhow::Result;
 use colored::Colorize;
@@ -111,9 +112,7 @@ pub fn list_ing(
                 writeln!(buf, " {} {}", "#".dimmed(), ing.id.to_string().dimmed())?;
                 let content = if align {
                     let user_name_width = ing.user_name.width_cjk();
-                    let term_width =
-                        terminal_size().expect("Can not get terminal size").0 .0 as usize;
-                    let left_width = term_width.saturating_sub(user_name_width + 3);
+                    let left_width = get_term_width().saturating_sub(user_name_width + 3);
                     fmt_content(&ing.content)
                         .width_split(left_width)
                         .map_or_else(
@@ -271,7 +270,6 @@ pub fn list_post(result: &Result<(Vec<PostEntry>, usize)>, rev: bool) -> Result<
     };
 
     entry_list.iter().dyn_rev(rev).try_fold(
-        //TODO: formatln! macro
         format!("{}/{}\n", entry_list.len(), total_count),
         |mut buf, entry| try {
             {

diff --git a/src/display/normal.rs b/src/display/normal.rs
@@ -11,6 +11,7 @@ use crate::args::TimeStyle;
 use crate::infra::iter::IteratorExt;
 use crate::infra::result::IntoResult;
 use crate::infra::str::StrExt;
+use crate::infra::terminal::get_term_width;
 use crate::infra::time::display_cnb_time;
 use anyhow::{Context, Result};
 use std::fmt::{Display, Write};
@@ -109,11 +110,7 @@ pub fn list_ing(
                 writeln!(buf, " # {}", ing.id)?;
                 let content = if align {
                     let user_name_width = ing.user_name.width_cjk();
-                    let term_width = terminal_size()
-                        .with_context(|| "Can not get terminal size")?
-                        .0
-                         .0 as usize;
-                    let left_width = term_width.saturating_sub(user_name_width + 3);
+                    let left_width = get_term_width().saturating_sub(user_name_width + 3);
                     fmt_content(&ing.content)
                         .width_split(left_width)
                         .map_or_else(
@@ -265,7 +262,6 @@ pub fn list_post(result: &Result<(Vec<PostEntry>, usize)>, rev: bool) -> Result<
     };
 
     entry_list.iter().dyn_rev(rev).try_fold(
-        //TODO: formatln! macro
         format!("{}/{}\n", entry_list.len(), total_count),
         |mut buf, entry| try {
             {

diff --git a/src/infra/mod.rs b/src/infra/mod.rs
@@ -5,5 +5,6 @@ pub mod json;
 pub mod option;
 pub mod result;
 pub mod str;
+pub mod terminal;
 pub mod time;
 pub mod vec;
diff --git a/src/infra/terminal.rs b/src/infra/terminal.rs
@@ -0,0 +1,6 @@
+use terminal_size::{terminal_size, Width};
+
+pub fn get_term_width() -> usize {
+    let (Width(width), _) = terminal_size().expect("Can not get terminal size");
+    width as usize
+}