src/repository/dockerhub.rs

@@ -5,8 +5,6 @@ use crate::repository::Error;
 #[derive(Deserialize, Debug, Clone)]
 struct ImageDetails {
     architecture: String,
-    os: String,
-    variant: Option<String>,
     size: usize,
 }
 
@@ -27,12 +25,7 @@ impl Images {
                 .images
                 .iter()
                 .map(|d| super::TagDetails {
-                    arch: Some(format!(
+                    arch: Some(d.architecture.clone()),
-                        "{}{}",
-                        d.architecture.clone(),
-                        d.variant.clone().unwrap_or_default()
-                    )),
-                    os: Some(d.os.clone()),
                     size: Some(d.size),
                 })
                 .collect(),

src/repository/mod.rs

@@ -27,11 +27,10 @@ impl fmt::Display for Error {
     }
 }
 
-#[derive(Clone, PartialEq)]
+#[derive(Clone)]
 pub struct TagDetails {
-    pub arch: Option<String>,
+    arch: Option<String>,
-    pub os: Option<String>,
+    size: Option<usize>,
-    pub size: Option<usize>,
 }
 
 impl fmt::Display for TagDetails {
@@ -70,6 +69,11 @@ impl Tag {
         for image in self.details.iter().skip(1) {
             arch.push_str(&format!(", {}", image));
         }
+        let arch = if !arch.is_empty() {
+            format!(" [{}]", arch)
+        } else {
+            String::new()
+        };
 
         let dif = match &self.last_updated {
             None => "".to_string(),
@@ -82,11 +86,7 @@ impl Tag {
         };
 
         if dif.is_empty() {}
-        format!("{}{}", self.name, dif)
+        format!("{}{}{}", self.name, dif, arch)
-    }
-
-    pub fn get_details(&self) -> &Vec<TagDetails> {
-        &self.details
     }
 }
 

src/ui/default.rs

@@ -18,7 +18,6 @@ pub struct Ui {
     repo: crate::widget::repo_entry::RepoEntry,
     tags: crate::widget::tag_list::TagList,
     services: crate::widget::service_switcher::ServiceSwitcher,
-    details: crate::widget::details::Details,
     info: crate::widget::info::Info,
 }
 
@@ -67,7 +66,6 @@ impl Ui {
             repo: repo_entry::RepoEntry::new(repo_id),
             tags: tag_list::TagList::with_status("Tags are empty"),
             services: service_switcher::ServiceSwitcher::new(&opt.file).unwrap(),
-            details: crate::widget::details::Details::new(),
             info: info::Info::new("Select image of edit Repository"),
         };
 
@@ -92,7 +90,7 @@ impl Ui {
                         .direction(Direction::Vertical)
                         .constraints(
                             [
-                                Constraint::Length(10),
+                                Constraint::Min(9),
                                 Constraint::Length(3),
                                 Constraint::Min(7),
                                 Constraint::Length(2),
@@ -105,12 +103,7 @@ impl Ui {
                     rect.render_stateful_widget(list, chunks[0], state);
                     rect.render_widget(ui.repo.render(ui.state == State::EditRepo), chunks[1]);
                     let (list, state) = ui.tags.render(ui.state == State::SelectTag);
-                    let more_chunks = Layout::default()
+                    rect.render_stateful_widget(list, chunks[2], state);
-                        .direction(Direction::Horizontal)
-                        .constraints([Constraint::Min(15), Constraint::Length(28)].as_ref())
-                        .split(chunks[2]);
-                    rect.render_stateful_widget(list, more_chunks[0], state);
-                    rect.render_widget(ui.details.render(), more_chunks[1]);
                     rect.render_widget(ui.info.render(), chunks[3]);
                 })
                 .unwrap();
@@ -189,10 +182,7 @@ impl Ui {
                     }
                     State::SelectService => (),
                     State::EditRepo => (),
-                    State::SelectTag => {
+                    State::SelectTag => ui.tags.handle_input(Key::Up),
-                        ui.tags.handle_input(Key::Up);
-                        ui.details = ui.tags.create_detail_widget();
-                    }
                 },
                 Ok(Key::Down) => match ui.state {
                     State::SelectService if ui.services.find_next_match() => {
@@ -213,10 +203,7 @@ impl Ui {
                     }
                     State::SelectService => (),
                     State::EditRepo => (),
-                    State::SelectTag => {
+                    State::SelectTag => ui.tags.handle_input(Key::Down),
-                        ui.tags.handle_input(Key::Down);
-                        ui.details = ui.tags.create_detail_widget();
-                    }
                 },
                 _ => (),
             }

src/ui/no_yaml.rs

@@ -6,7 +6,6 @@ use tui::backend::TermionBackend;
 use tui::layout::{Constraint, Direction, Layout};
 use tui::Terminal;
 
-use crate::widget::details;
 use crate::widget::info;
 use crate::widget::repo_entry;
 use crate::widget::tag_list;
@@ -43,7 +42,6 @@ pub struct NoYaml {
     state: State,
     repo: repo_entry::RepoEntry,
     tags: tag_list::TagList,
-    details: details::Details,
     info: info::Info,
 }
 
@@ -63,7 +61,6 @@ impl NoYaml {
             state: State::EditRepo,
             repo,
             tags: tag_list::TagList::with_status("Tags are empty"),
-            details: details::Details::new(),
             info: info::Info::new("could not find a docker-compose file"),
         };
 
@@ -99,12 +96,7 @@ impl NoYaml {
 
                     rect.render_widget(ui.repo.render(ui.state == State::EditRepo), chunks[0]);
                     let (list, state) = ui.tags.render(ui.state == State::SelectTag);
-                    let more_chunks = Layout::default()
+                    rect.render_stateful_widget(list, chunks[1], state);
-                        .direction(Direction::Horizontal)
-                        .constraints([Constraint::Min(15), Constraint::Length(28)].as_ref())
-                        .split(chunks[1]);
-                    rect.render_stateful_widget(list, more_chunks[0], state);
-                    rect.render_widget(ui.details.render(), more_chunks[1]);
                     rect.render_widget(ui.info.render(), chunks[2]);
                 })
                 .unwrap();
@@ -145,17 +137,11 @@ impl NoYaml {
                 },
                 Ok(Key::Up) => match ui.state {
                     State::EditRepo => (),
-                    State::SelectTag => {
+                    State::SelectTag => ui.tags.handle_input(Key::Up),
-                        ui.tags.handle_input(Key::Up);
-                        ui.details = ui.tags.create_detail_widget();
-                    }
                 },
                 Ok(Key::Down) => match ui.state {
                     State::EditRepo => (),
-                    State::SelectTag => {
+                    State::SelectTag => ui.tags.handle_input(Key::Down),
-                        ui.tags.handle_input(Key::Down);
-                        ui.details = ui.tags.create_detail_widget();
-                    }
                 },
                 _ => (),
             }

