added the ability to instantly delete default text in RepoEntry; simplified some code

src/repository/dockerhub.rs

@@ -27,11 +27,8 @@ impl Images {
                 .images
                 .iter()
                 .map(|d| super::TagDetails {
-                    arch: Some(format!(
-                        "{}{}",
-                        d.architecture.clone(),
-                        d.variant.clone().unwrap_or_default()
-                    )),
+                    arch: Some(d.architecture.clone()),
+                    variant: Some(d.variant.clone().unwrap_or_default()),
                     os: Some(d.os.clone()),
                     size: Some(d.size),
                 })

src/repository/ghcr.rs

@@ -33,7 +33,6 @@ impl Ghcr {
             .header(reqwest::header::AUTHORIZATION, format!("Bearer {}", token))
             .send()
         {
-            // let response = match reqwest::blocking::get(url) {
             Ok(result) => result,
             Err(e) => return Err(Error::Fetching(format!("reqwest error: {}", e))),
         };

src/repository/mod.rs

@@ -30,25 +30,11 @@ impl fmt::Display for Error {
 #[derive(Clone, PartialEq)]
 pub struct TagDetails {
     pub arch: Option<String>,
+    pub variant: Option<String>,
     pub os: Option<String>,
     pub size: Option<usize>,
 }
 
-impl fmt::Display for TagDetails {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let size = match self.size {
-            None => "".to_string(),
-            Some(s) => (s / 1024 / 1024).to_string(),
-        };
-        write!(
-            f,
-            "{}|{}MB",
-            self.arch.as_ref().unwrap_or(&"".to_string()),
-            size
-        )
-    }
-}
-
 #[derive(Clone)]
 pub struct Tag {
     name: String,
@@ -62,22 +48,13 @@ impl Tag {
     }
 
     pub fn get_name_with_details(&self) -> String {
-        //architecture infos
-        let mut arch = String::new();
-        for image in self.details.iter().take(1) {
-            arch.push_str(&format!("{}", image));
-        }
-        for image in self.details.iter().skip(1) {
-            arch.push_str(&format!(", {}", image));
-        }
-
         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!(" vor {}", format_time_nice(dif))
+                format!(", {} old", format_time_nice(dif))
             }
         };
 
@@ -135,23 +112,23 @@ impl Repo {
 /// 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)
+        format!("{} Year", (time.num_weeks() / 52) as i32)
     } else if time.num_weeks() > 103 {
-        format!("{} Jahren", (time.num_weeks() / 52) as i32)
+        format!("{} Years", (time.num_weeks() / 52) as i32)
     } else if time.num_days() == 1 {
-        format!("{} Tag", time.num_days())
+        format!("{} Day", time.num_days())
     } else if time.num_days() > 1 {
-        format!("{} Tagen", time.num_days())
+        format!("{} Days", time.num_days())
     } else if time.num_hours() == 1 {
-        format!("{} Stunde", time.num_hours())
+        format!("{} Hour", time.num_hours())
     } else if time.num_hours() > 1 {
-        format!("{} Stunden", time.num_hours())
+        format!("{} Hours", 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())
+        format!("{} Minutes", time.num_minutes())
     } else {
-        format!("{} Sekunden", time.num_seconds())
+        format!("{} Seconds", time.num_seconds())
     }
 }
 

src/ui/default.rs

@@ -54,12 +54,9 @@ impl std::iter::Iterator for State {
 
 impl Ui {
     pub fn run(opt: &Opt) {
-        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 repo_id = match &opt.repo {
+            None => None,
+            Some(repo) => Some(String::as_str(repo)),
         };
 
         let mut ui = Ui {
@@ -71,7 +68,7 @@ impl Ui {
             info: info::Info::new("Select image of edit Repository"),
         };
 
-        if load_repo {
+        if opt.repo.is_none() {
             ui.tags = tag_list::TagList::with_repo_name(ui.repo.get());
         }
 

src/ui/no_yaml.rs

@@ -49,26 +49,21 @@ pub struct NoYaml {
 
 impl NoYaml {
     pub fn run(opt: &Opt) {
-        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 repo_id = match &opt.repo {
+            None => None,
+            Some(repo) => Some(String::as_str(repo)),
         };
 
         let mut ui = NoYaml {
             state: State::EditRepo,
-            repo,
+            repo: repo_entry::RepoEntry::new(repo_id),
             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 load_repo {
+        if opt.repo.is_none() {
             ui.tags = tag_list::TagList::with_repo_name(ui.repo.get());
         }
 

src/widget/details.rs

@@ -27,7 +27,11 @@ impl Details {
         for d in &self.details {
             lines.push(format!(
                 "{:^10}|{:^6}|{:^6}",
+                format!(
+                    "{}{}",
                     d.arch.clone().unwrap_or_default(),
+                    d.variant.clone().unwrap_or_default()
+                ),
                 d.os.clone().unwrap_or_default(),
                 format!("{}MB", d.size.unwrap_or_default() / 1024 / 1024)
             ));

src/widget/repo_entry.rs

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