no need error

Cargo.toml

@@ -1,7 +1,7 @@
 workspace = { members = ["rbx_asset", "rox_compiler"] }
 [package]
 name = "asset-tool"
-version = "0.4.7"
+version = "0.4.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

README.md

@@ -2,20 +2,4 @@
 
 [![Build Status](https://ci.itzana.me/api/badges/StrafesNET/asset-tool/status.svg?ref=refs/heads/master)](https://ci.itzana.me/StrafesNET/asset-tool)
 
-For uploading and downloading roblox assets.
+For uploading and downloading roblox assets.
-
-See [releases](https://git.itzana.me/StrafesNET/asset-tool/releases) for downloads.
-
-To get started, you will need an api key and/or cookie depending on which command you use.  Api keys can be created from the open cloud section on the creator hub, cookies must be extracted from a browser session.  Do not share your cookie file with anyone or use it with tools that you do not trust, as it gives unrestricted permissions to do any account actions on your behalf.  The api keys are significantly more safe because you can choose exactly what permissions the given key has, and which ip addresses can use it.
-
-The help text lists available commands:
-
-`asset-tool --help`
-
-For help with a specific command:
-
-`asset-tool download --help`
-
-Example incantation to download a list of models:
-
-`asset-tool download --cookie-file Documents\mycookie.txt 255299419 1213190363`

rbx_asset/Cargo.toml

@@ -1,12 +1,8 @@
 [package]
 name = "rbx_asset"
-version = "0.2.3"
+version = "0.2.2"
 edition = "2021"
 publish = ["strafesnet"]
-repository = "https://git.itzana.me/StrafesNET/asset-tool"
-license = "MIT OR Apache-2.0"
-description = "Strongly typed interface to the Roblox API using a Cookie or an API key."
-authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

rbx_asset/LICENSE-APACHE

@@ -1,176 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS

rbx_asset/LICENSE-MIT

@@ -1,23 +0,0 @@
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

rbx_asset/src/cloud.rs

@@ -14,27 +14,26 @@ pub struct CreateAssetRequest{
 	pub displayName:String,
 }
 #[derive(Debug)]
-pub enum AssetOperationError{
+pub enum CreateAssetResponseGetAssetError{
 	Operation(OperationError),
 	Serialize(serde_json::Error),
 }
-impl std::fmt::Display for AssetOperationError{
+impl std::fmt::Display for CreateAssetResponseGetAssetError{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
 		write!(f,"{self:?}")
 	}
 }
-impl std::error::Error for AssetOperationError{}
+impl std::error::Error for CreateAssetResponseGetAssetError{}
-#[derive(Debug)]
+pub struct CreateAssetResponse{
-pub struct AssetOperation{
 	operation:RobloxOperation,
 }
-impl AssetOperation{
+impl CreateAssetResponse{
-	pub async fn try_get_asset(&self,context:&CloudContext)->Result<AssetResponse,AssetOperationError>{
+	pub async fn try_get_asset(&self,context:&CloudContext)->Result<AssetResponse,CreateAssetResponseGetAssetError>{
 		serde_json::from_value(
 			self.operation
 				.try_get_reponse(context).await
-				.map_err(AssetOperationError::Operation)?
+				.map_err(CreateAssetResponseGetAssetError::Operation)?
-		).map_err(AssetOperationError::Serialize)
+		).map_err(CreateAssetResponseGetAssetError::Serialize)
 	}
 }
 #[derive(Debug)]
@@ -112,8 +111,8 @@ impl std::fmt::Display for UpdateError{
 }
 impl std::error::Error for UpdateError{}
 
-struct GetAssetOperationRequest{
+pub struct GetAssetOperationRequest{
-	operation_id:String,
+	pub operation_id:String,
 }
 pub struct GetAssetInfoRequest{
 	pub asset_id:u64,
@@ -261,7 +260,7 @@ impl std::fmt::Display for OperationError{
 impl std::error::Error for OperationError{}
 #[derive(Debug,serde::Deserialize,serde::Serialize)]
 #[allow(nonstandard_style,dead_code)]
-struct RobloxOperation{
+pub struct RobloxOperation{
 	pub path:Option<String>,
 	pub metadata:Option<String>,
 	pub done:Option<bool>,
@@ -355,7 +354,7 @@ impl CloudContext{
 		.multipart(form)
 		.send().await
 	}
-	pub async fn create_asset(&self,config:CreateAssetRequest,body:impl Into<std::borrow::Cow<'static,[u8]>>)->Result<AssetOperation,CreateError>{
+	pub async fn create_asset(&self,config:CreateAssetRequest,body:impl Into<std::borrow::Cow<'static,[u8]>>)->Result<CreateAssetResponse,CreateError>{
 		let url=reqwest::Url::parse("https://apis.roblox.com/assets/v1/assets").map_err(CreateError::Parse)?;
 
 		let request_config=serde_json::to_string(&config).map_err(CreateError::Serialize)?;
@@ -368,16 +367,15 @@ impl CloudContext{
 		.text("request",request_config)
 		.part("fileContent",part);
 
-		let operation=self.post_form(url,form).await
+		let operation=self.post_form(url,form).await.map_err(CreateError::Reqwest)?
-		.map_err(CreateError::Reqwest)?
 		.error_for_status().map_err(CreateError::Reqwest)?
 		.json::<RobloxOperation>().await.map_err(CreateError::Reqwest)?;
 
-		Ok(AssetOperation{
+		Ok(CreateAssetResponse{
 			operation,
 		})
 	}
-	pub async fn update_asset(&self,config:UpdateAssetRequest,body:impl Into<std::borrow::Cow<'static,[u8]>>)->Result<AssetOperation,UpdateError>{
+	pub async fn update_asset(&self,config:UpdateAssetRequest,body:impl Into<std::borrow::Cow<'static,[u8]>>)->Result<RobloxOperation,UpdateError>{
 		let raw_url=format!("https://apis.roblox.com/assets/v1/assets/{}",config.assetId);
 		let url=reqwest::Url::parse(raw_url.as_str()).map_err(UpdateError::ParseError)?;
 
@@ -387,17 +385,13 @@ impl CloudContext{
 		.text("request",request_config)
 		.part("fileContent",reqwest::multipart::Part::bytes(body));
 
-		let operation=self.patch_form(url,form).await
+		self.patch_form(url,form).await
 		.map_err(UpdateError::Reqwest)?
 		//roblox api documentation is very poor, just give the status code and drop the json
 		.error_for_status().map_err(UpdateError::Reqwest)?
-		.json::<RobloxOperation>().await.map_err(UpdateError::Reqwest)?;
+		.json::<RobloxOperation>().await.map_err(UpdateError::Reqwest)
-
-		Ok(AssetOperation{
-			operation,
-		})
 	}
-	async fn get_asset_operation(&self,config:GetAssetOperationRequest)->Result<RobloxOperation,GetError>{
+	pub async fn get_asset_operation(&self,config:GetAssetOperationRequest)->Result<RobloxOperation,GetError>{
 		let raw_url=format!("https://apis.roblox.com/assets/v1/operations/{}",config.operation_id);
 		let url=reqwest::Url::parse(raw_url.as_str()).map_err(GetError::ParseError)?;
 

rbx_asset/src/cookie.rs

@@ -103,42 +103,30 @@ pub struct AssetVersionsPageResponse{
 	pub data:Vec<AssetVersion>,
 }
 #[derive(Debug)]
-pub enum PageError{
+pub enum AssetVersionsPageError{
 	ParseError(url::ParseError),
 	Reqwest(reqwest::Error),
 }
-impl std::fmt::Display for PageError{
+impl std::fmt::Display for AssetVersionsPageError{
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		write!(f,"{self:?}")
 	}
 }
-impl std::error::Error for PageError{}
+impl std::error::Error for AssetVersionsPageError{}
 
-pub enum Owner{
+pub struct InventoryPageRequest{
-	User(u64),
+	pub group:u64,
-	Group(u64),
-}
-impl Owner{
-	fn get_url_info(&self)->(&str,u64){
-		match self{
-			&Owner::User(id)=>("user",id),
-			&Owner::Group(id)=>("group",id),
-		}
-	}
-}
-pub struct CreationsPageRequest{
-	pub owner:Owner,
 	pub cursor:Option<String>,
 }
 #[derive(serde::Deserialize,serde::Serialize)]
 #[allow(nonstandard_style,dead_code)]
-pub struct CreationsItem{
+pub struct InventoryItem{
 	pub id:u64,
 	pub name:String,
 }
 #[derive(serde::Deserialize,serde::Serialize)]
 #[allow(nonstandard_style,dead_code)]
-pub struct CreationsPageResponse{
+pub struct InventoryPageResponse{
 	pub totalResults:u64,//up to 50
 	pub filteredKeyword:Option<String>,//""
 	pub searchDebugInfo:Option<String>,//null
@@ -147,40 +135,19 @@ pub struct CreationsPageResponse{
 	pub imageSearchStatus:Option<String>,//null
 	pub previousPageCursor:Option<String>,
 	pub nextPageCursor:Option<String>,
-	pub data:Vec<CreationsItem>,
+	pub data:Vec<InventoryItem>,
 }
-
+#[derive(Debug)]
-pub struct UserInventoryPageRequest{
+pub enum InventoryPageError{
-	pub user_id:u64,
+	ParseError(url::ParseError),
-	pub cursor:Option<String>,
+	Reqwest(reqwest::Error),
 }
-
+impl std::fmt::Display for InventoryPageError{
-#[derive(serde::Deserialize,serde::Serialize)]
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-#[allow(nonstandard_style,dead_code)]
+		write!(f,"{self:?}")
-pub struct UserInventoryItemOwner{
+	}
-	userId:u64,
-	username:String,
-	buildersClubMembershipType:u64,
-}
-#[derive(serde::Deserialize,serde::Serialize)]
-#[allow(nonstandard_style,dead_code)]
-pub struct UserInventoryItem{
-	userAssetId:u64,
-	assetId:u64,
-	assetName:String,
-	collectibleItemId:Option<String>,
-	collectibleItemInstanceId:Option<String>,
-	owner:UserInventoryItemOwner,
-	created:chrono::DateTime<chrono::Utc>,
-	updated:chrono::DateTime<chrono::Utc>,
-}
-#[derive(serde::Deserialize,serde::Serialize)]
-#[allow(nonstandard_style,dead_code)]
-pub struct UserInventoryPageResponse{
-	pub previousPageCursor:Option<String>,
-	pub nextPageCursor:Option<String>,
-	pub data:Vec<UserInventoryItem>,
 }
+impl std::error::Error for InventoryPageError{}
 
 //idk how to do this better
 enum ReaderType<R:std::io::Read>{
@@ -321,8 +288,8 @@ impl CookieContext{
 			Err(e)=>Err(e),
 		}.map_err(GetError::IO)
 	}
-	pub async fn get_asset_versions_page(&self,config:AssetVersionsPageRequest)->Result<AssetVersionsPageResponse,PageError>{
+	pub async fn get_asset_versions_page(&self,config:AssetVersionsPageRequest)->Result<AssetVersionsPageResponse,AssetVersionsPageError>{
-		let mut url=reqwest::Url::parse(format!("https://develop.roblox.com/v1/assets/{}/saved-versions",config.asset_id).as_str()).map_err(PageError::ParseError)?;
+		let mut url=reqwest::Url::parse(format!("https://develop.roblox.com/v1/assets/{}/saved-versions",config.asset_id).as_str()).map_err(AssetVersionsPageError::ParseError)?;
 		//url borrow scope
 		{
 			let mut query=url.query_pairs_mut();//borrow here
@@ -334,13 +301,12 @@ impl CookieContext{
 			}
 		}
 
-		self.get(url).await.map_err(PageError::Reqwest)?
+		self.get(url).await.map_err(AssetVersionsPageError::Reqwest)?
-		.error_for_status().map_err(PageError::Reqwest)?
+		.error_for_status().map_err(AssetVersionsPageError::Reqwest)?
-		.json::<AssetVersionsPageResponse>().await.map_err(PageError::Reqwest)
+		.json::<AssetVersionsPageResponse>().await.map_err(AssetVersionsPageError::Reqwest)
 	}
-	pub async fn get_creations_page(&self,config:&CreationsPageRequest)->Result<CreationsPageResponse,PageError>{
+	pub async fn get_inventory_page(&self,config:InventoryPageRequest)->Result<InventoryPageResponse,InventoryPageError>{
-		let (owner,id)=config.owner.get_url_info();
+		let mut url=reqwest::Url::parse(format!("https://apis.roblox.com/toolbox-service/v1/creations/group/{}/10?limit=50",config.group).as_str()).map_err(InventoryPageError::ParseError)?;
-		let mut url=reqwest::Url::parse(format!("https://apis.roblox.com/toolbox-service/v1/creations/{}/{}/10?limit=50",owner,id).as_str()).map_err(PageError::ParseError)?;
 		//url borrow scope
 		{
 			let mut query=url.query_pairs_mut();//borrow here
@@ -349,22 +315,8 @@ impl CookieContext{
 			}
 		}
 
-		self.get(url).await.map_err(PageError::Reqwest)?
+		self.get(url).await.map_err(InventoryPageError::Reqwest)?
-		.error_for_status().map_err(PageError::Reqwest)?
+		.error_for_status().map_err(InventoryPageError::Reqwest)?
-		.json::<CreationsPageResponse>().await.map_err(PageError::Reqwest)
+		.json::<InventoryPageResponse>().await.map_err(InventoryPageError::Reqwest)
-	}
-	pub async fn get_user_inventory_page(&self,config:&UserInventoryPageRequest)->Result<UserInventoryPageResponse,PageError>{
-		let mut url=reqwest::Url::parse(format!("https://inventory.roblox.com/v2/users/{}/inventory/10?limit=100&sortOrder=Desc",config.user_id).as_str()).map_err(PageError::ParseError)?;
-		//url borrow scope
-		{
-			let mut query=url.query_pairs_mut();//borrow here
-			if let Some(cursor)=config.cursor.as_deref(){
-				query.append_pair("cursor",cursor);
-			}
-		}
-
-		self.get(url).await.map_err(PageError::Reqwest)?
-		.error_for_status().map_err(PageError::Reqwest)?
-		.json::<UserInventoryPageResponse>().await.map_err(PageError::Reqwest)
 	}
 }

rox_compiler/Cargo.toml

@@ -2,11 +2,6 @@
 name = "rox_compiler"
 version = "0.1.0"
 edition = "2021"
-publish = ["strafesnet"]
-repository = "https://git.itzana.me/StrafesNET/asset-tool"
-license = "MIT OR Apache-2.0"
-description = "Read/write a folder structure from Roblox place/model files."
-authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 
 [dependencies]
 futures = "0.3.30"

rox_compiler/LICENSE-APACHE

@@ -1,176 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS

rox_compiler/LICENSE-MIT

@@ -1,23 +0,0 @@
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

rox_compiler/src/decompile.rs

@@ -234,7 +234,7 @@ impl DecompiledContext{
 				WriteStackInstruction::Node(node,name_count)=>{
 					//track properties that must be overriden to compile folder structure back into a place file
 					let mut properties=PropertiesOverride::default();
-					let has_children=!node.children.is_empty();
+					let has_children=node.children.is_empty();
 					match node.class{
 						Class::Folder=>(),
 						Class::ModuleScript=>(),//.lua files are ModuleScript by default

src/main.rs

@@ -3,7 +3,7 @@ use clap::{Args,Parser,Subcommand};
 use anyhow::{anyhow,Result as AResult};
 use futures::StreamExt;
 use rbx_asset::cloud::{ApiKey,CloudContext};
-use rbx_asset::cookie::{Cookie,CookieContext,AssetVersion,CreationsItem};
+use rbx_asset::cookie::{Cookie,CookieContext,AssetVersion,InventoryItem};
 
 type AssetID=u64;
 type AssetIDFileMap=Vec<(AssetID,PathBuf)>;
@@ -23,8 +23,7 @@ enum Commands{
 	DownloadHistory(DownloadHistorySubcommand),
 	Download(DownloadSubcommand),
 	DownloadDecompile(DownloadDecompileSubcommand),
-	DownloadCreationsJson(DownloadCreationsJsonSubcommand),
+	DownloadGroupInventoryJson(DownloadGroupInventoryJsonSubcommand),
-	DownloadUserInventoryJson(DownloadUserInventoryJsonSubcommand),
 	CreateAsset(CreateAssetSubcommand),
 	CreateAssetMedia(CreateAssetMediaSubcommand),
 	CreateAssetMedias(CreateAssetMediasSubcommand),
@@ -39,7 +38,6 @@ enum Commands{
 	DownloadAndDecompileHistoryIntoGit(DownloadAndDecompileHistoryIntoGitSubcommand),
 }
 
-/// Download a range of assets from the asset version history.  Download summary is saved to `output_folder/versions.json`, and can be optionally used to download only new versions the next time.
 #[derive(Args)]
 struct DownloadHistorySubcommand{
 	#[arg(long)]
@@ -59,7 +57,6 @@ struct DownloadHistorySubcommand{
 	#[arg(long)]
 	end_version:Option<u64>,
 }
-/// Download a single asset by id.
 #[derive(Args)]
 struct DownloadSubcommand{
 	#[arg(long,group="cookie",required=true)]
@@ -73,25 +70,8 @@ struct DownloadSubcommand{
 	#[arg(required=true)]
 	asset_ids:Vec<AssetID>,
 }
-/// Download the list of asset ids (not the assets themselves) created by a group or user.  The output is written to `output_folder/versions.json`
 #[derive(Args)]
-struct DownloadCreationsJsonSubcommand{
+struct DownloadGroupInventoryJsonSubcommand{
-	#[arg(long,group="cookie",required=true)]
-	cookie_literal:Option<String>,
-	#[arg(long,group="cookie",required=true)]
-	cookie_envvar:Option<String>,
-	#[arg(long,group="cookie",required=true)]
-	cookie_file:Option<PathBuf>,
-	#[arg(long)]
-	output_folder:Option<PathBuf>,
-	#[arg(long,group="owner",required=true)]
-	group_id:Option<u64>,
-	#[arg(long,group="owner",required=true)]
-	user_id:Option<u64>,
-}
-/// Download the list of asset ids (not the assets themselves) in a user's inventory.  The output is written to `output_folder/versions.json`
-#[derive(Args)]
-struct DownloadUserInventoryJsonSubcommand{
 	#[arg(long,group="cookie",required=true)]
 	cookie_literal:Option<String>,
 	#[arg(long,group="cookie",required=true)]
@@ -101,9 +81,8 @@ struct DownloadUserInventoryJsonSubcommand{
 	#[arg(long)]
 	output_folder:Option<PathBuf>,
 	#[arg(long)]
-	user_id:u64,
+	group:u64,
 }
-/// Upload a (.rbxm, .rbxmx) model file, creating a new asset.  Can be any type of model, including modulescripts.
 #[derive(Args)]
 struct CreateAssetSubcommand{
 	#[arg(long,group="cookie",required=true)]
@@ -125,7 +104,6 @@ struct CreateAssetSubcommand{
 	#[arg(long)]
 	allow_comments:Option<bool>,
 }
-/// Upload a media file (.jpg, .png) to a new asset and print the asset id
 #[derive(Args)]
 struct CreateAssetMediaSubcommand{
 	#[arg(long,group="api_key",required=true)]
@@ -150,8 +128,8 @@ struct CreateAssetMediaSubcommand{
 	#[arg(long)]
 	expected_price:Option<u64>,
 }
-/// Upload multiple media files (.jpg, .png) Automatically detect the media type from file extension and generate asset name and description.  If you want support for more file types (.fbx, .mp3, .ogg) it should be fairly straightforward, just ask.
 #[derive(Args)]
+/// Automatically detect the media type from file extension and generate asset name and description
 struct CreateAssetMediasSubcommand{
 	#[arg(long,group="api_key",required=true)]
 	api_key_literal:Option<String>,
@@ -176,7 +154,6 @@ struct CreateAssetMediasSubcommand{
 	expected_price:Option<u64>,
 	input_files:Vec<PathBuf>,
 }
-/// Upload a (.rbxm, .rbxmx) model file to an existing asset.  Can be any type of model, including modulescripts.
 #[derive(Args)]
 struct UpdateAssetSubcommand{
 	#[arg(long)]
@@ -200,7 +177,6 @@ struct UpdateAssetSubcommand{
 	#[arg(long)]
 	change_allow_comments:Option<bool>,
 }
-/// Upload a media file (.jpg, .png) to an existing asset.
 #[derive(Args)]
 struct UpdateAssetMediaSubcommand{
 	#[arg(long)]
@@ -214,7 +190,6 @@ struct UpdateAssetMediaSubcommand{
 	#[arg(long)]
 	input_file:PathBuf,
 }
-/// Upload a place file (.rbxl, .rbxlx) to an existing place.
 #[derive(Args)]
 struct UpdatePlaceSubcommand{
 	#[arg(long)]
@@ -230,7 +205,6 @@ struct UpdatePlaceSubcommand{
 	#[arg(long)]
 	input_file:PathBuf,
 }
-/// Take an input folder containing scripts and models and turn it into a roblox file.  The two types of files (.rbxl: place, .rbxm: model) are actually the same file format, only the contents differ.
 #[derive(Args)]
 struct CompileSubcommand{
 	#[arg(long)]
@@ -242,7 +216,6 @@ struct CompileSubcommand{
 	#[arg(long)]
 	template:Option<PathBuf>,
 }
-/// Take an input folder containing scripts and models and turn it into a roblox file, then upload it to the specified asset id.  Does not work for places.
 #[derive(Args)]
 struct CompileUploadAssetSubcommand{
 	#[arg(long)]
@@ -262,7 +235,6 @@ struct CompileUploadAssetSubcommand{
 	#[arg(long)]
 	template:Option<PathBuf>,
 }
-/// Take an input folder containing scripts and models and turn it into a roblox file, then upload it to the specified place id.  Does not work for model asset ids.
 #[derive(Args)]
 struct CompileUploadPlaceSubcommand{
 	#[arg(long)]
@@ -282,7 +254,6 @@ struct CompileUploadPlaceSubcommand{
 	#[arg(long)]
 	template:Option<PathBuf>,
 }
-/// Take a roblox file (.rbxm, .rbxl) and turn it into a folder containing scripts and models.  Rox style means property overrides are written to the top of scripts, Rojo style means property overrides are written to the script file extension (Script.server.lua).
 #[derive(Args)]
 struct DecompileSubcommand{
 	#[arg(long)]
@@ -298,7 +269,6 @@ struct DecompileSubcommand{
 	#[arg(long)]
 	write_scripts:Option<bool>,
 }
-/// Download a model from the specified asset id, and decompile it into a folder in one swift motion.  The model file is not saved to disk.  This also works for places.
 #[derive(Args)]
 struct DownloadDecompileSubcommand{
 	#[arg(long,group="cookie",required=true)]
@@ -320,13 +290,12 @@ struct DownloadDecompileSubcommand{
 	#[arg(long)]
 	write_scripts:Option<bool>,
 }
-/// Take a folder of asset history (containing `versions.json`) and decompile each version into its own git commit.  This must be run with the desired output folder as the current directory due to git2 limitations.
 #[derive(Args)]
 struct DecompileHistoryIntoGitSubcommand{
 	#[arg(long)]
 	input_folder:PathBuf,
-	#[arg(long)]
+	//currently output folder must be the current folder due to git2 limitations
-	output_folder:Option<PathBuf>,
+	//output_folder:cli.output.unwrap(),
 	#[arg(long)]
 	style:Style,
 	#[arg(long)]
@@ -340,7 +309,6 @@ struct DecompileHistoryIntoGitSubcommand{
 	#[arg(long)]
 	write_scripts:Option<bool>,
 }
-/// Download asset history, download asset versions, decompile into folder, create a git commit for each version.  This is a combination of two commands (download-history, decompile-history-into-git) except without intermediate files.
 #[derive(Args)]
 struct DownloadAndDecompileHistoryIntoGitSubcommand{
 	#[arg(long)]
@@ -351,8 +319,8 @@ struct DownloadAndDecompileHistoryIntoGitSubcommand{
 	cookie_envvar:Option<String>,
 	#[arg(long,group="cookie",required=true)]
 	cookie_file:Option<PathBuf>,
-	#[arg(long)]
+	//currently output folder must be the current folder due to git2 limitations
-	output_folder:Option<PathBuf>,
+	//output_folder:cli.output.unwrap(),
 	#[arg(long)]
 	style:Style,
 	#[arg(long)]
@@ -444,25 +412,13 @@ async fn main()->AResult<()>{
 				write_scripts:subcommand.write_scripts.unwrap_or(true),
 			}).await
 		},
-		Commands::DownloadCreationsJson(subcommand)=>download_creations_json(
+		Commands::DownloadGroupInventoryJson(subcommand)=>download_group_inventory_json(
 			cookie_from_args(
 				subcommand.cookie_literal,
 				subcommand.cookie_envvar,
 				subcommand.cookie_file,
 			).await?,
-			owner_from_args(
+			subcommand.group,
-				subcommand.user_id,
-				subcommand.group_id,
-			)?,
-			subcommand.output_folder.unwrap_or_else(||std::env::current_dir().unwrap()),
-		).await,
-		Commands::DownloadUserInventoryJson(subcommand)=>download_user_inventory_json(
-			cookie_from_args(
-				subcommand.cookie_literal,
-				subcommand.cookie_envvar,
-				subcommand.cookie_file,
-			).await?,
-			subcommand.user_id,
 			subcommand.output_folder.unwrap_or_else(||std::env::current_dir().unwrap()),
 		).await,
 		Commands::CreateAsset(subcommand)=>create_asset(CreateAssetConfig{
@@ -590,7 +546,7 @@ async fn main()->AResult<()>{
 			git_committer_name:subcommand.git_committer_name,
 			git_committer_email:subcommand.git_committer_email,
 			input_folder:subcommand.input_folder,
-			output_folder:subcommand.output_folder.unwrap_or_else(||std::env::current_dir().unwrap()),
+			output_folder:std::env::current_dir()?,
 			style:subcommand.style.rox(),
 			write_template:subcommand.write_template.unwrap_or(false),
 			write_models:subcommand.write_models.unwrap_or(false),
@@ -605,7 +561,7 @@ async fn main()->AResult<()>{
 				subcommand.cookie_file,
 			).await?,
 			asset_id:subcommand.asset_id,
-			output_folder:subcommand.output_folder.unwrap_or_else(||std::env::current_dir().unwrap()),
+			output_folder:std::env::current_dir()?,
 			style:subcommand.style.rox(),
 			write_template:subcommand.write_template.unwrap_or(false),
 			write_models:subcommand.write_models.unwrap_or(false),
@@ -632,14 +588,6 @@ async fn api_key_from_args(literal:Option<String>,environment:Option<String>,fil
 	};
 	Ok(ApiKey::new(api_key))
 }
-fn owner_from_args(user_id:Option<u64>,group_id:Option<u64>)->AResult<rbx_asset::cookie::Owner>{
-	let owner=match (user_id,group_id){
-		(Some(id),None)=>rbx_asset::cookie::Owner::User(id),
-		(None,Some(id))=>rbx_asset::cookie::Owner::Group(id),
-		_=>Err(anyhow::Error::msg("Illegal owner argument pair"))?,
-	};
-	Ok(owner)
-}
 
 struct CreateAssetConfig{
 	cookie:Cookie,
@@ -676,20 +624,20 @@ struct CreateAssetMediaConfig{
 
 async fn get_asset_exp_backoff(
 	context:&CloudContext,
-	asset_operation:&rbx_asset::cloud::AssetOperation
+	create_asset_response:&rbx_asset::cloud::CreateAssetResponse
-)->Result<rbx_asset::cloud::AssetResponse,rbx_asset::cloud::AssetOperationError>{
+)->Result<rbx_asset::cloud::AssetResponse,rbx_asset::cloud::CreateAssetResponseGetAssetError>{
-	const BACKOFF_MUL:f32=1.3956124250860895286;//exp(1/3)
+	let mut backoff:u64=0;
-	let mut backoff=1000f32;
 	loop{
-		match asset_operation.try_get_asset(&context).await{
+		match create_asset_response.try_get_asset(&context).await{
 			//try again when the operation is not done
-			Err(rbx_asset::cloud::AssetOperationError::Operation(rbx_asset::cloud::OperationError::NotDone))=>(),
+			Err(rbx_asset::cloud::CreateAssetResponseGetAssetError::Operation(rbx_asset::cloud::OperationError::NotDone))=>(),
 			//return all other results
 			other_result=>return other_result,
 		}
-		println!("Operation not complete; waiting {:.0}ms...",backoff);
+		let wait=f32::exp(backoff as f32/3.0)*1000f32;
-		tokio::time::sleep(std::time::Duration::from_millis(backoff as u64)).await;
+		println!("Operation not complete; waiting {:.0}ms...",wait);
-		backoff*=BACKOFF_MUL;
+		tokio::time::sleep(std::time::Duration::from_millis(wait as u64)).await;
+		backoff+=1;
 	}
 }
 
@@ -724,12 +672,9 @@ struct CreateAssetMediasConfig{
 }
 
 #[derive(Debug)]
-#[allow(dead_code)]
 enum CreateAssetMediasError{
 	NoFileStem(PathBuf),
-	IO(std::io::Error),
+	UnknownFourCC(Option<Vec<u8>>),
-	UnknownFourCC(Option<[u8;4]>),
-	Create(rbx_asset::cloud::CreateError),
 }
 impl std::fmt::Display for CreateAssetMediasError{
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>)->std::fmt::Result{
@@ -739,22 +684,7 @@ impl std::fmt::Display for CreateAssetMediasError{
 impl std::error::Error for CreateAssetMediasError{}
 
 #[derive(Debug)]
-#[allow(dead_code)]
-enum PollOperationError{
-	CreateAssetMedias(CreateAssetMediasError),
-	AssetOperation(rbx_asset::cloud::AssetOperationError),
-}
-impl std::fmt::Display for PollOperationError{
-	fn fmt(&self, f: &mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for PollOperationError{}
-
-#[derive(Debug)]
-#[allow(dead_code)]
 enum DownloadDecalError{
-	PollOperation(PollOperationError),
 	ParseInt(std::num::ParseIntError),
 	Get(rbx_asset::cookie::GetError),
 	LoadDom(LoadDomError),
@@ -763,7 +693,7 @@ enum DownloadDecalError{
 	TexturePropertyInvalid,
 }
 impl std::fmt::Display for DownloadDecalError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>)->std::fmt::Result{
 		write!(f,"{self:?}")
 	}
 }
@@ -773,19 +703,18 @@ async fn create_asset_medias(config:CreateAssetMediasConfig)->AResult<()>{
 	let context=CloudContext::new(config.api_key);
 	let cookie_context=CookieContext::new(config.cookie);
 	let expected_price=Some(config.expected_price.unwrap_or(0));
-	futures::stream::iter(config.input_files.into_iter()
+	let asset_id_list=futures::stream::iter(config.input_files.into_iter()
 	//step 1: read file, make create request
 	.map(|path|{
 		let description=&config.description;
 		let creator=&config.creator;
 		let context=&context;
-		async move{(path.clone(),
 		async move{
 			let model_name=path.file_stem()
 			.and_then(std::ffi::OsStr::to_str)
-			.ok_or_else(||CreateAssetMediasError::NoFileStem(path.clone()))?
+			.ok_or(CreateAssetMediasError::NoFileStem(path.clone()))?
 			.to_owned();
-			let file=tokio::fs::read(path).await.map_err(CreateAssetMediasError::IO)?;
+			let file=tokio::fs::read(path).await?;
 			let asset_type=match file.get(0..4){
 				//png
 				Some(b"\x89PNG")=>rbx_asset::cloud::AssetType::Decal,
@@ -793,9 +722,9 @@ async fn create_asset_medias(config:CreateAssetMediasConfig)->AResult<()>{
 				Some(b"\xFF\xD8\xFF\xE0")=>rbx_asset::cloud::AssetType::Decal,
 				//Some("fbx")=>rbx_asset::cloud::AssetType::Model,
 				//Some("ogg")=>rbx_asset::cloud::AssetType::Audio,
-				fourcc=>Err(CreateAssetMediasError::UnknownFourCC(fourcc.map(|s|s.try_into().unwrap())))?,
+				fourcc=>Err(CreateAssetMediasError::UnknownFourCC(fourcc.map(<[u8]>::to_owned)))?,
 			};
-			context.create_asset(rbx_asset::cloud::CreateAssetRequest{
+			Ok(context.create_asset(rbx_asset::cloud::CreateAssetRequest{
 				assetType:asset_type,
 				displayName:model_name,
 				description:description.clone(),
@@ -803,51 +732,59 @@ async fn create_asset_medias(config:CreateAssetMediasConfig)->AResult<()>{
 					creator:creator.clone(),
 					expectedPrice:expected_price,
 				}
-			},file).await.map_err(CreateAssetMediasError::Create)
+			},file).await?)
 		}
-		.await)}
 	}))
 	//parallel requests
 	.buffer_unordered(CONCURRENT_REQUESTS)
-	//step 2: poll operation until it completes
+	//step 2: poll operation until it completes (as fast as possible no exp backoff or anything just hammer roblox)
-	.then(|(path,create_result)|{
+	.filter_map(|create_result:AResult<_>|{
 		let context=&context;
-		async{(path,
 		async{
-			let asset_operation=create_result.map_err(PollOperationError::CreateAssetMedias)?;
+			match create_result{
-			get_asset_exp_backoff(context,&asset_operation).await.map_err(PollOperationError::AssetOperation)
+				Ok(create_asset_response)=>match get_asset_exp_backoff(context,&create_asset_response).await{
+					Ok(asset_response)=>Some(asset_response),
+					Err(e)=>{
+						eprintln!("operation error: {}",e);
+						None
+					},
+				},
+				Err(e)=>{
+					eprintln!("create_asset error: {}",e);
+					None
+				},
+			}
 		}
-		.await)}
 	})
-	//step 3: read decal id from operation and download it, decode it as a roblox file and extract the texture content url
+	//step 3: read decal id from operation and download it
-	.then(|(path,asset_response_result)|{
+	.filter_map(|asset_response|{
-		let cookie_context=&cookie_context;
+		let parse_result=asset_response.assetId.parse();
-		async move{(path,
+		async{
-		async move{
+			match async{
-			let asset_response=asset_response_result.map_err(DownloadDecalError::PollOperation)?;
+				let file=cookie_context.get_asset(rbx_asset::cookie::GetAssetRequest{
-			let file=cookie_context.get_asset(rbx_asset::cookie::GetAssetRequest{
+					asset_id:parse_result.map_err(DownloadDecalError::ParseInt)?,
-				asset_id:asset_response.assetId.parse().map_err(DownloadDecalError::ParseInt)?,
+					version:None,
-				version:None,
+				}).await.map_err(DownloadDecalError::Get)?;
-			}).await.map_err(DownloadDecalError::Get)?;
+				let dom=load_dom(std::io::Cursor::new(file)).map_err(DownloadDecalError::LoadDom)?;
-			let dom=load_dom(std::io::Cursor::new(file)).map_err(DownloadDecalError::LoadDom)?;
+				let instance=dom.get_by_ref(
-			let instance=dom.get_by_ref(
+					*dom.root().children().first().ok_or(DownloadDecalError::NoFirstInstance)?
-				*dom.root().children().first().ok_or(DownloadDecalError::NoFirstInstance)?
+				).ok_or(DownloadDecalError::NoFirstInstance)?;
-			).ok_or(DownloadDecalError::NoFirstInstance)?;
+				match instance.properties.get("Texture").ok_or(DownloadDecalError::NoTextureProperty)?{
-			let texture=instance.properties.get("Texture").ok_or(DownloadDecalError::NoTextureProperty)?;
+					rbx_dom_weak::types::Variant::Content(url)=>Ok(url.clone().into_string()),
-			let asset_url=match texture{
+					_=>Err(DownloadDecalError::TexturePropertyInvalid),
-				rbx_dom_weak::types::Variant::Content(url)=>url.clone().into_string(),
+				}
-				_=>Err(DownloadDecalError::TexturePropertyInvalid)?,
+			}.await{
-			};
+				Ok(asset_url)=>Some((asset_response.displayName,asset_url)),
-			Ok::<_,DownloadDecalError>((asset_response.displayName,asset_url))
+				Err(e)=>{
+					eprintln!("get_asset error: {}",e);
+					None
+				},
+			}
 		}
-		.await)}
+	}).collect::<Vec<(String,String)>>().await;
-	})
+	for (file_name,asset_url) in asset_id_list{
-	.for_each(|(path,download_decal_result)|async move{
+		println!("{}={}",file_name,asset_url);
-		match download_decal_result{
+	}
-			Ok((file_name,asset_url))=>println!("{}={}",file_name,asset_url),
-			Err(e)=>eprintln!("ERROR file={:?} error={e}",path),
-		}
-	}).await;
 	Ok(())
 }
 
@@ -927,54 +864,23 @@ async fn download_list(cookie:Cookie,asset_id_file_map:AssetIDFileMap)->AResult<
 	Ok(())
 }
 
-async fn get_creations_pages(context:&CookieContext,owner:rbx_asset::cookie::Owner)->AResult<Vec<CreationsItem>>{
+async fn get_inventory_pages(context:&CookieContext,group:u64)->AResult<Vec<InventoryItem>>{
-	let mut config=rbx_asset::cookie::CreationsPageRequest{
+	let mut cursor:Option<String>=None;
-		owner,
-		cursor:None,
-	};
 	let mut asset_list=Vec::new();
 	loop{
-		let mut page=context.get_creations_page(&config).await?;
+		let mut page=context.get_inventory_page(rbx_asset::cookie::InventoryPageRequest{group,cursor}).await?;
 		asset_list.append(&mut page.data);
 		if page.nextPageCursor.is_none(){
 			break;
 		}
-		config.cursor=page.nextPageCursor;
+		cursor=page.nextPageCursor;
 	}
 	Ok(asset_list)
 }
 
-async fn download_creations_json(cookie:Cookie,owner:rbx_asset::cookie::Owner,output_folder:PathBuf)->AResult<()>{
+async fn download_group_inventory_json(cookie:Cookie,group:u64,output_folder:PathBuf)->AResult<()>{
 	let context=CookieContext::new(cookie);
-	let item_list=get_creations_pages(&context,owner).await?;
+	let item_list=get_inventory_pages(&context,group).await?;
-
-	let mut path=output_folder.clone();
-	path.set_file_name("versions.json");
-	tokio::fs::write(path,serde_json::to_string(&item_list)?).await?;
-
-	Ok(())
-}
-
-async fn get_user_inventory_pages(context:&CookieContext,user_id:u64)->AResult<Vec<rbx_asset::cookie::UserInventoryItem>>{
-	let mut config=rbx_asset::cookie::UserInventoryPageRequest{
-		user_id,
-		cursor:None,
-	};
-	let mut asset_list=Vec::new();
-	loop{
-		let mut page=context.get_user_inventory_page(&config).await?;
-		asset_list.append(&mut page.data);
-		if page.nextPageCursor.is_none(){
-			break;
-		}
-		config.cursor=page.nextPageCursor;
-	}
-	Ok(asset_list)
-}
-
-async fn download_user_inventory_json(cookie:Cookie,user_id:u64,output_folder:PathBuf)->AResult<()>{
-	let context=CookieContext::new(cookie);
-	let item_list=get_user_inventory_pages(&context,user_id).await?;
 
 	let mut path=output_folder.clone();
 	path.set_file_name("versions.json");
@@ -1128,7 +1034,6 @@ async fn download_history(mut config:DownloadHistoryConfig)->AResult<()>{
 }
 
 #[derive(Debug)]
-#[allow(dead_code)]
 enum LoadDomError{
 	IO(std::io::Error),
 	RbxBinary(rbx_binary::DecodeError),
@@ -1266,11 +1171,11 @@ async fn write_commit(config:WriteCommitConfig,b:Result<AResult<(AssetVersion,ro
 	let sig=git2::Signature::new(config.git_committer_name.as_str(),config.git_committer_email.as_str(),&git2::Time::new(date.timestamp(),0)).unwrap();
 	let tree_id={
 		let mut tree_index = repo.index()?;
-		match tree_index.add_all(std::iter::once("*"),git2::IndexAddOption::DEFAULT,None){
+		match tree_index.add_all(std::iter::once(config.output_folder.as_path()),git2::IndexAddOption::DEFAULT,None){
 			Ok(_)=>(),
 			Err(e)=>println!("tree_index.add_all error: {}",e),
 		}
-		match tree_index.update_all(std::iter::once("*"),None){
+		match tree_index.update_all(std::iter::once(config.output_folder.as_path()),None){
 			Ok(_)=>(),
 			Err(e)=>println!("tree_index.update_all error: {}",e),
 		}