refactor(model): extract shared MediaInfo from Manga/Anime/Image Info

The metadata every domain carries — title, description, dates, tags, series,
previews, rating, views, uploader, age/hentai, plus external_ids/original_title/
status where they apply — lived duplicated across MangaInfo, AnimeInfo and
ImageContainerInfo. A model-wide change (the recent date-precision and tag-axis
work) had to touch all three. Factor those fields into one MediaInfo, embedded as
`common` in each Info by composition (not inheritance — the Info types stay
aggregates a parser fills with designated initializers, and the Swift bridge
imports them the same way). Each Info keeps its typed id and a short
domain-specific tail (manga: author/artist/chapters, anime: season/episodes,
image: item count).

Also harden the two ref() helpers (MangaChapterInfo, AnimeEpisodeInfo) to use
designated initializers, so a future field reorder in *Ref fails to compile
instead of silently rebinding.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: Toilettrauma

include/aniparse/anime/AnimeModel.hpp

@@ -99,27 +99,12 @@ enum class AnimeSeason {
 struct AnimeInfo {
 	/// The source's own numeric id, when it has one. @ref aniparse::invalid_anime_id (0) = it
 	/// does not, which is not an error. Neither a cross-source identity
-	/// (@ref external_ids) nor the handle to fetch with (@see AnimeGetter::serialize).
+	/// (@ref MediaInfo::external_ids) nor the handle to fetch with (@see AnimeGetter::serialize).
 	AnimeID id = invalid_anime_id;
 
-	/// Ids this anime carries on other sites, as the source reports them — the
-	/// consumer's handle for joining the same work across parsers, including
-	/// across domains (an anime and its manga are one work to a tracker). Empty
-	/// when the source knows none. Not this parser's own identity: to address the
-	/// anime here, use the getter (@see AnimeGetter::serialize). @see ExternalId
-	std::vector<ExternalId> external_ids;
-
-	/// The title to show, in whichever language the source leads with (there is no
-	/// promise it is English or romanized). Empty only when the source does not name
-	/// the anime at all.
-	std::string title;
-	/// The title in the work's original language/script, when the source carries one
-	/// AND it differs from @ref title. nullopt = no separate original title, or it is
-	/// the same string — so a consumer never renders the title twice.
-	std::optional<std::string> original_title;
-	/// Synopsis, plain text plus any links the source marked up (not HTML). Empty =
-	/// the source gives none in this response. @see AttributedText
-	AttributedText description;
+	/// The metadata shared with every other domain — title, description, dates, tags,
+	/// series, previews, rating, external ids, and the rest. @see aniparse::MediaInfo
+	MediaInfo common;
 
 	/// The broadcast season it premiered in. nullopt = the source has no season axis
 	/// at all; AnimeSeason::Unknown = it has one but states no value for this anime.
@@ -129,41 +114,6 @@ struct AnimeInfo {
 	/// none — compare against `std::chrono::year{}`, since year 0 is otherwise a
 	/// well-formed value.
 	std::chrono::year year{};
-	/// Airing state (ongoing / released / announced / source-specific). A
-	/// default-constructed status (empty name) = the source states none, and reads as
-	/// DefaultAiredStatuses::Other rather than as "released". @see AiredStatus
-	AiredStatus status;
-
-	/// When the anime was last touched on the source (a new episode, an edit).
-	/// @c nullopt = not stated. Orders items within one source only, since
-	/// sources differ on what counts as an update.
-	std::optional<ModelDate> update_time;
-	/// When it first aired. @c nullopt = the source states no exact date —
-	/// common, since many sources give only @ref season and @ref year.
-	std::optional<ModelDate> release_time;
-
-	/// Opaque change marker for the whole anime; @see MangaInfo::revision.
-	std::string revision;
-
-	/// The franchise(s)/parent work(s) the source places the anime in, primary first.
-	/// Empty = it places the anime in none — the anime stands alone or the source has
-	/// no such axis. Usually one; a franchise-tagging source may list several.
-	std::vector<Series> series;
-
-	/// Poster art and thumbnails, best first (a consumer showing one shows previews
-	/// front()). Empty = the source offers no artwork. Fetch descriptors, not bytes.
-	/// @see Image
-	std::vector<Image> previews;
-	/// The source's labels for this anime — genres, themes, whatever axes it tags by,
-	/// flattened into one list. A tag whose @ref Tag::ref is non-empty can be fed back
-	/// into a search; empty = the source lists none in this response.
-	std::vector<Tag> tags;
-
-	/// Community score, normalized to a 0-10 axis (@see Rating). nullopt = the source
-	/// publishes no score for this anime, which is not a score of zero.
-	std::optional<Rating> rating;
-	/// View/popularity counters. nullopt = the source publishes none. @see ViewStats
-	std::optional<ViewStats> views;
 
 	/// Episodes actually available now (a running airing exposes fewer than
 	/// planned); absent when the source does not state it.
@@ -174,20 +124,6 @@ struct AnimeInfo {
 	/// the series, not a per-episode measurement, so it is an estimate for a UI and
 	/// not a seek/progress bound. nullopt = the source does not state it.
 	std::optional<std::chrono::minutes> episode_duration;
-
-	/// Minimum age the source requires to view the anime, in years. 0 = unrestricted
-	/// or unstated — an adult work is more reliably detected via @ref is_hentai.
-	/// @see AgeRestriction
-	AgeRestriction age_restriction = 0;
-
-	/// The account that posted the anime, on sources where content is user-submitted.
-	/// nullopt = the source has no notion of an uploader (a publisher-side catalog).
-	std::optional<RelatedUser> uploader;
-
-	/// The source marks this anime as adult/pornographic. False = it does not mark it,
-	/// which is weaker than "safe": sources differ on where the line sits, and one
-	/// with no adult flag at all leaves this false throughout.
-	bool is_hentai = false;
 };
 
 /**
@@ -270,7 +206,7 @@ struct AnimeEpisodeInfo {
 	 *         unchanged — the number alone identifies an episode only on sources that
 	 *         leave @ref id empty. Cheap: nothing is fetched, the id is copied.
 	 */
-	[[nodiscard]] AnimeEpisodeRef ref() const { return { episode, id }; }
+	[[nodiscard]] AnimeEpisodeRef ref() const { return { .episode = episode, .id = id }; }
 };
 
 /**

include/aniparse/images/ImageModel.hpp

@@ -93,65 +93,19 @@ struct ImageContainerInfo {
 	/// @ref aniparse::invalid_image_container_id (0) = the source has no numeric id for it.
 	ImageContainerID id = invalid_image_container_id;
 
-	/// A label to show. Where the source titles its containers this is that title;
-	/// where it does not — a tag-only catalog whose posts have no name — the parser
-	/// synthesizes one that is stable for the container (built from its most telling
-	/// tags, or from its id). So it is never empty, but it is not necessarily
-	/// something the source itself would display, and it is not an identity.
-	std::string title;
-	/// Free text about the container, with any links the source marked up. Empty =
-	/// the source carries none, which is the norm for single-media containers.
-	/// @see AttributedText
-	AttributedText description;
-	/// The source's labels for the container — on a tag-driven catalog this is the
-	/// post's whole tag set, which is its primary metadata. Each tag whose
-	/// @ref Tag::ref is non-empty searches for that tag. Empty = the source lists none.
-	std::vector<Tag> tags;
-
-	/// The account that posted the container. nullopt = the source does not credit an
-	/// uploader (or does not carry it in this response).
-	std::optional<RelatedUser> uploader;
-	/// The franchise(s) the content derives from, where the source tags by them,
-	/// primary first. Empty = it does not, or the work is original rather than
-	/// derivative (@see series_original). A booru commonly lists several copyrights.
-	std::vector<Series> series;
-
-	/// Cover/sample images for the container as a whole (grid thumbnails).
-	/// Empty = the source offers no separate preview; the media itself must be used.
-	/// These are lower-resolution stand-ins, never the content. @see Image
-	std::vector<Image> previews;
-
-	/// Community score, normalized to a 0-10 axis (@see Rating). nullopt = the source
-	/// publishes no score for the container — note that a source may score posts
-	/// without exposing the scale, and then no rating is reported at all.
-	std::optional<Rating> rating;
-	/// View counters. nullopt = the source publishes none. @see ViewStats
-	std::optional<ViewStats> views;
-
-	/// When the container was last changed on the source. @c nullopt = not
-	/// stated. For change detection prefer @ref revision, which is defined for
-	/// equality comparison; this field is for display.
-	std::optional<ModelDate> update_time;
-	/// When the container was posted. @c nullopt = the source does not state it.
-	std::optional<ModelDate> release_time;
-
-	/// Opaque change marker for the whole container; @see MangaInfo::revision.
-	std::string revision;
-
-	/// Minimum age the source requires to view the container, in years. 0 =
-	/// unrestricted or unstated. A source that grades its content by explicitness
-	/// maps its adult grades onto this (18) as well as onto @ref is_hentai, so a
-	/// consumer can gate on either. @see AgeRestriction
-	AgeRestriction age_restriction = 0;
+	/// The metadata shared with every other domain — title, description, dates, tags,
+	/// series, previews, rating, and the rest. An image container leaves the members
+	/// that have no meaning for it (@ref MediaInfo::external_ids,
+	/// @ref MediaInfo::original_title, @ref MediaInfo::status) defaulted. Note that
+	/// @ref MediaInfo::title is never empty here — a tag-only catalog whose posts have
+	/// no name gets a stable synthesized title (built from its most telling tags, or
+	/// its id), which is not necessarily something the source itself would display and
+	/// is not an identity. @see aniparse::MediaInfo
+	MediaInfo common;
 
 	/// How many ImageItems the container holds, when the source states it up
 	/// front (a booru post is 1); absent when only discoverable by paging items().
 	std::optional<long> total_items;
-
-	/// The source marks this container as adult/pornographic. False = it does not
-	/// mark it, which is weaker than "safe": a source whose adult grades are coarse
-	/// (or absent) leaves borderline content unflagged. @see age_restriction
-	bool is_hentai = false;
 };
 
 } // namespace aniparse

include/aniparse/manga/MangaModel.hpp

@@ -111,90 +111,25 @@ inline constexpr MangaID invalid_manga_id = MangaID{ 0 };
 struct MangaInfo {
 	/// The source's own numeric id, when it has one. @ref aniparse::invalid_manga_id (0) = it
 	/// does not — which is not an error. This is a display/debugging convenience and
-	/// a source-local key; it is neither a cross-source identity (@ref external_ids)
+	/// a source-local key; it is neither a cross-source identity (@ref MediaInfo::external_ids)
 	/// nor the handle to fetch with (@see MangaGetter::serialize).
 	MangaID id = invalid_manga_id;
 
-	/// Ids this manga carries on other sites, as the source reports them — the
-	/// consumer's handle for joining the same work across parsers. Empty when the
-	/// source knows none (most reader sites); a metadata source typically knows at
-	/// least its MyAnimeList id. Not this parser's own identity: to address the
-	/// manga here, use the getter (@see MangaGetter::serialize). @see ExternalId
-	std::vector<ExternalId> external_ids;
-
-	/// The title to show, in whichever language the source leads with (a source that
-	/// carries several picks one; there is no promise it is English or romanized).
-	/// Empty only when the source does not name the manga at all.
-	std::string title;
-	/// The title in the work's original language/script, when the source carries one
-	/// AND it differs from @ref title. nullopt = the source has no separate original
-	/// title, or it is the same string — so a consumer never renders the title twice.
-	std::optional<std::string> original_title;
-	/// Synopsis, plain text plus any links the source marked up. Empty = the source
-	/// gives no description here (usual for a search card, and some works simply
-	/// have none). Not HTML: markup is either flattened into the text or lifted into
-	/// the attributes. @see AttributedText
-	AttributedText description;
-
-	/// When the manga was last touched on the source (a new chapter, an edit).
-	/// @c nullopt = the source does not state it. Sources differ on what
-	/// counts as an update, so this orders items within one source only.
-	std::optional<ModelDate> update_time;
-	/// When the manga was first published. @c nullopt = the source does not
-	/// state it — common when only a year is known.
-	std::optional<ModelDate> release_time;
-	/// Publication state (ongoing / released / announced / source-specific). A
-	/// default-constructed status (empty name) = the source states none, and reads as
-	/// DefaultAiredStatuses::Other rather than as "released". @see AiredStatus
-	AiredStatus status;
-
-	/// Opaque change marker for the whole manga, filled from the cheapest
-	/// signal the source exposes (an ETag, an updated-at value, an explicit
-	/// version, or a composite). Compared only for equality: a changed value
-	/// means the source reports the content as a different revision. Equality
-	/// is a cheap "probably unchanged" hint, not a content-integrity guarantee
-	/// (it does not catch a single re-uploaded chapter or mid-list id drift).
-	/// Empty = the source exposes no such signal.
-	std::string revision;
+	/// The metadata shared with every other domain — title, description, dates, tags,
+	/// series, previews, rating, external ids, and the rest. @see aniparse::MediaInfo
+	MediaInfo common;
 
 	/// Who wrote it. Its name is empty when the source credits no author (or does not
 	/// carry the credit in this response); the same person is often credited as both
 	/// author and artist, in which case both fields name them. @see RelatedUser
 	RelatedUser author;
 	/// Who drew it. Empty name = not credited here; see @ref author.
 	RelatedUser artist;
-	/// The franchise(s)/parent work(s) the source places the manga in, primary first.
-	/// Empty = it places the manga in none — the manga stands alone or the source has
-	/// no such axis. Usually one, but a source that tags by franchise (a doujin's
-	/// parodies, a booru's copyrights) can list several for one work.
-	std::vector<Series> series;
 
-	/// Cover art and thumbnails, best first (a consumer showing one shows previews
-	/// front()). Empty = the source offers no artwork; the images are fetch
-	/// descriptors, not bytes. @see Image
-	std::vector<Image> previews;
-	/// The source's labels for this manga — genres, themes, whatever axes it tags by,
-	/// flattened into one list. A tag whose @ref Tag::ref is non-empty can be fed
-	/// back into a search; empty = the source lists none in this response.
-	std::vector<Tag> tags;
-
-	/// Community score, normalized to a 0-10 axis (@see Rating). nullopt = the source
-	/// publishes no score for this manga, which is not the same as a score of zero.
-	std::optional<Rating> rating;
-	/// View/popularity counters. nullopt = the source publishes none. @see ViewStats
-	std::optional<ViewStats> views;
 	/// The list the authenticated user keeps this manga on (reading, planning, …).
 	/// nullopt = the request was anonymous, the source has no lists, or the user has
 	/// not filed this manga — the three are not distinguishable here. @see UserList
 	std::optional<UserList> user_lists;
-	/// Minimum age the source requires to view the manga, in years. 0 = unrestricted
-	/// or unstated — an adult work is more reliably detected via @ref is_hentai and
-	/// the source's own adult flag. @see AgeRestriction
-	AgeRestriction age_restriction = 0;
-
-	/// The account that posted the manga, on sources where content is user-submitted.
-	/// nullopt = the source has no notion of an uploader (a publisher-side catalog).
-	std::optional<RelatedUser> uploader;
 
 	/// How many chapters the source claims the manga has, when it says so up front.
 	/// nullopt = it does not, and the only way to know is to page chapters_info().
@@ -207,11 +142,6 @@ struct MangaInfo {
 	/// nullopt = the source does not report it. Distinct from @ref aniparse::MangaInfo::total_chapters — a work
 	/// is a count of chapters OR, when it has none, a count of pages.
 	std::optional<long> total_pages;
-
-	/// The source marks this manga as adult/pornographic. False = it does not mark
-	/// it, which is a weaker statement than "safe": sources differ on where the line
-	/// sits, and one that has no adult flag at all leaves this false throughout.
-	bool is_hentai = false;
 };
 
 /**
@@ -299,7 +229,7 @@ struct MangaChapterInfo {
 	 *         unchanged — the numbers alone identify a chapter only on sources that
 	 *         leave @ref id empty. Cheap: nothing is fetched, the id is copied.
 	 */
-	[[nodiscard]] MangaChapterRef ref() const { return { volume, chapter, id }; }
+	[[nodiscard]] MangaChapterRef ref() const { return { .volume = volume, .chapter = chapter, .id = id }; }
 };
 
 /**