refactor(ingest): remove the XML order form entry point - #442
Merged
KillerX merged 1 commit intoAug 14, 2026
Merged
Conversation
The JSON sidecar path added in 73de9db replaced the FileCatalyst XML order form. Nothing produces the XML any more, so this removes the door it came through and the types that only described it. The import flows themselves are untouched — Masters, RawMaterialForm, Multitrack and MoveUploadedFiles all stay registered and keep the same params. Gone: - the Asset workflow, AssetParams, and the copy/sanitize helpers that only existed to turn an XML fileList into a directory: copyToDir, sanitizeOrderForm, sanitizeDuplicatdPath - the two ways in: the /mnt/filecatalyst/workflow/xml/* watcher branch and the "AssetIngest" manual trigger - ingest.FileList, ingest.File, ingest.JobHistoryLog, ingest.JobLog and Metadata.XMLName, all of which only had readers inside Asset, plus the xml struct tags now that nothing unmarshals into these - thirteen JobProperty fields with no reader anywhere — the FileCatalyst transfer details (JobID aside: raw_material.go still reports it on failure) - wfutils.UnmarshalXMLFile, whose only caller was Asset. MarshalXml stays, it writes the SMIL in vx_export_vod What survives of asset_ingest.go is the OrderForm enum, which AssetJSON derives from the form key, so the file is now order_form.go. Its enum is left whole: the members beyond VB and LED-Material have no JSON form yet, but they name flows that still exist. Tests: the Asset cases go with the workflow, along with the three XML fixtures. Test_VBBulk_MasterFlow tested Masters through Asset's XML parsing — it now builds the same ingest.Metadata as a literal and drives Masters directly, so it keeps testing the flow that is still used. Moved to masters_test.go accordingly. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
3/n of a stack. Base:
fix/verify-selfupdate-checksum(#441).The JSON sidecar path added in 73de9db replaced the FileCatalyst XML order form. Nothing produces the XML any more, so this removes the door it came through and the types that only described it.
The import flows are untouched.
Masters,RawMaterialForm,MultitrackandMoveUploadedFilesall stay registered with the same params — only the XML-specific machinery goes.Gone:
Assetworkflow,AssetParams, and the helpers that only existed to turn an XMLfileListinto a directory:copyToDir,sanitizeOrderForm,sanitizeDuplicatdPath/mnt/filecatalyst/workflow/xml/*watcher branch and the"AssetIngest"manual triggeringest.FileList,ingest.File,ingest.JobHistoryLog,ingest.JobLogandMetadata.XMLName— all only read insideAsset— plus thexmlstruct tags now that nothing unmarshals into theseJobPropertyfields with no reader anywhere: the FileCatalyst transfer details (JobIDaside —raw_material.gostill reports it on failure)wfutils.UnmarshalXMLFile, whose only caller wasAsset.MarshalXmlstays, it writes the SMIL invx_export_vodWhat survives of
asset_ingest.gois theOrderFormenum, whichAssetJSONderives from the form key, so the file is noworder_form.go. The enum is left whole — the members beyondVBandLED-Materialhave no JSON form yet, but they name flows that still exist.Tests: the
Assetcases go with the workflow, along with the three XML fixtures.Test_VBBulk_MasterFlowtestedMastersthrough Asset's XML parsing — it now builds the sameingest.Metadataas a literal and drivesMastersdirectly, so it keeps testing the flow that is still used. Moved tomasters_test.goaccordingly.make testpasses,workflowcheckstill exits 0.🤖 Generated with Claude Code