src/widget/details.rs

@@ -1,57 +0,0 @@
-use tui::style::{Color, Style};
-use tui::widgets::{Block, Borders, List};
-
-use crate::repository;
-
-pub struct Details {
-    details: Vec<repository::TagDetails>,
-}
-
-impl Details {
-    pub fn new() -> Self {
-        Self { details: vec![] }
-    }
-
-    pub fn with_list(details: &[crate::repository::TagDetails]) -> Self {
-        let mut detail = Self {
-            details: details.to_owned(),
-        };
-
-        detail.details.sort_by(|a, b| a.arch.cmp(&b.arch));
-        detail.details.dedup();
-        detail
-    }
-
-    pub fn get_details(&self) -> Vec<String> {
-        let mut lines = vec![format!("{:^10}|{:^6}|{:^6}", "ARCH", "OS", "SIZE")];
-        for d in &self.details {
-            lines.push(format!(
-                "{:^10}|{:^6}|{:^6}",
-                d.arch.clone().unwrap_or_default(),
-                d.os.clone().unwrap_or_default(),
-                format!("{}MB", d.size.unwrap_or_default() / 1024 / 1024)
-            ));
-        }
-        lines
-    }
-
-    pub fn render(&self) -> List {
-        let items: Vec<tui::widgets::ListItem> = self
-            .get_details()
-            .iter()
-            .map(|l| {
-                tui::widgets::ListItem::new(l.to_string())
-                    .style(Style::default().fg(Color::White).bg(Color::Black))
-            })
-            .collect();
-
-        List::new(items)
-            .block(
-                Block::default()
-                    .title("Details")
-                    .borders(Borders::ALL)
-                    .border_style(Style::default()),
-            )
-            .style(Style::default().fg(Color::White).bg(Color::Black))
-    }
-}

src/widget/mod.rs

@@ -1,4 +1,3 @@
-pub mod details;
 pub mod info;
 pub mod repo_entry;
 pub mod service_switcher;

src/widget/tag_list.rs

@@ -116,18 +116,6 @@ impl TagList {
         (items, &mut self.state)
     }
 
-    pub fn create_detail_widget(&self) -> crate::widget::details::Details {
-        use crate::widget::details::Details;
-
-        match self.state.selected() {
-            None => Details::new(),
-            Some(i) => match &self.lines[i] {
-                Line::Image(t) => Details::with_list(t.get_details()),
-                _ => Details::new(),
-            },
-        }
-    }
-
     pub fn handle_input(&mut self, key: termion::event::Key) {
         match key {
             Key::Down => self.next(),