Merge branch 'master' of ssh://gitea.eppixx.freeddns.org:10022/eppixx/reel-moby

.gitignore

@@ -1 +1,7 @@
+# build files
 /target
+
+# test files
+docker-compose.yml
+docker-compose.yaml
+docker-compose.yml.yml

src/repo.rs

@@ -25,6 +25,9 @@ pub enum Repo {
 }
 
 /// check if yaml line matches and returns the split of repo string and rest
+/// the first &str is the image tag
+/// it will be used to not change the identation
+/// the second &str will the the identifier for the image
 pub fn match_yaml_image(input: &str) -> Result<(&str, &str), Error> {
     lazy_static::lazy_static! {
         static ref REGEX: Regex = Regex::new(r"^( +image *: *)([a-z0-9\-\./:]+)").unwrap();
@@ -37,6 +40,7 @@ pub fn match_yaml_image(input: &str) -> Result<(&str, &str), Error> {
     Ok((caps.get(1).unwrap().as_str(), caps.get(2).unwrap().as_str()))
 }
 
+/// takes the identifier and splits off the tag it exists
 pub fn split_tag_from_repo(input: &str) -> Result<(&str, &str), Error> {
     lazy_static::lazy_static! {
         static ref REGEX: Regex = Regex::new(r"^([a-z0-9\./[^:]]*):?([a-z0-9._\-]*)").unwrap();
@@ -59,6 +63,7 @@ pub fn split_tag_from_repo(input: &str) -> Result<(&str, &str), Error> {
     Ok((front, back))
 }
 
+/// takes an identifier and changes it to a Repo enum
 pub fn split_repo_without_tag(repo: &str) -> Result<Repo, Error> {
     let repo = repo.trim();
     let split_repo: Vec<&str> = repo.split('/').collect();

src/repository/dockerhub.rs

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

src/repository/mod.rs

@@ -27,10 +27,11 @@ impl fmt::Display for Error {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, PartialEq)]
 pub struct TagDetails {
-    arch: Option<String>,
+    pub arch: Option<String>,
-    size: Option<usize>,
+    pub os: Option<String>,
+    pub size: Option<usize>,
 }
 
 impl fmt::Display for TagDetails {
@@ -69,11 +70,6 @@ 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(),
@@ -86,7 +82,11 @@ impl Tag {
         };
 
         if dif.is_empty() {}
-        format!("{}{}{}", self.name, dif, arch)
+        format!("{}{}", self.name, dif)
+    }
+
+    pub fn get_details(&self) -> &Vec<TagDetails> {
+        &self.details
     }
 }
 

src/ui/default.rs

@@ -18,6 +18,7 @@ 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,
 }
 
@@ -28,6 +29,16 @@ pub enum State {
     SelectService,
 }
 
+impl std::fmt::Display for State {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            State::EditRepo => write!(f, "Edit repository"),
+            State::SelectTag => write!(f, "Select a tag"),
+            State::SelectService => write!(f, "Select a image"),
+        }
+    }
+}
+
 impl std::iter::Iterator for State {
     type Item = Self;
 
@@ -56,6 +67,7 @@ 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"),
         };
 
