Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix icons for sideloaded packages (#1624)

Browse Source
This commit is contained in:
Aiden McClelland
2022-07-07 15:33:53 -06:00
committed by GitHub
parent 99d16a37d5
commit 2db31b54e8
1 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
backend/src/install/mod.rs
View File

@@ -334,9 +334,37 @@ pub async fn install(
pub async fn sideload( pub async fn sideload(
#[context] ctx: RpcContext, #[context] ctx: RpcContext,
#[arg] manifest: Manifest, #[arg] manifest: Manifest,
#[arg] icon: Option<String>,
) -> Result<RequestGuid, Error> { ) -> Result<RequestGuid, Error> {
let new_ctx = ctx.clone(); let new_ctx = ctx.clone();
let guid = RequestGuid::new(); let guid = RequestGuid::new();
if let Some(icon) = icon {
use tokio::io::AsyncWriteExt;
let public_dir_path = ctx
.datadir
.join(PKG_PUBLIC_DIR)
.join(&manifest.id)
.join(manifest.version.as_str());
tokio::fs::create_dir_all(&public_dir_path).await?;
let invalid_data_url =
|| Error::new(eyre!("Invalid Icon Data URL"), ErrorKind::InvalidRequest);
let data = icon
.strip_prefix(&format!(
"data:image/{};base64,",
manifest.assets.icon_type()
))
.ok_or_else(&invalid_data_url)?;
let mut icon_file =
File::create(public_dir_path.join(format!("icon.{}", manifest.assets.icon_type())))
.await?;
icon_file
.write_all(&base64::decode(data).with_kind(ErrorKind::InvalidRequest)?)
.await?;
icon_file.sync_all().await?;
}
let handler = Box::new(|req: Request<Body>| { let handler = Box::new(|req: Request<Body>| {
async move { async move {
let content_length = match req.headers().get(CONTENT_LENGTH).map(|a| a.to_str()) { let content_length = match req.headers().get(CONTENT_LENGTH).map(|a| a.to_str()) {
@@ -482,14 +510,21 @@ async fn cli_install(
let path = PathBuf::from(target); let path = PathBuf::from(target);
// inspect manifest no verify // inspect manifest no verify
let manifest = crate::inspect::manifest(path.clone(), true, Some(IoFormat::Json)).await?; let mut reader = S9pkReader::open(&path, false).await?;
let manifest = reader.manifest().await?;
let icon = reader.icon().await?.to_vec().await?;
let icon_str = format!(
"data:image/{};base64,{}",
manifest.assets.icon_type(),
base64::encode(&icon)
);
// rpc call remote sideload // rpc call remote sideload
tracing::debug!("calling package.sideload"); tracing::debug!("calling package.sideload");
let guid = rpc_toolkit::command_helpers::call_remote( let guid = rpc_toolkit::command_helpers::call_remote(
ctx.clone(), ctx.clone(),
"package.sideload", "package.sideload",
serde_json::json!({ "manifest": manifest }), serde_json::json!({ "manifest": manifest, "icon": icon_str }),
PhantomData::<RequestGuid>, PhantomData::<RequestGuid>,
) )
.await? .await?
@@ -500,8 +535,8 @@ async fn cli_install(
let file = tokio::fs::File::open(path).await?; let file = tokio::fs::File::open(path).await?;
let content_length = file.metadata().await?.len(); let content_length = file.metadata().await?.len();
let body = Body::wrap_stream(tokio_util::io::ReaderStream::new(file)); let body = Body::wrap_stream(tokio_util::io::ReaderStream::new(file));
let client = reqwest::Client::new(); let res = ctx
let res = client .client
.post(format!( .post(format!(
"{}://{}/rest/rpc/{}", "{}://{}/rest/rpc/{}",
ctx.protocol(), ctx.protocol(),