From 564edf980e019e92d7ab6fa5f04f5a837e132744 Mon Sep 17 00:00:00 2001 From: Nikolai Sokolov Date: Mon, 4 Jul 2022 13:13:02 -0700 Subject: [PATCH 1/3] Adding changes for firearms metadata --- v2/build.sh | 2 +- v2/cpp/claim.pb.cc | 12556 ++++++++++++++++++++++++------------ v2/cpp/claim.pb.h | 9021 +++++++++++--------------- v2/cpp/purchase.pb.cc | 409 +- v2/cpp/purchase.pb.h | 306 +- v2/cpp/result.pb.cc | 3650 +++++++---- v2/cpp/result.pb.h | 2323 ++----- v2/cpp/support.pb.cc | 529 +- v2/cpp/support.pb.h | 359 +- v2/go/claim.pb.go | 7284 ++++++++++++--------- v2/go/purchase.pb.go | 167 +- v2/go/result.pb.go | 896 ++- v2/go/support.pb.go | 173 +- v2/js/claim_pb.js | 2302 ++++--- v2/js/purchase_pb.js | 32 +- v2/js/result_pb.js | 575 +- v2/js/support_pb.js | 59 +- v2/proto/claim.proto | 23 + v2/proto/purchase.proto | 1 + v2/proto/result.proto | 1 + v2/proto/support.proto | 1 + v2/python/claim_pb2.py | 5218 +++++++-------- v2/python/purchase_pb2.py | 27 +- v2/python/result_pb2.py | 168 +- v2/python/support_pb2.py | 36 +- 25 files changed, 25322 insertions(+), 20796 deletions(-) diff --git a/v2/build.sh b/v2/build.sh index efcd77f..7d99f88 100755 --- a/v2/build.sh +++ b/v2/build.sh @@ -20,7 +20,7 @@ MIN_VERSION="3.0" version_gte "$VERSION" "$MIN_VERSION" || { echo >&2 "error: protoc version must be >= $MIN_VERSION (your $PROTOC is $VERSION)"; exit 1; } -hash protoc-gen-go 2>/dev/null || go get -u github.com/golang/protobuf/protoc-gen-go +hash protoc-gen-go 2>/dev/null || go install github.com/golang/protobuf/protoc-gen-go@latest hash protoc-gen-go 2>/dev/null || { echo >&2 'error: Make sure $GOPATH/bin is in your $PATH'; exit 1; } diff --git a/v2/cpp/claim.pb.cc b/v2/cpp/claim.pb.cc index 1235c28..17fd4e6 100644 --- a/v2/cpp/claim.pb.cc +++ b/v2/cpp/claim.pb.cc @@ -1,750 +1,663 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: claim.proto +#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION #include "claim.pb.h" #include +#include +#include +#include #include -#include -#include +#include #include #include #include #include // @@protoc_insertion_point(includes) -#include -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Audio_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<2> scc_info_Channel_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_ClaimList_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_ClaimReference_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Fee_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Image_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Language_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Location_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Software_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Source_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<6> scc_info_Stream_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_Video_claim_2eproto; + namespace pb { -class ClaimDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; +class ClaimDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { + public: const ::pb::Stream* stream_; const ::pb::Channel* channel_; const ::pb::ClaimList* collection_; const ::pb::ClaimReference* repost_; } _Claim_default_instance_; -class StreamDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; +class StreamDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { + public: const ::pb::Image* image_; const ::pb::Video* video_; const ::pb::Audio* audio_; const ::pb::Software* software_; + const ::pb::DownloadableFile* downloadable_file_; + const ::pb::GuncadFile* guncad_file_; } _Stream_default_instance_; -class ChannelDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; +class ChannelDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { } _Channel_default_instance_; -class ClaimReferenceDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; +class ClaimReferenceDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { } _ClaimReference_default_instance_; -class ClaimListDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; +class ClaimListDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { } _ClaimList_default_instance_; -class SourceDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; +class SourceDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { } _Source_default_instance_; -class FeeDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; +class FeeDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { } _Fee_default_instance_; -class ImageDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; +class ImageDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { } _Image_default_instance_; -class VideoDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed