studio/blender-studio-tools
12
31
Fork 19
Code Issues 20 Pull Requests 4 Projects Releases 1 Activity

Asset Pipeline: Store Asset Catalog in String #230

Merged
Nick Alberelli merged 6 commits from TinyNick/blender-studio-pipeline:fix/asset-catalog into main 2024-02-15 22:54:08 +01:00
Conversation 10 Commits 6 Files Changed 6 +158 -41
Nick Alberelli commented 2024-02-13 20:04:17 +01:00
Member
Copy Link

Closes: studio/blender-studio-pipeline#229

What's Changed?

  • Replace Asset Catalog Enum with String + Search

Breaking Changes

  • This change will clear all existing asset catalogs selections from the working files users will need to re-select the correct asset catalog before sync/push to publish. Otherwise the published file may loose it's asset catalog assignment.

New UI

image

Closes: https://projects.blender.org/studio/blender-studio-pipeline/issues/229 ## What's Changed? - Replace Asset Catalog Enum with String + Search ## Breaking Changes - This change will clear all existing asset catalogs selections from the working files users will need to re-select the correct asset catalog before sync/push to publish. Otherwise the published file may loose it's asset catalog assignment. ## New UI ![image](/attachments/a2b7a104-6836-410f-91d1-8cb887d4ed9a)
image.png
79 KiB
Nick Alberelli added 4 commits 2024-02-13 20:04:21 +01:00
Nick Alberelli commented 2024-02-13 20:16:02 +01:00
Author
Member
Copy Link

@eyecandy This is fix is ready, but it does contain breaking changes, so I have not put this in main yet.

Please let me know if you would like to roll this change out or if we are worried about the breaking changes (having to reset asset catalog on all assets, listed above) I can likely handle the issue using a bbatch script.

I am off Feburary 14th (tomorrow) so please feel free to ask @ZedDB to Squash Commit this PR if you would like to roll this out by updating add-ons. otherwise I will handle any feedback on Thursday Feburary 15th.

