.gitignore

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

Cargo.lock

@@ -673,7 +673,7 @@ dependencies = [
 
 [[package]]
 name = "reel-moby"
-version = "1.2.1"
+version = "0.10.0"
 dependencies = [
  "chrono",
  "lazy_static",

Cargo.toml

@@ -1,8 +1,8 @@
 
 [package]
 name = "reel-moby"
-version = "1.2.1"
-edition = "2021"
+version = "0.11.0"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

src/common/display_duration_ext.rs

@@ -1,28 +0,0 @@
-pub trait DisplayDurationExt {
-    /// displays a duration in a human readable form
-    fn display(&self) -> String;
-}
-
-impl DisplayDurationExt for chrono::Duration {
-    fn display(&self) -> String {
-        if self.num_weeks() == 52 {
-            format!("{} Year", (self.num_weeks() / 52) as i32)
-        } else if self.num_weeks() > 103 {
-            format!("{} Years", (self.num_weeks() / 52) as i32)
-        } else if self.num_days() == 1 {
-            format!("{} Day", self.num_days())
-        } else if self.num_days() > 1 {
-            format!("{} Days", self.num_days())
-        } else if self.num_hours() == 1 {
-            format!("{} Hour", self.num_hours())
-        } else if self.num_hours() > 1 {
-            format!("{} Hours", self.num_hours())
-        } else if self.num_minutes() == 1 {
-            format!("{} Minute", self.num_minutes())
-        } else if self.num_minutes() > 1 {
-            format!("{} Minutes", self.num_minutes())
-        } else {
-            format!("{} Seconds", self.num_seconds())
-        }
-    }
-}

src/common/mod.rs

@@ -1 +0,0 @@
-pub mod display_duration_ext;

src/main.rs

@@ -1,15 +1,18 @@
 use std::path::PathBuf;
 use structopt::StructOpt;
 
-mod common;
 mod repo;
-mod repository;
+mod tags;
 mod ui;
 mod widget;
 
 /// helps you searching or updating tags of your used docker images
 #[derive(StructOpt, Debug)]
 pub struct Opt {
+    /// Show architectures of images and their sizes
+    #[structopt(short, long)]
+    verbose: bool,
+
     /// A custom path to a docker-compose file
     #[structopt(short, long, parse(from_os_str))]
     file: Option<PathBuf>,

src/repo.rs

@@ -25,12 +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();
+        static ref REGEX: Regex = Regex::new(r"^( +image *: *)([a-z0-9\./:]+)").unwrap();
     }
     let caps = match REGEX.captures(input) {
         Some(caps) => caps,
@@ -40,7 +37,6 @@ 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();
@@ -63,7 +59,6 @@ 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();
@@ -103,79 +98,58 @@ mod tests {
 
     #[test]
     fn test_split_repo_without_tag() {
-        let input: Vec<(&str, Result<Repo, Error>)> = vec![
-            ("", Err(Error::MisformedInput)),
-            ("NGINX", Err(Error::MisformedInput)),
-            ("nginx", Ok(Repo::Project("nginx".into()))),
-            (
-                "library/nginx",
-                Ok(Repo::WithOrga("library".into(), "nginx".into())),
-            ),
-            (
-                "ghcr.io/library/nginx",
-                Ok(Repo::WithServer(
-                    "ghcr.io".into(),
-                    "library".into(),
-                    "nginx".into(),
-                )),
-            ),
-            (
-                "te-st/test-hypen",
-                Ok(Repo::WithOrga("te-st".into(), "test-hypen".into())),
-            ),
-            (
-                "test/test.dot",
-                Ok(Repo::WithOrga("test".into(), "test.dot".into())),
-            ),
-        ];
-
-        for i in input {
-            assert_eq!(super::split_repo_without_tag(i.0), i.1);
-        }
+        use crate::repo::split_repo_without_tag as test_fn;
+        assert_eq!(test_fn(""), Err(Error::MisformedInput));
+        assert_eq!(test_fn("NGINX"), Err(Error::MisformedInput));
+        assert_eq!(test_fn("nginx"), Ok(Repo::Project("nginx".into())));
+        assert_eq!(
+            test_fn("library/nginx"),
+            Ok(Repo::WithOrga("library".into(), "nginx".into()))
+        );
+        assert_eq!(
+            test_fn("ghcr.io/library/nginx"),
+            Ok(Repo::WithServer(
+                "ghcr.io".into(),
+                "library".into(),
+                "nginx".into(),
+            ))
+        );
     }
 
     #[test]
     fn test_match_yaml_image() {
-        let input: Vec<(&str, Result<(&str, &str), Error>)> = vec![
-            ("", Err(Error::NoTagFound)),
-            ("version: '2'", Err(Error::NoTagFound)),
-            ("image: ", Err(Error::NoTagFound)),
-            ("  image: ", Err(Error::NoTagFound)),
-            ("  image: nginx", Ok(("  image: ", "nginx"))),
-            ("  image: library/nginx", Ok(("  image: ", "library/nginx"))),
-            (
-                "  image: gchr.io/library/nginx",
-                Ok(("  image: ", "gchr.io/library/nginx")),
-            ),
-            ("  image: nginx # comment", Ok(("  image: ", "nginx"))),
-            ("  image: test-hyphen", Ok(("  image: ", "test-hyphen"))),
-            ("  image: test.dot", Ok(("  image: ", "test.dot"))),
-        ];
-
-        for i in input {
-            assert_eq!(super::match_yaml_image(i.0), i.1);
-        }
+        use crate::repo::match_yaml_image as test_fn;
+        assert_eq!(test_fn(""), Err(Error::NoTagFound));
+        assert_eq!(test_fn("version: '2'"), Err(Error::NoTagFound));
+        assert_eq!(test_fn("image: "), Err(Error::NoTagFound));
+        assert_eq!(test_fn("  image: "), Err(Error::NoTagFound));
+        assert_eq!(test_fn("  image: nginx"), Ok(("  image: ", "nginx")));
+        assert_eq!(
+            test_fn("  image: library/nginx"),
+            Ok(("  image: ", "library/nginx"))
+        );
+        assert_eq!(
+            test_fn("  image: ghcr.io/library/nginx"),
+            Ok(("  image: ", "ghcr.io/library/nginx"))
+        );
+        assert_eq!(test_fn("#   image: nginx"), Err(Error::NoTagFound));
+        assert_eq!(
+            test_fn("   image: nginx #comment"),
+            Ok(("   image: ", "nginx"))
+        );
     }
 
     #[test]
     fn test_split_tag_from_repo() {
-        let input: Vec<(&str, Result<(&str, &str), super::Error>)> = vec![
-            ("nginx", Ok(("nginx", ""))),
-            ("library/nginx", Ok(("library/nginx", ""))),
-            ("ghcr.io/library/nginx", Ok(("ghcr.io/library/nginx", ""))),
-            ("nginx:", Ok(("nginx", ""))),
-            ("nginx:1", Ok(("nginx", "1"))),
-            ("nginx:latest", Ok(("nginx", "latest"))),
-            ("hy-phen:latest", Ok(("hy-phen", "latest"))),
-            ("test.dot:latest", Ok(("test.dot", "latest"))),
-            (
-                "woodpeckerci/woodpecker-server",
-                Ok(("woodpeckerci/woodpecker-server", "")),
-            ),
-        ];
-
-        for i in input {
-            assert_eq!(super::split_tag_from_repo(i.0), i.1);
-        }
+        use crate::repo::split_tag_from_repo as test_fn;
+        assert_eq!(test_fn("nginx"), Ok(("nginx", "")));
+        assert_eq!(test_fn("library/nginx"), Ok(("library/nginx", "")));
+        assert_eq!(
+            test_fn("ghcr.io/library/nginx"),
+            Ok(("ghcr.io/library/nginx", ""))
+        );
+        assert_eq!(test_fn("nginx:"), Ok(("nginx", "")));
+        assert_eq!(test_fn("nginx:1"), Ok(("nginx", "1")));
+        assert_eq!(test_fn("nginx:latest"), Ok(("nginx", "latest")));
     }
 }

src/repository/dockerhub.rs

@@ -1,76 +0,0 @@
-use serde::Deserialize;
-
-use crate::repository::Error;
-
-#[derive(Deserialize, Debug, Clone)]
-struct ImageDetails {
-    architecture: String,
-    os: String,
-    variant: Option<String>,
-    size: usize,
-}
-
-#[derive(Deserialize, Clone)]
-pub struct Images {
-    images: Vec<ImageDetails>,
-    #[serde(rename(deserialize = "name"))]
-    tag_name: String,
-    last_updated: String,
-}
-
-impl Images {
-    pub fn convert(&self) -> super::Tag {
-        super::Tag {
-            name: self.tag_name.clone(),
-            last_updated: Some(self.last_updated.clone()),
-            details: self
-                .images
-                .iter()
-                .map(|d| super::TagDetails {
-                    arch: Some(d.architecture.clone()),
-                    variant: Some(d.variant.clone().unwrap_or_default()),
-                    os: Some(d.os.clone()),
-                    size: Some(d.size),
-                })
-                .collect(),
-        }
-    }
-}
-
-#[derive(Deserialize)]
-pub struct DockerHub {
-    #[serde(rename(deserialize = "next"))]
-    next_page: Option<String>,
-    results: Vec<Images>,
-}
-
-impl DockerHub {
-    /// fetches tag information with a repository name in the form of organization/repository or library/repository in the case of official images from docker
-    pub fn create_repo(repo: &str) -> Result<super::Repo, Error> {
-        let request = format!("https://hub.docker.com/v2/repositories/{}/tags", repo);
-        Self::with_url(&request)
-    }
-
-    /// fetches tag information from a url
-    pub fn with_url(url: &str) -> Result<super::Repo, Error> {
-        let response = match reqwest::blocking::get(url) {
-            Ok(result) => result,
-            Err(e) => return Err(Error::Fetching(format!("reqwest error: {}", e))),
-        };
-
-        //convert it to json
-        let tags = match response.json::<Self>() {
-            Ok(result) => result,
-            Err(e) => return Err(Error::Converting(format!("invalid json: {}", e))),
-        };
-
-        if tags.results.is_empty() {
-            return Err(Error::NoTagsFound);
-        }
-
-        Ok(super::Repo {
-            tags: tags.results.iter().map(|t| t.convert()).collect(),
-            next_page: tags.next_page,
-        })
-    }
-}

src/repository/mod.rs

@@ -1,137 +0,0 @@
-mod dockerhub;
-
-use std::fmt;
-
-use chrono::DateTime;
-
-use crate::common::display_duration_ext::DisplayDurationExt;
-use crate::repo;
-
-#[derive(Debug, PartialEq)]
-pub enum Error {
-    /// couldn't fetch json with reqwest
-    Fetching(String),
-    /// a serde error
-    Converting(String),
-    /// invalid repos show a valid json with 0 tags
-    NoTagsFound,
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Error::Fetching(s) => write!(f, "Fetching error: {}", s),
-            Error::Converting(s) => write!(f, "Converting error: {}", s),
-            Error::NoTagsFound => write!(f, "Given Repo has 0 tags. Is it valid?"),
-        }
-    }
-}
-
-#[derive(Clone, PartialEq)]
-pub struct TagDetails {
-    pub arch: Option<String>,
-    pub variant: Option<String>,
-    pub os: Option<String>,
-    pub size: Option<usize>,
-}
-
-#[derive(Clone)]
-pub struct Tag {
-    name: String,
-    details: Vec<TagDetails>,
-    last_updated: Option<String>,
-}
-
-impl Tag {
-    pub fn get_name(&self) -> &str {
-        &self.name
-    }
-
-    pub fn get_name_with_details(&self) -> String {
-        let dif = match &self.last_updated {
-            None => "".to_string(),
-            Some(last_updated) => {
-                let now = chrono::Utc::now();
-                let rfc3339 = DateTime::parse_from_rfc3339(last_updated).unwrap();
-                let dif = now - rfc3339.with_timezone(&chrono::Utc);
-                format!(", {} old", dif.display())
-            }
-        };
-
-        if dif.is_empty() {}
-        format!("{}{}", self.name, dif)
-    }
-
-    pub fn get_details(&self) -> &Vec<TagDetails> {
-        &self.details
-    }
-}
-
-pub struct Repo {
-    tags: Vec<Tag>,
-    next_page: Option<String>,
-}
-
-impl Repo {
-    pub fn new(repo: &str) -> Result<Self, Error> {
-        use crate::repo::Repo;
-        let (registry, repo) = match crate::repo::split_repo_without_tag(repo) {
-            Ok(Repo::WithServer(reg, org, pro)) => (Some(reg), format!("{}/{}", org, pro)),
-            Ok(Repo::WithOrga(org, pro)) => (None, format!("{}/{}", org, pro)),
-            Ok(Repo::Project(pro)) => (None, format!("library/{}", pro)),
-            Err(e) => return Err(Error::Converting(format!("{}", e))),
-        };
-
-        if registry.unwrap_or_default().is_empty() {
-            dockerhub::DockerHub::create_repo(&repo)
-        } else {
-            return Err(Error::Converting("This registry is not supported".into()));
-        }
-    }
-
-    pub fn with_url(url: &str) -> Result<Self, Error> {
-        //TODO fix for other registries
-        dockerhub::DockerHub::with_url(url)
-    }
-
-    pub fn get_tags(&self) -> &Vec<Tag> {
-        &self.tags
-    }
-
-    pub fn next_page(&self) -> Option<Self> {
-        match &self.next_page {
-            Some(url) => match Self::with_url(url) {
-                Ok(tags) => Some(tags),
-                Err(_) => None,
-            },
-            None => None,
-        }
-    }
-}
-
-/// checks the repo name and may add a prefix for official images
-pub fn check_repo(name: &str) -> Result<String, Error> {
-    let repo = match repo::split_tag_from_repo(name) {
-        Err(e) => return Err(Error::Converting(format!("{}", e))),
-        Ok((name, _)) => name,
-    };
-
-    match repo::split_repo_without_tag(name) {
-        Ok(repo::Repo::Project(s)) => Ok(format!("library/{}", s)),
-        Ok(_) => Ok(repo.to_string()),
-        Err(e) => Err(Error::Converting(format!("{}", e))),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_check_repo() {
-        assert_eq!(super::check_repo("nginx").unwrap(), "library/nginx");
-        assert_eq!(super::check_repo("library/nginx").unwrap(), "library/nginx");
-        assert_eq!(
-            super::check_repo("rocketchat/rocket.chat").unwrap(),
-            "rocketchat/rocket.chat"
-        );
-    }
-}

src/tags.rs

@@ -0,0 +1,168 @@
+use std::fmt;
+
+use crate::repo;
+use chrono::DateTime;
+use serde::Deserialize;
+
+#[derive(Deserialize, Debug, Clone)]
+struct ImageDetails {
+    architecture: String,
+    size: usize,
+}
+
+impl fmt::Display for ImageDetails {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}|{}MB", self.architecture, self.size / 1024 / 1024)
+    }
+}
+
+#[derive(Deserialize, Clone)]
+pub struct Images {
+    images: Vec<ImageDetails>,
+    #[serde(rename(deserialize = "name"))]
+    pub tag_name: String,
+    last_updated: String,
+}
+
+impl fmt::Display for Images {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        //architecture infos
+        let mut arch = String::new();
+        for image in self.images.iter().take(1) {
+            arch.push_str(&format!("{}", image));
+        }
+        for image in self.images.iter().skip(1) {
+            arch.push_str(&format!(", {}", image));
+        }
+
+        let now = chrono::Utc::now();
+        let rfc3339 = DateTime::parse_from_rfc3339(&self.last_updated).unwrap();
+        let dif = now - rfc3339.with_timezone(&chrono::Utc);
+        write!(
+            f,
+            "{} vor {} [{}]",
+            self.tag_name,
+            format_time_nice(dif),
+            arch
+        )
+    }
+}
+
+#[derive(Deserialize)]
+pub struct Tags {
+    count: usize,
+    #[serde(rename(deserialize = "next"))]
+    pub next_page: Option<String>,
+    pub results: Vec<Images>,
+}
+
+#[derive(Debug, PartialEq)]
+pub enum Error {
+    /// couldn't fetch json with reqwest
+    Fetching(String),
+    /// a serde error
+    Converting(String),
+    /// invalid repos show a valid json with 0 tags
+    NoTagsFound,
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::Fetching(s) => write!(f, "Fetching error: {}", s),
+            Error::Converting(s) => write!(f, "Converting error: {}", s),
+            Error::NoTagsFound => write!(f, "Given Repo has 0 tags. Is it valid?"),
+        }
+    }
+}
+
+impl Tags {
+    /// fetches tag information with a repository name in the form of organization/repository or library/repository in the case of official images from docker
+    pub fn new(repo: String) -> Result<Self, Error> {
+        let request = format!("https://hub.docker.com/v2/repositories/{}/tags", repo);
+        Self::with_url(&request)
+    }
+
+    /// fetches tag information from a url
+    fn with_url(url: &str) -> Result<Self, Error> {
+        let res = match reqwest::blocking::get(url) {
+            Ok(result) => result,
+            Err(e) => return Err(Error::Fetching(format!("reqwest error: {}", e))),
+        };
+
+        //convert it to json
+        let raw = res.text().unwrap();
+        let tags: Self = match serde_json::from_str(&raw) {
+            Ok(result) => result,
+            Err(e) => return Err(Error::Converting(format!("invalid json: {}", e))),
+        };
+
+        if tags.count == 0 {
+            return Err(Error::NoTagsFound);
+        }
+
+        Ok(tags)
+    }
+
+    /// checks the repo name and may add a prefix for official images
+    pub fn check_repo(name: &str) -> Result<String, Error> {
+        let repo = match repo::split_tag_from_repo(name) {
+            Err(e) => return Err(Error::Converting(format!("{}", e))),
+            Ok((name, _)) => name,
+        };
+
+        match repo::split_repo_without_tag(name) {
+            Ok(repo::Repo::Project(s)) => Ok(format!("library/{}", s)),
+            Ok(_) => Ok(repo.to_string()),
+            Err(e) => Err(Error::Converting(format!("{}", e))),
+        }
+    }
+
+    /// returns tags of next page
+    pub fn next_page(&self) -> Option<Self> {
+        match &self.next_page {
+            Some(url) => match Self::with_url(url) {
+                Ok(tags) => Some(tags),
+                Err(_) => None,
+            },
+            None => None,
+        }
+    }
+}
+
+/// converts a given duration to a readable string
+fn format_time_nice(time: chrono::Duration) -> String {
+    if time.num_weeks() == 52 {
+        format!("{} Jahr", (time.num_weeks() / 52) as i32)
+    } else if time.num_weeks() > 103 {
+        format!("{} Jahren", (time.num_weeks() / 52) as i32)
+    } else if time.num_days() == 1 {
+        format!("{} Tag", time.num_days())
+    } else if time.num_days() > 1 {
+        format!("{} Tagen", time.num_days())
+    } else if time.num_hours() == 1 {
+        format!("{} Stunde", time.num_hours())
+    } else if time.num_hours() > 1 {
+        format!("{} Stunden", time.num_hours())
+    } else if time.num_minutes() == 1 {
+        format!("{} Minute", time.num_minutes())
+    } else if time.num_minutes() > 1 {
+        format!("{} Minuten", time.num_minutes())
+    } else {
+        format!("{} Sekunden", time.num_seconds())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::tags::Tags;
+    #[test]
+    fn test_check_repo() {
+        assert_eq!(Tags::check_repo("nginx").unwrap(), "library/nginx");
+        assert_eq!(Tags::check_repo("library/nginx").unwrap(), "library/nginx");
+        assert_eq!(
+            Tags::check_repo("rocketchat/rocket.chat").unwrap(),
+            "rocketchat/rocket.chat"
+        );
+    }
+}

src/ui/default.rs

@@ -7,7 +7,6 @@ use tui::backend::TermionBackend;
 use tui::layout::{Constraint, Direction, Layout};
 use tui::Terminal;
 
-use crate::repository;
 use crate::widget::info;
 use crate::widget::repo_entry;
 use crate::widget::service_switcher;
@@ -18,7 +17,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,
 }
 
