Skip to content

Commit

Permalink
Update to schemas v2024.06.16.060318, add publisher/course medium, no…
Browse files Browse the repository at this point in the history
… more symlinks for rust.capnp
  • Loading branch information
agates committed Jun 16, 2024
1 parent 91d46be commit 55e4585
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion copy-schema-files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/org/podcastindex/podping/hivewriter/rust.capnp

This file was deleted.

6 changes: 3 additions & 3 deletions src/org/podcastindex/podping/podping.capnp
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
22 changes: 21 additions & 1 deletion src/org/podcastindex/podping/podping_json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,11 @@ impl std::convert::TryFrom<String> for MediumsV10 {
#[doc = " \"filmL\","]
#[doc = " \"audiobookL\","]
#[doc = " \"newsletterL\","]
#[doc = " \"blogL\""]
#[doc = " \"blogL\","]
#[doc = " \"publisher\","]
#[doc = " \"publisherL\","]
#[doc = " \"course\","]
#[doc = " \"courseL\""]
#[doc = " ]"]
#[doc = "}"]
#[doc = r" ```"]
Expand All @@ -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 {
Expand All @@ -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(),
}
}
}
Expand All @@ -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()),
}
}
Expand Down
8 changes: 7 additions & 1 deletion src/org/podcastindex/podping/podping_medium.capnp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@0xedda8f1fc8b626fe;

using Rust = import "rust.capnp";
using Rust = import "../../../rust.capnp";

$Rust.parentModule("org::podcastindex::podping");

Expand All @@ -27,4 +27,10 @@ enum PodpingMedium {

blog @13;
blogL @14;

publisher @15;
publisherL @16;

course @17;
courseL @18;
}
2 changes: 1 addition & 1 deletion src/org/podcastindex/podping/podping_reason.capnp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@0x9accdfe4a45164eb;

using Rust = import "rust.capnp";
using Rust = import "../../../rust.capnp";

$Rust.parentModule("org::podcastindex::podping");

Expand Down
6 changes: 3 additions & 3 deletions src/org/podcastindex/podping/podping_write.capnp
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/org/podcastindex/podping/podping_write_error.capnp
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/org/podcastindex/podping/rust.capnp

This file was deleted.

0 comments on commit 55e4585

Please sign in to comment.