@@ -80,7 +92,7 @@ impl Ui {
                         .direction(Direction::Vertical)
                         .constraints(
                             [
-                                Constraint::Min(9),
+                                Constraint::Length(10),
                                 Constraint::Length(3),
                                 Constraint::Min(7),
                                 Constraint::Length(2),
@@ -93,7 +105,12 @@ 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);
-                    rect.render_stateful_widget(list, chunks[2], state);
+                    let more_chunks = Layout::default()
+                        .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();
@@ -103,13 +120,14 @@ impl Ui {
                 Ok(Key::Ctrl('q')) => break 'core, //quit program without saving
                 Ok(Key::Char('\t')) => {
                     ui.state.next();
+                    ui.info.set_info(&ui.state);
                 }
                 Ok(Key::Ctrl('s')) => match ui.services.save() {
                     Err(e) => {
                         ui.info.set_info(&format!("{}", e));
                         continue;
                     }
-                    Ok(_) => ui.info.set_info("Saved compose file"),
+                    Ok(_) => ui.info.set_text("Saved compose file"),
                 },
                 Ok(Key::Ctrl('r')) => {
                     ui.repo.confirm();
@@ -139,7 +157,7 @@ impl Ui {
                 Ok(Key::Char(key)) => match ui.state {
                     State::SelectService => (),
                     State::EditRepo => {
-                        ui.info.set_info("Editing Repository");
+                        ui.info.set_text("Editing Repository");
                         ui.repo.handle_input(Key::Char(key));
                     }
                     State::SelectTag => (),
@@ -147,7 +165,7 @@ impl Ui {
                 Ok(Key::Backspace) => match ui.state {
                     State::SelectService => (),
                     State::EditRepo => {
-                        ui.info.set_info("Editing Repository");
+                        ui.info.set_text("Editing Repository");
                         ui.repo.handle_input(Key::Backspace);
                     }
                     State::SelectTag => (),
@@ -171,7 +189,10 @@ impl Ui {
                     }
                     State::SelectService => (),
                     State::EditRepo => (),
-                    State::SelectTag => ui.tags.handle_input(Key::Up),
+                    State::SelectTag => {
+                        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() => {
@@ -192,7 +213,10 @@ impl Ui {
                     }
                     State::SelectService => (),
                     State::EditRepo => (),
-                    State::SelectTag => ui.tags.handle_input(Key::Down),
+                    State::SelectTag => {
+                        ui.tags.handle_input(Key::Down);
+                        ui.details = ui.tags.create_detail_widget();
+                    }
                 },
                 _ => (),
             }

src/ui/no_yaml.rs

@@ -6,6 +6,7 @@ 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;
@@ -17,6 +18,15 @@ pub enum State {
     SelectTag,
 }
 
+impl std::fmt::Display for State {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            State::EditRepo => write!(f, "Edit repository"),
+            State::SelectTag => write!(f, "Select a tag"),
+        }
+    }
+}
+
 impl std::iter::Iterator for State {
     type Item = Self;
 
@@ -33,6 +43,7 @@ pub struct NoYaml {
     state: State,
     repo: repo_entry::RepoEntry,
     tags: tag_list::TagList,
+    details: details::Details,
     info: info::Info,
 }
 
@@ -52,6 +63,7 @@ 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"),
         };
 
@@ -87,7 +99,12 @@ impl NoYaml {
 
                     rect.render_widget(ui.repo.render(ui.state == State::EditRepo), chunks[0]);
                     let (list, state) = ui.tags.render(ui.state == State::SelectTag);
-                    rect.render_stateful_widget(list, chunks[1], state);
+                    let more_chunks = Layout::default()
+                        .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();
@@ -97,6 +114,7 @@ impl NoYaml {
                 Ok(Key::Ctrl('q')) => break 'core,
                 Ok(Key::Char('\t')) => {
                     ui.state.next();
+                    ui.info.set_info(&ui.state);
                 }
                 Ok(Key::Ctrl('r')) => {
                     ui.repo.confirm();
@@ -111,7 +129,7 @@ impl NoYaml {
                 },
                 Ok(Key::Char(key)) => match ui.state {
                     State::EditRepo => {
-                        ui.info.set_info("Editing Repository");
+                        ui.info.set_text("Editing Repository");
                         ui.repo.handle_input(Key::Char(key));
                     }
                     State::SelectTag => {
@@ -120,18 +138,24 @@ impl NoYaml {
                 },
                 Ok(Key::Backspace) => match ui.state {
                     State::EditRepo => {
-                        ui.info.set_info("Editing Repository");
+                        ui.info.set_text("Editing Repository");
                         ui.repo.handle_input(Key::Backspace);
                     }
                     State::SelectTag => (),
                 },
                 Ok(Key::Up) => match ui.state {
                     State::EditRepo => (),
-                    State::SelectTag => ui.tags.handle_input(Key::Up),
+                    State::SelectTag => {
+                        ui.tags.handle_input(Key::Up);
+                        ui.details = ui.tags.create_detail_widget();
+                    }
                 },
                 Ok(Key::Down) => match ui.state {
                     State::EditRepo => (),
-                    State::SelectTag => ui.tags.handle_input(Key::Down),
+                    State::SelectTag => {
+                        ui.tags.handle_input(Key::Down);
+                        ui.details = ui.tags.create_detail_widget();
+                    }
                 },
                 _ => (),
             }

src/widget/details.rs

@@ -0,0 +1,57 @@
+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/info.rs

@@ -27,7 +27,13 @@ impl Info {
             .highlight_style(Style::default().bg(Color::Black))
     }
 
-    pub fn set_info(&mut self, info: &str) {
+    /// set a text to display
+    pub fn set_text(&mut self, info: &str) {
         self.info = String::from(info);
     }
+
+    /// print a text to display
+    pub fn set_info(&mut self, text: &dyn std::fmt::Display) {
+        self.info = format!("{}", text);
+    }
 }

src/widget/mod.rs

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

src/widget/service_switcher.rs

@@ -34,6 +34,7 @@ pub struct ServiceSwitcher {
 
 impl ServiceSwitcher {
     pub fn new(file: &Option<PathBuf>) -> Option<Self> {
+        //gather possible filenames
         let mut file_list = vec![
             PathBuf::from("docker-compose.yml"),
             PathBuf::from("docker-compose.yaml"),
@@ -43,6 +44,7 @@ impl ServiceSwitcher {
             Some(file) => file_list.insert(0, file.clone()),
         }
 
+        //try filenames
         for file in file_list {
             let list = match File::open(&file) {
                 Err(_) => continue,

src/widget/tag_list.rs

@@ -45,6 +45,7 @@ pub struct TagList {
 }
 
 impl TagList {
+    /// shows a text in the list and no tags
     pub fn with_status(status: &str) -> Self {
         Self {
             lines: vec![Line::Status(String::from(status))],
@@ -53,6 +54,7 @@ impl TagList {
         }
     }
 
+    /// list the tags of the repository if the input is valid
     pub fn with_repo_name(repo: String) -> Self {
         match repository::Repo::new(&repo) {
             Ok(tags) => Self::with_tags(tags),
@@ -60,7 +62,8 @@ impl TagList {
         }
     }
 
-    pub fn with_tags(mut tags: repository::Repo) -> Self {
+    /// list the tags of the input
+    fn with_tags(mut tags: repository::Repo) -> Self {
         let mut lines: Vec<Line> = tags
             .get_tags()
             .iter()
@@ -113,6 +116,18 @@ 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(),