Compare commits

..

No commits in common. "3bf2359392f844009a75fb1af68fd63cb69ef579" and "04842af653d3aaca21b5c73bf8217e73db91647c" have entirely different histories.

8 changed files with 62 additions and 40 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 76 KiB

View File

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

View File

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

View File

@ -30,11 +30,25 @@ impl fmt::Display for Error {
#[derive(Clone, PartialEq)] #[derive(Clone, PartialEq)]
pub struct TagDetails { pub struct TagDetails {
pub arch: Option<String>, pub arch: Option<String>,
pub variant: Option<String>,
pub os: Option<String>, pub os: Option<String>,
pub size: Option<usize>, 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)] #[derive(Clone)]
pub struct Tag { pub struct Tag {
name: String, name: String,
@ -48,13 +62,22 @@ impl Tag {
} }
pub fn get_name_with_details(&self) -> String { 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 { let dif = match &self.last_updated {
None => "".to_string(), None => "".to_string(),
Some(last_updated) => { Some(last_updated) => {
let now = chrono::Utc::now(); let now = chrono::Utc::now();
let rfc3339 = DateTime::parse_from_rfc3339(last_updated).unwrap(); let rfc3339 = DateTime::parse_from_rfc3339(last_updated).unwrap();
let dif = now - rfc3339.with_timezone(&chrono::Utc); let dif = now - rfc3339.with_timezone(&chrono::Utc);
format!(", {} old", format_time_nice(dif)) format!(" vor {}", format_time_nice(dif))
} }
}; };
@ -112,23 +135,23 @@ impl Repo {
/// converts a given duration to a readable string /// converts a given duration to a readable string
fn format_time_nice(time: chrono::Duration) -> String { fn format_time_nice(time: chrono::Duration) -> String {
if time.num_weeks() == 52 { if time.num_weeks() == 52 {
format!("{} Year", (time.num_weeks() / 52) as i32) format!("{} Jahr", (time.num_weeks() / 52) as i32)
} else if time.num_weeks() > 103 { } else if time.num_weeks() > 103 {
format!("{} Years", (time.num_weeks() / 52) as i32) format!("{} Jahren", (time.num_weeks() / 52) as i32)
} else if time.num_days() == 1 { } else if time.num_days() == 1 {
format!("{} Day", time.num_days()) format!("{} Tag", time.num_days())
} else if time.num_days() > 1 { } else if time.num_days() > 1 {
format!("{} Days", time.num_days()) format!("{} Tagen", time.num_days())
} else if time.num_hours() == 1 { } else if time.num_hours() == 1 {
format!("{} Hour", time.num_hours()) format!("{} Stunde", time.num_hours())
} else if time.num_hours() > 1 { } else if time.num_hours() > 1 {
format!("{} Hours", time.num_hours()) format!("{} Stunden", time.num_hours())
} else if time.num_minutes() == 1 { } else if time.num_minutes() == 1 {
format!("{} Minute", time.num_minutes()) format!("{} Minute", time.num_minutes())
} else if time.num_minutes() > 1 { } else if time.num_minutes() > 1 {
format!("{} Minutes", time.num_minutes()) format!("{} Minuten", time.num_minutes())
} else { } else {
format!("{} Seconds", time.num_seconds()) format!("{} Sekunden", time.num_seconds())
} }
} }

View File

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

View File

@ -49,21 +49,26 @@ pub struct NoYaml {
impl NoYaml { impl NoYaml {
pub fn run(opt: &Opt) { pub fn run(opt: &Opt) {
let repo_id = match &opt.repo { let (repo, load_repo) = match &opt.repo {
None => None, None => (
Some(repo) => Some(String::as_str(repo)), 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 { let mut ui = NoYaml {
state: State::EditRepo, state: State::EditRepo,
repo: repo_entry::RepoEntry::new(repo_id), repo,
tags: tag_list::TagList::with_status("Tags are empty"), tags: tag_list::TagList::with_status("Tags are empty"),
details: details::Details::new(), details: details::Details::new(),
info: info::Info::new("could not find a docker-compose file"), info: info::Info::new("could not find a docker-compose file"),
}; };
// load tags if a repository was given thorugh paramter // 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()); ui.tags = tag_list::TagList::with_repo_name(ui.repo.get());
} }

View File

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

View File

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