From 55e4585197e185377d0cec8e42f064b1003b02b4 Mon Sep 17 00:00:00 2001 From: Alecks Gates Date: Sun, 16 Jun 2024 01:27:54 -0500 Subject: [PATCH] Update to schemas v2024.06.16.060318, add publisher/course medium, no more symlinks for rust.capnp --- .gitmodules | 2 +- copy-schema-files.sh | 2 +- podping-schemas | 2 +- .../hivewriter/podping_hive_transaction.capnp | 4 ++-- .../hivewriter/podping_hive_write.capnp | 6 ++++- .../podping/hivewriter/rust.capnp | 1 - src/org/podcastindex/podping/podping.capnp | 6 ++--- src/org/podcastindex/podping/podping_json.rs | 22 ++++++++++++++++++- .../podcastindex/podping/podping_medium.capnp | 8 ++++++- .../podcastindex/podping/podping_reason.capnp | 2 +- .../podcastindex/podping/podping_write.capnp | 6 ++--- .../podping/podping_write_error.capnp | 4 ++-- src/org/podcastindex/podping/rust.capnp | 1 - 13 files changed, 47 insertions(+), 19 deletions(-) delete mode 120000 src/org/podcastindex/podping/hivewriter/rust.capnp delete mode 120000 src/org/podcastindex/podping/rust.capnp diff --git a/.gitmodules b/.gitmodules index 8a942ba..1aee059 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "podping-schemas"] path = podping-schemas url = https://github.com/Podcastindex-org/podping-schemas.git - tag = v2024.06.14.033937 + tag = v2024.06.16.060318 diff --git a/copy-schema-files.sh b/copy-schema-files.sh index 9a08298..246f3b8 100755 --- a/copy-schema-files.sh +++ b/copy-schema-files.sh @@ -25,7 +25,7 @@ for file in "${package_path}"/**/*.capnp; do file_dir=$(dirname "$file") - mapfile -t file_imports < <(grep -oP 'using import "\K[^"].*?(?=\/[^\/]*\.capnp)' "$file" | uniq) + mapfile -t file_imports < <(grep -oP 'using ([a-zA-Z]* = )?import "\K[^"].*?(?=\/[^\/]*\.capnp)' "$file" | uniq) for import_dir in "${file_imports[@]}" do diff --git a/podping-schemas b/podping-schemas index 925e541..c1e3a2f 160000 --- a/podping-schemas +++ b/podping-schemas @@ -1 +1 @@ -Subproject commit 925e541b5aed99873df2db48c7d5e4e6f1ccae39 +Subproject commit c1e3a2f21c66bab420ddb5e502587f2ca127af4e diff --git a/src/org/podcastindex/podping/hivewriter/podping_hive_transaction.capnp b/src/org/podcastindex/podping/hivewriter/podping_hive_transaction.capnp index 1168497..2ba3592 100644 --- a/src/org/podcastindex/podping/hivewriter/podping_hive_transaction.capnp +++ b/src/org/podcastindex/podping/hivewriter/podping_hive_transaction.capnp @@ -1,10 +1,10 @@ @0xb804df1ba3cc0461; -using Rust = import "rust.capnp"; +using Rust = import "../../../../rust.capnp"; $Rust.parentModule("org::podcastindex::podping::hivewriter"); -using import "../podping.capnp".Podping; +using import "../../../../org/podcastindex/podping/podping.capnp".Podping; struct PodpingHiveTransaction { podpings @0 :List(Podping); diff --git a/src/org/podcastindex/podping/hivewriter/podping_hive_write.capnp b/src/org/podcastindex/podping/hivewriter/podping_hive_write.capnp index 0ba59b1..7b432ed 100644 --- a/src/org/podcastindex/podping/hivewriter/podping_hive_write.capnp +++ b/src/org/podcastindex/podping/hivewriter/podping_hive_write.capnp @@ -1,6 +1,10 @@ @0x9d1d9594e023aa7c; -using import "../podping_write.capnp".PodpingWrite; +using Rust = import "../../../../rust.capnp"; + +$Rust.parentModule("org::podcastindex::podping::hivewriter"); + +using import "../../../../org/podcastindex/podping/podping_write.capnp".PodpingWrite; struct PodpingHiveWrite { podpingWrite @0 :PodpingWrite; diff --git a/src/org/podcastindex/podping/hivewriter/rust.capnp b/src/org/podcastindex/podping/hivewriter/rust.capnp deleted file mode 120000 index 0e4e4d4..0000000 --- a/src/org/podcastindex/podping/hivewriter/rust.capnp +++ /dev/null @@ -1 +0,0 @@ -../../../../rust.capnp \ No newline at end of file diff --git a/src/org/podcastindex/podping/podping.capnp b/src/org/podcastindex/podping/podping.capnp index abef855..3c28867 100644 --- a/src/org/podcastindex/podping/podping.capnp +++ b/src/org/podcastindex/podping/podping.capnp @@ -1,11 +1,11 @@ @0xe034fb00fceb07b4; -using Rust = import "rust.capnp"; +using Rust = import "../../../rust.capnp"; $Rust.parentModule("org::podcastindex::podping"); -using import "./podping_medium.capnp".PodpingMedium; -using import "./podping_reason.capnp".PodpingReason; +using import "../../../org/podcastindex/podping/podping_medium.capnp".PodpingMedium; +using import "../../../org/podcastindex/podping/podping_reason.capnp".PodpingReason; struct Podping { medium @0 :PodpingMedium; diff --git a/src/org/podcastindex/podping/podping_json.rs b/src/org/podcastindex/podping/podping_json.rs index d0b7032..4cd4047 100644 --- a/src/org/podcastindex/podping/podping_json.rs +++ b/src/org/podcastindex/podping/podping_json.rs @@ -213,7 +213,11 @@ impl std::convert::TryFrom for MediumsV10 { #[doc = " \"filmL\","] #[doc = " \"audiobookL\","] #[doc = " \"newsletterL\","] -#[doc = " \"blogL\""] +#[doc = " \"blogL\","] +#[doc = " \"publisher\","] +#[doc = " \"publisherL\","] +#[doc = " \"course\","] +#[doc = " \"courseL\""] #[doc = " ]"] #[doc = "}"] #[doc = r" ```"] @@ -236,6 +240,14 @@ pub enum MediumsV11 { NewsletterL, #[serde(rename = "blogL")] BlogL, + #[serde(rename = "publisher")] + Publisher, + #[serde(rename = "publisherL")] + PublisherL, + #[serde(rename = "course")] + Course, + #[serde(rename = "courseL")] + CourseL, } impl From<&MediumsV11> for MediumsV11 { fn from(value: &MediumsV11) -> Self { @@ -253,6 +265,10 @@ impl ToString for MediumsV11 { Self::AudiobookL => "audiobookL".to_string(), Self::NewsletterL => "newsletterL".to_string(), Self::BlogL => "blogL".to_string(), + Self::Publisher => "publisher".to_string(), + Self::PublisherL => "publisherL".to_string(), + Self::Course => "course".to_string(), + Self::CourseL => "courseL".to_string(), } } } @@ -268,6 +284,10 @@ impl std::str::FromStr for MediumsV11 { "audiobookL" => Ok(Self::AudiobookL), "newsletterL" => Ok(Self::NewsletterL), "blogL" => Ok(Self::BlogL), + "publisher" => Ok(Self::Publisher), + "publisherL" => Ok(Self::PublisherL), + "course" => Ok(Self::Course), + "courseL" => Ok(Self::CourseL), _ => Err("invalid value".into()), } } diff --git a/src/org/podcastindex/podping/podping_medium.capnp b/src/org/podcastindex/podping/podping_medium.capnp index 8db7565..d63aa1c 100644 --- a/src/org/podcastindex/podping/podping_medium.capnp +++ b/src/org/podcastindex/podping/podping_medium.capnp @@ -1,6 +1,6 @@ @0xedda8f1fc8b626fe; -using Rust = import "rust.capnp"; +using Rust = import "../../../rust.capnp"; $Rust.parentModule("org::podcastindex::podping"); @@ -27,4 +27,10 @@ enum PodpingMedium { blog @13; blogL @14; + + publisher @15; + publisherL @16; + + course @17; + courseL @18; } diff --git a/src/org/podcastindex/podping/podping_reason.capnp b/src/org/podcastindex/podping/podping_reason.capnp index ce414ed..2333835 100644 --- a/src/org/podcastindex/podping/podping_reason.capnp +++ b/src/org/podcastindex/podping/podping_reason.capnp @@ -1,6 +1,6 @@ @0x9accdfe4a45164eb; -using Rust = import "rust.capnp"; +using Rust = import "../../../rust.capnp"; $Rust.parentModule("org::podcastindex::podping"); diff --git a/src/org/podcastindex/podping/podping_write.capnp b/src/org/podcastindex/podping/podping_write.capnp index 71c85bd..62018b1 100644 --- a/src/org/podcastindex/podping/podping_write.capnp +++ b/src/org/podcastindex/podping/podping_write.capnp @@ -1,11 +1,11 @@ @0x9b917b91f85f5cc2; -using Rust = import "rust.capnp"; +using Rust = import "../../../rust.capnp"; $Rust.parentModule("org::podcastindex::podping"); -using import "./podping_medium.capnp".PodpingMedium; -using import "./podping_reason.capnp".PodpingReason; +using import "../../../org/podcastindex/podping/podping_medium.capnp".PodpingMedium; +using import "../../../org/podcastindex/podping/podping_reason.capnp".PodpingReason; struct PodpingWrite { medium @0 :PodpingMedium; diff --git a/src/org/podcastindex/podping/podping_write_error.capnp b/src/org/podcastindex/podping/podping_write_error.capnp index 644110f..e4899d5 100644 --- a/src/org/podcastindex/podping/podping_write_error.capnp +++ b/src/org/podcastindex/podping/podping_write_error.capnp @@ -1,10 +1,10 @@ @0xdfd31317d35f60d9; -using Rust = import "rust.capnp"; +using Rust = import "../../../rust.capnp"; $Rust.parentModule("org::podcastindex::podping"); -using import "./podping_write.capnp".PodpingWrite; +using import "../../../org/podcastindex/podping/podping_write.capnp".PodpingWrite; enum PodpingWriteErrorType { invalidIri @0; diff --git a/src/org/podcastindex/podping/rust.capnp b/src/org/podcastindex/podping/rust.capnp deleted file mode 120000 index 2dbdaad..0000000 --- a/src/org/podcastindex/podping/rust.capnp +++ /dev/null @@ -1 +0,0 @@ -../../../rust.capnp \ No newline at end of file