Reduce LOC with shared media-source, JSON-emit, and omit-None helpers#151
Merged
Conversation
Factor three repeated patterns into helpers, collapsing duplication across the media commands and the JSON emission paths: 1. mediafile.resolve_media_source — the ~25-line URL-classify → download → reject block was copy-pasted in caption/clip/dub (and had already drifted: clip lacked the bare scheme:// reject). Now one context manager owns it, yielding (local_path, downloaded); callers keep only their per-command output-path logic (also shared via mediafile.default_output). clip now rejects scheme:// like caption/dub, and dub checks ffmpeg before the URL branch (matching caption). 2. jsonshape.compact — replaces the build-then-"if x is not None" idiom in CLIError.to_dict and the streaming turn payload. 3. jsonshape.dumps — centralizes json.dumps(..., default=str), the one serialization policy every emit path shared (output, BaseRenderer, the --out / -o json field renderers). https://claude.ai/code/session_01P9Yeo2YLTWUPou2yvqR7wa
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
2 participants
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.
Factor three repeated patterns into helpers, collapsing duplication across
the media commands and the JSON emission paths:
mediafile.resolve_media_source — the ~25-line URL-classify → download →
reject block was copy-pasted in caption/clip/dub (and had already drifted:
clip lacked the bare scheme:// reject). Now one context manager owns it,
yielding (local_path, downloaded); callers keep only their per-command
output-path logic (also shared via mediafile.default_output). clip now
rejects scheme:// like caption/dub, and dub checks ffmpeg before the URL
branch (matching caption).
jsonshape.compact — replaces the build-then-"if x is not None" idiom in
CLIError.to_dict and the streaming turn payload.
jsonshape.dumps — centralizes json.dumps(..., default=str), the one
serialization policy every emit path shared (output, BaseRenderer, the
--out / -o json field renderers).
https://claude.ai/code/session_01P9Yeo2YLTWUPou2yvqR7wa