@@ -29,16 +27,6 @@ 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;
 
@@ -54,18 +42,23 @@ impl std::iter::Iterator for State {
 
 impl Ui {
     pub fn run(opt: &Opt) {
-        let repo_id = opt.repo.as_deref();
+        let (repo_id, load_repo) = match &opt.repo {
+            None => (
+                "enter a repository here or select one from file widget",
+                false,
+            ),
+            Some(repo) => (String::as_str(repo), true),
+        };
 
         let mut ui = Ui {
             state: State::SelectService,
             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"),
         };
 
-        if opt.repo.is_none() {
+        if load_repo {
             ui.tags = tag_list::TagList::with_repo_name(ui.repo.get());
         }
 
@@ -86,7 +79,7 @@ impl Ui {
                         .direction(Direction::Vertical)
                         .constraints(
                             [
-                                Constraint::Length(10),
+                                Constraint::Min(9),
                                 Constraint::Length(3),
                                 Constraint::Min(7),
                                 Constraint::Length(2),
@@ -99,12 +92,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()
-                        .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_stateful_widget(list, chunks[2], state);
                     rect.render_widget(ui.info.render(), chunks[3]);
                 })
                 .unwrap();
@@ -114,14 +102,13 @@ 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_text("Saved compose file"),
+                    Ok(_) => ui.info.set_info("Saved compose file"),
                 },
                 Ok(Key::Ctrl('r')) => {
                     ui.repo.confirm();
@@ -151,7 +138,7 @@ impl Ui {
                 Ok(Key::Char(key)) => match ui.state {
                     State::SelectService => (),
                     State::EditRepo => {
-                        ui.info.set_text("Editing Repository");
+                        ui.info.set_info("Editing Repository");
                         ui.repo.handle_input(Key::Char(key));
                     }
                     State::SelectTag => (),
@@ -159,7 +146,7 @@ impl Ui {
                 Ok(Key::Backspace) => match ui.state {
                     State::SelectService => (),
                     State::EditRepo => {
-                        ui.info.set_text("Editing Repository");
+                        ui.info.set_info("Editing Repository");
                         ui.repo.handle_input(Key::Backspace);
                     }
                     State::SelectTag => (),
@@ -169,7 +156,7 @@ impl Ui {
                         match ui.services.extract_repo() {
                             Err(e) => ui.info.set_info(&format!("{}", e)),
                             Ok(s) => {
-                                let repo = match repository::check_repo(&s) {
+                                let repo = match crate::tags::Tags::check_repo(&s) {
                                     Err(e) => {
                                         ui.info.set_info(&format!("{}", e));
                                         continue;
@@ -183,17 +170,14 @@ impl Ui {
                     }
                     State::SelectService => (),
                     State::EditRepo => (),
-                    State::SelectTag => {
-                        ui.tags.handle_input(Key::Up);
-                        ui.details = ui.tags.create_detail_widget();
-                    }
+                    State::SelectTag => ui.tags.handle_input(Key::Up),
                 },
                 Ok(Key::Down) => match ui.state {
                     State::SelectService if ui.services.find_next_match() => {
                         match ui.services.extract_repo() {
                             Err(e) => ui.info.set_info(&format!("{}", e)),
                             Ok(s) => {
-                                let repo = match repository::check_repo(&s) {
+                                let repo = match crate::tags::Tags::check_repo(&s) {
                                     Err(e) => {
                                         ui.info.set_info(&format!("{}", e));
                                         continue;
@@ -207,10 +191,7 @@ impl Ui {
                     }
                     State::SelectService => (),
                     State::EditRepo => (),
-                    State::SelectTag => {
-                        ui.tags.handle_input(Key::Down);
-                        ui.details = ui.tags.create_detail_widget();
-                    }
+                    State::SelectTag => ui.tags.handle_input(Key::Down),
                 },
                 _ => (),
             }

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;
@@ -18,15 +17,6 @@ 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;
 
@@ -43,24 +33,30 @@ pub struct NoYaml {
     state: State,
     repo: repo_entry::RepoEntry,
     tags: tag_list::TagList,
-    details: details::Details,
     info: info::Info,
 }
 
 impl NoYaml {
     pub fn run(opt: &Opt) {
-        let repo_id = opt.repo.as_deref();
+        let (repo, load_repo) = match &opt.repo {
+            None => (
+                repo_entry::RepoEntry::new(
+                    "enter a repository or select one from docker-compose.yml",
+                ),
+                false,
+            ),
+            Some(repo_id) => (repo_entry::RepoEntry::new(repo_id), true),
+        };
 
         let mut ui = NoYaml {
             state: State::EditRepo,
-            repo: repo_entry::RepoEntry::new(repo_id),
+            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"),
         };
 
         // load tags if a repository was given thorugh paramter
-        if opt.repo.is_none() {
+        if load_repo {
             ui.tags = tag_list::TagList::with_repo_name(ui.repo.get());
         }
 
@@ -91,12 +87,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()
-                        .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_stateful_widget(list, chunks[1], state);
                     rect.render_widget(ui.info.render(), chunks[2]);
                 })
                 .unwrap();
@@ -106,7 +97,6 @@ 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();
@@ -121,7 +111,7 @@ impl NoYaml {
                 },
                 Ok(Key::Char(key)) => match ui.state {
                     State::EditRepo => {
-                        ui.info.set_text("Editing Repository");
+                        ui.info.set_info("Editing Repository");
                         ui.repo.handle_input(Key::Char(key));
                     }
                     State::SelectTag => {
@@ -130,24 +120,18 @@ impl NoYaml {
                 },
                 Ok(Key::Backspace) => match ui.state {
                     State::EditRepo => {
-                        ui.info.set_text("Editing Repository");
+                        ui.info.set_info("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);
-                        ui.details = ui.tags.create_detail_widget();
-                    }
+                    State::SelectTag => ui.tags.handle_input(Key::Up),
                 },
                 Ok(Key::Down) => match ui.state {
                     State::EditRepo => (),
-                    State::SelectTag => {
-                        ui.tags.handle_input(Key::Down);
-                        ui.details = ui.tags.create_detail_widget();
-                    }
+                    State::SelectTag => ui.tags.handle_input(Key::Down),
                 },
                 _ => (),
             }

src/widget/details.rs

@@ -1,61 +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}MB",
-                format!(
-                    "{}{}",
-                    d.arch.clone().unwrap_or_default(),
-                    d.variant.clone().unwrap_or_default()
-                ),
-                d.os.clone().unwrap_or_default(),
-                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,13 +27,7 @@ impl Info {
             .highlight_style(Style::default().bg(Color::Black))
     }
 
-    /// set a text to display
-    pub fn set_text(&mut self, info: &str) {
+    pub fn set_info(&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,4 +1,3 @@
-pub mod details;
 pub mod info;
 pub mod repo_entry;
 pub mod service_switcher;

src/widget/repo_entry.rs

@@ -7,17 +7,14 @@ pub struct RepoEntry {
     text: String,
     old_text: String,
     changed: bool,
-    default_text: bool,
 }
 
 impl RepoEntry {
-    pub fn new(text: Option<&str>) -> Self {
-        let default_text = "enter a repository here or select one from file widget";
+    pub fn new(text: &str) -> Self {
         Self {
-            text: String::from(text.unwrap_or(default_text)),
-            old_text: String::from(text.unwrap_or(default_text)),
+            text: String::from(text),
+            old_text: String::from(text),
             changed: false,
-            default_text: text.is_none(),
         }
     }
 
@@ -59,14 +56,9 @@ impl RepoEntry {
             Key::Char(c) => {
                 self.text.push(c);
                 self.changed = true;
-                self.default_text = false;
             }
             Key::Backspace => {
-                if self.default_text {
-                    self.text = String::new();
-                } else {
-                    self.text.pop();
-                }
+                self.text.pop();
                 self.changed = true;
             }
             Key::Esc => {

src/widget/service_switcher.rs

@@ -34,7 +34,6 @@ 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"),
@@ -44,7 +43,6 @@ 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

@@ -4,7 +4,7 @@ use termion::event::Key;
 use tui::style::{Color, Style};
 use tui::widgets::{Block, Borders, List, ListState};
 
-use crate::repository;
+use crate::tags;
 
 pub enum Error {
     NoneSelected,
@@ -24,7 +24,7 @@ impl fmt::Display for Error {
 
 enum Line {
     Status(String),
-    Image(repository::Tag),
+    Image(tags::Images),
     NextPage(String),
 }
 
@@ -32,7 +32,7 @@ impl fmt::Display for Line {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Line::Status(s) => write!(f, "{}", s),
-            Line::Image(i) => write!(f, "{}", i.get_name_with_details()),
+            Line::Image(i) => write!(f, "{}", i),
             Line::NextPage(s) => write!(f, "{}", s),
         }
     }
@@ -41,11 +41,10 @@ impl fmt::Display for Line {
 pub struct TagList {
     lines: Vec<Line>,
     state: ListState,
-    tags: Option<repository::Repo>,
+    tags: Option<tags::Tags>,
 }
 
 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))],
@@ -54,18 +53,16 @@ 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) {
+        match tags::Tags::new(repo) {
             Ok(tags) => Self::with_tags(tags),
             Err(_) => Self::with_status("input repo was not found"),
         }
     }
 
-    /// list the tags of the input
-    fn with_tags(mut tags: repository::Repo) -> Self {
+    pub fn with_tags(mut tags: tags::Tags) -> Self {
         let mut lines: Vec<Line> = tags
-            .get_tags()
+            .results
             .iter()
             .map(|r| Line::Image(r.clone()))
             .collect();
@@ -116,18 +113,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(),
@@ -151,7 +136,7 @@ impl TagList {
             None => Err(Error::NoneSelected),
             Some(i) => match &self.lines[i] {
                 Line::Status(_) => Err(Error::SelectedStatus),
-                Line::Image(i) => Ok(i.get_name().to_string()),
+                Line::Image(i) => Ok(i.tag_name.clone()),
                 Line::NextPage(_) => {
                     self.load_next_page();
                     Err(Error::NextPageSelected)
@@ -173,17 +158,12 @@ impl TagList {
                     let next_page = self.lines.pop();
 
                     //add tags
-                    match &self.tags {
-                        None => (),
-                        Some(tags) => {
-                            for image in tags.get_tags().iter() {
-                                self.lines.push(Line::Image(image.clone()));
-                            }
-                        }
+                    for image in &self.tags.as_ref().unwrap().results {
+                        self.lines.push(Line::Image(image.clone()));
                     }
 
                     //readd next page
-                    match self.tags.as_ref().unwrap().next_page() {
+                    match self.tags.as_ref().unwrap().next_page {
                         None => (),
                         Some(_) => self.lines.push(next_page.unwrap()),
                     }