6 Commits

Author SHA1 Message Date
119831481e Bump to v2.2.0
All checks were successful
/ Compile and upload a release build (release) Successful in 44s
2025-07-03 18:13:09 -05:00
7246c7afb6 Oops, missed one 2025-07-03 18:05:18 -05:00
84eaaa1dbd Autoformat 2025-07-03 18:03:33 -05:00
c9dda5760c Prefix unused variables to quiet the linter 2025-07-03 17:56:07 -05:00
336f1453b9 Address most of the cargo-clippy lints 2025-07-03 17:56:07 -05:00
f068e8233e Release.colorized(), not std::fmt::Display
I don't know for sure if the string-ified version of a Release struct is
being printed to the terminal. As such, I don't know if the user wants,
does not want, or has mixed intentions for the stringification of this
thing.

No Display impl, instead just a `colorized()` method.
2025-07-03 17:47:50 -05:00
6 changed files with 35 additions and 50 deletions

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "gt-tool" name = "gt-tool"
version = "1.0.0" version = "2.2.0"
edition = "2024" edition = "2024"
[dependencies] [dependencies]

View File

@@ -1,12 +1,9 @@
use crate::{ use crate::{
Result, Result,
structs::{ structs::release::{CreateReleaseOption, Release},
release::{CreateReleaseOption, Release},
},
}; };
pub fn get_release(id: u64) -> Result<Release> { pub fn get_release(_id: u64) -> Result<Release> {
todo!(); todo!();
} }
pub fn get_latest_release() -> Result<Release> { pub fn get_latest_release() -> Result<Release> {
@@ -20,7 +17,7 @@ pub async fn list_releases(
) -> Result<Vec<Release>> { ) -> Result<Vec<Release>> {
let request_url = format!("{gitea_url}/api/v1/repos/{repo}/releases/"); let request_url = format!("{gitea_url}/api/v1/repos/{repo}/releases/");
let req = client.get(request_url).send().await; let req = client.get(request_url).send().await;
let response = req.map_err(|reqwest_err| crate::Error::WrappedReqwestErr(reqwest_err))?; let response = req.map_err(crate::Error::WrappedReqwestErr)?;
if response.status().is_success() { if response.status().is_success() {
let release_list = response let release_list = response
.json::<Vec<Release>>() .json::<Vec<Release>>()
@@ -50,22 +47,22 @@ pub async fn create_release(
.json(&submission) .json(&submission)
.send() .send()
.await .await
.map_err(|e| crate::Error::from(e))?; .map_err(crate::Error::from)?;
if response.status().is_success() { if response.status().is_success() {
let new_release = response let new_release = response
.json::<Release>() .json::<Release>()
.await .await
.map_err(|e| crate::Error::from(e))?; .map_err(crate::Error::from)?;
return Ok(new_release); return Ok(new_release);
} else if response.status().is_client_error() { } else if response.status().is_client_error() {
let mesg = crate::decode_client_error(response).await?; let mesg = crate::decode_client_error(response).await?;
return Err(crate::Error::ApiErrorMessage(mesg)) return Err(crate::Error::ApiErrorMessage(mesg));
} }
panic!("Reached end of create_release without matching a return path"); panic!("Reached end of create_release without matching a return path");
} }
pub fn edit_release(id: u64) -> Result<Release> { pub fn edit_release(_id: u64) -> Result<Release> {
todo!(); todo!();
} }
pub fn delete_release(id: u64) -> Result<()> { pub fn delete_release(_id: u64) -> Result<()> {
todo!(); todo!();
} }

View File

@@ -22,8 +22,10 @@ pub async fn create_release_attachment(
Ok(false) => return Err(crate::Error::NoSuchFile), Ok(false) => return Err(crate::Error::NoSuchFile),
Err(e) => { Err(e) => {
eprintln!("Uh oh! The file-exists check couldn't be done: {e}"); eprintln!("Uh oh! The file-exists check couldn't be done: {e}");
panic!("TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)"); panic!(
}, "TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)"
);
}
} }
println!("Uploading file {}", &file); println!("Uploading file {}", &file);
@@ -44,7 +46,7 @@ pub async fn create_release_attachment(
let attachment_desc = response let attachment_desc = response
.json::<Attachment>() .json::<Attachment>()
.await .await
.map_err(|e| crate::Error::from(e))?; .map_err(crate::Error::from)?;
return Ok(attachment_desc); return Ok(attachment_desc);
} else if response.status().is_client_error() { } else if response.status().is_client_error() {
let mesg = crate::decode_client_error(response).await?; let mesg = crate::decode_client_error(response).await?;

View File

@@ -10,13 +10,11 @@ pub struct ApiError {
url: String, url: String,
} }
pub (crate) async fn decode_client_error(response: reqwest::Response) -> Result<ApiError> { pub(crate) async fn decode_client_error(response: reqwest::Response) -> Result<ApiError> {
response response
.json::<ApiError>() .json::<ApiError>()
.await .await
.map_err(|reqwest_err| { .map_err(crate::Error::WrappedReqwestErr)
crate::Error::WrappedReqwestErr(reqwest_err)
})
} }
#[derive(Debug)] #[derive(Debug)]

View File

@@ -1,4 +1,3 @@
use std::path; use std::path;
use gt_tool::cli::Args; use gt_tool::cli::Args;
@@ -22,10 +21,7 @@ async fn main() -> Result<(), gt_tool::Error> {
headers.append("Authorization", token.parse().unwrap()); headers.append("Authorization", token.parse().unwrap());
} }
let client = reqwest::Client::builder() let client = reqwest::Client::builder()
.user_agent(format!( .user_agent(format!("gt-tools-agent-{}", env!("CARGO_PKG_VERSION")))
"gt-tools-agent-{}",
env!("CARGO_PKG_VERSION")
))
.default_headers(headers) .default_headers(headers)
.build()?; .build()?;
@@ -36,15 +32,12 @@ async fn main() -> Result<(), gt_tool::Error> {
// Print in reverse order so the newest items are closest to the // Print in reverse order so the newest items are closest to the
// user's command prompt. Otherwise the newest item scrolls off the // user's command prompt. Otherwise the newest item scrolls off the
// screen and can't be seen. // screen and can't be seen.
let _ = itertools::Itertools::intersperse( itertools::Itertools::intersperse(
releases releases.iter().rev().map(|release| release.colorized()),
.iter() String::from(""),
.rev() )
.map(|release| release.to_string()), .map(|release| println!("{}", release))
String::from("") .fold((), |_, _| ());
)
.map(|release| println!("{}", release))
.fold((), |_, _| () );
} }
gt_tool::cli::Commands::CreateRelease { gt_tool::cli::Commands::CreateRelease {
name, name,
@@ -61,13 +54,8 @@ async fn main() -> Result<(), gt_tool::Error> {
tag_name, tag_name,
target_commitish, target_commitish,
}; };
gt_tool::api::release::create_release( gt_tool::api::release::create_release(&client, &args.gitea_url, &args.repo, submission)
&client, .await?;
&args.gitea_url,
&args.repo,
submission,
)
.await?;
} }
gt_tool::cli::Commands::UploadRelease { gt_tool::cli::Commands::UploadRelease {
tag_name, tag_name,
@@ -97,8 +85,10 @@ async fn main() -> Result<(), gt_tool::Error> {
Ok(false) => return Err(gt_tool::Error::NoSuchFile), Ok(false) => return Err(gt_tool::Error::NoSuchFile),
Err(e) => { Err(e) => {
eprintln!("Uh oh! The file-exists check couldn't be done: {e}"); eprintln!("Uh oh! The file-exists check couldn't be done: {e}");
panic!("TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)"); panic!(
}, "TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)"
);
}
} }
} }
for file in files { for file in files {
@@ -152,5 +142,5 @@ fn match_release_by_tag(tag: &String, releases: Vec<Release>) -> Option<Release>
} }
} }
} }
return release; release
} }

View File

@@ -1,5 +1,3 @@
use std::fmt::Display;
use colored::Colorize; use colored::Colorize;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@@ -22,21 +20,21 @@ pub struct Release {
author: Author, author: Author,
} }
impl Display for Release { impl Release {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { pub fn colorized(&self) -> String {
let tag = "Tag:".green().bold(); let tag = "Tag:".green().bold();
let name = "Name:".green(); let name = "Name:".green();
let published = "Published:".bright_green(); let published = "Published:".bright_green();
let created = "Created:".green().dimmed(); let created = "Created:".green().dimmed();
let author = "Author:".blue(); let author = "Author:".blue();
let body = if self.body.len() > 0 { let body = if !self.body.is_empty() {
&self.body.white() &self.body.white()
} else { } else {
&String::from("(empty body)").dimmed() &String::from("(empty body)").dimmed()
}; };
write!(f, format!(
"{tag} {} "{tag} {}
{name} {} {name} {}
{} {}
{published} {} ({created} {}) {published} {} ({created} {})