Skip to content

Upload images instead of decals #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
afujiwara-roblox merged 3 commits into from
Jan 31, 2025
Merged

Upload images instead of decals #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d2dcbb
upload as image and not asset
afujiwara-roblox Jan 31, 2025
245cde7
upload image not decal
afujiwara-roblox Jan 31, 2025
4016432
remove decal reference
afujiwara-roblox Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "tarmac"
description = "Resource compiler and asset manager for Roblox projects"
version = "0.8.1"
version = "0.8.2"
authors = ["Lucien Greathouse <me@lpghatguy.com>"]
edition = "2018"
license = "MIT"
Expand Down
4 changes: 2 additions & 2 deletions src/commands/upload_image.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use fs_err as fs;

use crate::{
options::{GlobalOptions, UploadImageOptions},
roblox_web_api::{RobloxApiClient, RobloxOpenCloudCredentials, DECAL},
roblox_web_api::{RobloxApiClient, RobloxOpenCloudCredentials, IMAGE},
roblox_web_api_types::{ImageUploadData, ImageUploadMetadata},
};

Expand All @@ -18,7 +18,7 @@ pub fn upload_image(
let upload_data = ImageUploadData {
image_data: image_data.into(),
image_metadata: ImageUploadMetadata::new(
DECAL.to_string(),
IMAGE.to_string(),
options.name.to_string(),
options.description.to_string(),
options.user_id,
Expand Down
2 changes: 1 addition & 1 deletion src/roblox_web_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const OPEN_CLOUD_ASSET_OPERATIONS_USER_AUTH: &str =
const OPEN_CLOUD_ASSET_OPERATIONS: &str = "https://apis.roblox.com/assets/v1/operations";

const OPEN_CLOUD_API_KEY_HEADER: &str = "X-API-Key";
pub const DECAL: &str = "Decal";
pub const IMAGE: &str = "Image";

pub struct RobloxOpenCloudCredentials {
auth: RobloxOpenCloudAuth,
Expand Down
4 changes: 2 additions & 2 deletions src/sync_backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::{borrow::Cow, io, path::Path, thread, time::Duration};

use crate::roblox_web_api::{RobloxApiClient, RobloxApiError, DECAL};
use crate::roblox_web_api::{RobloxApiClient, RobloxApiError, IMAGE};
use crate::roblox_web_api_types::{
ImageUploadData, ImageUploadMetadata, RobloxAuthenticationError,
};
Expand Down Expand Up @@ -45,7 +45,7 @@ impl<'a> SyncBackend for RobloxSyncBackend<'a> {
let upload_data = ImageUploadData {
image_data: Cow::Owned(data.contents),
image_metadata: ImageUploadMetadata::new(
DECAL.to_string(),
IMAGE.to_string(),
data.name.to_string(),
"Uploaded by Tarmac.".to_string(),
None,
Expand Down