@eyecandy This is fix is ready, but it does contain breaking changes, so I have not put this in main yet. Please let me know if you would like to roll this change out or if we are worried about the breaking changes (having to reset asset catalog on all assets, listed above) I can likely handle the issue using a bbatch script. I am off Feburary 14th (tomorrow) so please feel free to ask @ZedDB to Squash Commit this PR if you would like to roll this out by [updating add-ons](https://studio.blender.org/pipeline/user-guide/project_tools/project-blender#install-update-add-ons). otherwise I will handle any feedback on Thursday Feburary 15th.
Nick Alberelli changed title from Asset Pipeline: Store Asset Catalog in String instead of Enum to Asset Pipeline: Store Asset Catalog in String 2024-02-13 20:16:19 +01:00
Andy Goralczyk commented 2024-02-13 20:46:02 +01:00
Member
Copy Link

If both @Mets and @SimonThommes are fine with it, feel free to push this change. I'm off on the 14th as well, so I'm fine waiting until the 15th as well. thanks for fixing this so quick!

If both @Mets and @SimonThommes are fine with it, feel free to push this change. I'm off on the 14th as well, so I'm fine waiting until the 15th as well. thanks for fixing this so quick!
Simon Thommes commented 2024-02-14 11:32:26 +01:00
Member
Copy Link

Sounds good to me. @TinyNick how is the owner of the set catalog defined right now. Would we only have to change the setting in the publish or in every working file? In case of the latter it would indeed be better to do this with a script.

Sounds good to me. @TinyNick how is the owner of the set catalog defined right now. Would we only have to change the setting in the publish or in every working file? In case of the latter it would indeed be better to do this with a script.
Demeter Dzadik commented 2024-02-15 14:27:14 +01:00
Member
Copy Link

☝️ Same sentiments and questions as Simon, once that's cleared up, this is fine by me.

☝️ Same sentiments and questions as Simon, once that's cleared up, this is fine by me.
Nick Alberelli commented 2024-02-15 16:02:44 +01:00
Author
Member
Copy Link

@Mets @SimonThommes
Currently you will need to update this string in all working files, but I have decided there is a better way...

I am going to add a getter/setter for this value, so it will be pre-populated with whatever the current state of the asset is based on the blender_assets.cats.txt file. This way the behaviour will be; whatever asset catalog the published file is set to will be populated into the new string value. Bypassing the need for a script to update the value on all these files (and it's better behaviour IMO)

In that case you will only need to change the asset catalog if it catalog is wrong and to make this change you can do it from any of the working files. Once the asset catalog is changed and sync'd to publish it will update the blender_assets.cats.txt which will be reflected in the string property for all working files.

@Mets @SimonThommes Currently you will need to update this string in all working files, but I have decided there is a better way... I am going to add a getter/setter for this value, so it will be pre-populated with whatever the current state of the asset is based on the `blender_assets.cats.txt` file. This way the behaviour will be; whatever asset catalog the published file is set to will be populated into the new string value. Bypassing the need for a script to update the value on all these files (and it's better behaviour IMO) In that case you will only need to change the asset catalog if it catalog is wrong and to make this change you can do it from any of the working files. Once the asset catalog is changed and sync'd to publish it will update the `blender_assets.cats.txt` which will be reflected in the string property for all working files.
Simon Thommes commented 2024-02-15 16:13:25 +01:00
Member
Copy Link

I'm not sure what the blender_assets.cats.txt has to do with this. Shouldn't that file just specify the general catalog hierarchy and their UUIDs? It doesn't have anything to do with the actual assets afaik, so we shouldn't have to touch it here.

Am I misunderstanding something?

I'm not sure what the `blender_assets.cats.txt` has to do with this. Shouldn't that file just specify the general catalog hierarchy and their UUIDs? It doesn't have anything to do with the actual assets afaik, so we shouldn't have to touch it here. Am I misunderstanding something?
Nick Alberelli commented 2024-02-15 16:22:53 +01:00
Author
Member
Copy Link

Yes I take back that comment I had a brain fart, forgot that the actual asset files aren't listed in blender_assets.cats.txt otherwise this would be easy. but the first part of my comment still stands, that you will need to set this string in multiple files so it's better if it is done with a script before I roll this out. I will get to work on that script asap.

Yes I take back that comment I had a brain fart, forgot that the actual asset files aren't listed in `blender_assets.cats.txt` otherwise this would be easy. but the first part of my comment still stands, that you will need to set this string in multiple files so it's better if it is done with a script before I roll this out. I will get to work on that script asap.
👍 1
Nick Alberelli commented 2024-02-15 16:28:19 +01:00
Author
Member
Copy Link

@SimonThommes @Mets @eyecandy

Do we have an opinion on which working files can change the asset catalog?

In the current step-up it can be changed by all task layer files but those changes are not sync'd so a change in working file A is reflected in publish but not in working file B.

Personally I think that should be changed. Would you guys prefer to have a single working file control this value, or have all working files share control of this value (assuming they are sync'd up some how)

@SimonThommes @Mets @eyecandy Do we have an opinion on which working files can change the asset catalog? In the current step-up it can be changed by all task layer files but those changes are not sync'd so a change in working file A is reflected in publish but not in working file B. Personally I think that should be changed. Would you guys prefer to have a single working file control this value, or have all working files share control of this value (assuming they are sync'd up some how)
Simon Thommes commented 2024-02-15 16:38:40 +01:00
Member
Copy Link

since there is no 'main' working file and this should usually not change anyways, it would be acceptable to me if all files shared the ownership of this setting

since there is no 'main' working file and this should usually not change anyways, it would be acceptable to me if all files shared the ownership of this setting
👍 2
Nick Alberelli added 1 commit 2024-02-15 21:24:19 +01:00
Nick Alberelli added 1 commit 2024-02-15 22:52:20 +01:00
Nick Alberelli commented 2024-02-15 22:53:43 +01:00
Author
Member
Copy Link

Alright I have updated this PR, the Asset Catalog ID is now stored in the Task Layer JSON file, this way all task layers are in "sync" when changing this value. I have crawled all the asset files and was able to set this property on your behalf for all the assets that had a category set (which was about half of them). I have updated the task layer JSONs for those files in SVN revision.

Going forward you only need to set the asset catalog in one of the working files, and it will populate to the other working files automatically, and to publish when you Sync/Push.

Changes have been rolled out to your workstations.

Alright I have updated this PR, the Asset Catalog ID is now stored in the Task Layer JSON file, this way all task layers are in "sync" when changing this value. I have crawled all the asset files and was able to set this property on your behalf for all the assets that had a category set (which was about half of them). I have updated the task layer JSONs for those files in SVN revision. Going forward you only need to set the asset catalog in one of the working files, and it will populate to the other working files automatically, and to publish when you Sync/Push. Changes have been rolled out to your workstations.
Nick Alberelli merged commit 13f7b2d84b into main 2024-02-15 22:54:08 +01:00
Nick Alberelli deleted branch fix/asset-catalog 2024-02-15 22:54:09 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Kind
Breaking
Breaking change that won't be backward compatible

  
Kind
Bug
Something is not working

  
Kind: Community

Issues opened by members of the community / outside the studio

  
Kind
Documentation
Documentation changes

  
Kind
Easy
Simple to complete

  
Kind
Enhancement
Improve existing functionality

  
Kind
Feature
New functionality

  
Kind
Proposal
A proposal or idea that requires feedback

  
Kind
Security
This is security issue

  
Kind
Studio Request
Requested by a user at the Blender-Studio

  
Kind
Testing
Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

No Label
Kind
Breaking
Kind
Bug
Kind: Community
Kind
Documentation
Kind
Easy
Kind
Enhancement
Kind
Feature
Kind
Proposal
Kind
Security
Kind
Studio Request
Kind
Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
4 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: studio/blender-studio-tools#230
No description provided.
Delete Branch "TinyNick/blender-studio-pipeline:fix/asset-catalog"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?