src/repo.rs

@@ -102,6 +102,7 @@ pub fn split_repo_without_tag(repo: &str) -> Result<Repo, Error> {
 
 #[cfg(test)]
 mod tests {
+    use crate::repo;
     use crate::repo::{Error, Repo};
 
     #[test]
@@ -127,23 +128,23 @@ mod tests {
     #[test]
     fn test_match_yaml_image() {
         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(""), None);
+        assert_eq!(test_fn("version: '2'"), None);
+        assert_eq!(test_fn("image: "), None);
+        assert_eq!(test_fn("  image: "), None);
+        assert_eq!(test_fn("  image: nginx"), Some(("  image: ", "nginx")));
         assert_eq!(
             test_fn("  image: library/nginx"),
-            Ok(("  image: ", "library/nginx"))
+            Some(("  image: ", "library/nginx"))
         );
         assert_eq!(
             test_fn("  image: ghcr.io/library/nginx"),
-            Ok(("  image: ", "ghcr.io/library/nginx"))
+            Some(("  image: ", "ghcr.io/library/nginx"))
         );
-        assert_eq!(test_fn("#   image: nginx"), Err(Error::NoTagFound));
+        assert_eq!(test_fn("#   image: nginx"), None);
         assert_eq!(
             test_fn("   image: nginx #comment"),
-            Ok(("   image: ", "nginx"))
+            Some(("   image: ", "nginx"))
         );
     }
 

src/tags.rs

@@ -13,7 +13,7 @@ struct ImageDetails {
 
 impl fmt::Display for ImageDetails {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}|{}MB", self.architecture, self.size / 1024 / 1024)
+        write!(f, "[{}, {}MB]", self.architecture, self.size / 1024 / 1024)
     }
 }
 
@@ -122,19 +122,16 @@ 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) {
+        for image in &self.images {
             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 {} [{}]",
+            "{} vor {} {}",
             self.tag_name,
             format_time_nice(dif),
             arch
@@ -167,7 +164,7 @@ fn format_time_nice(time: chrono::Duration) -> String {
 
 #[cfg(test)]
 mod tests {
-    use crate::tags::Tags;
+    use crate::tags::{Error, Tags};
     #[test]
     fn test_check_repo() {
         assert_eq!(Tags::check_repo("nginx").unwrap(), "library/nginx");