3 Commits
Author SHA1 Message Date
Alex Grintsvayg 5640bece22 release time 2019-02-27 11:40:26 -05:00
Alex Grintsvayg 69807aaae5 more changes 2019-02-14 09:55:47 -05:00
Alex Grintsvayg 4223fd24b4 first attempt at converting to proto3 and some housekeeping 2019-01-25 11:17:31 -05:00
26 changed files with 467 additions and 851 deletions

No files matched your search

+2 -2
View File
@@ -8,12 +8,12 @@
#include <google/protobuf/stubs/common.h>
#if GOOGLE_PROTOBUF_VERSION < 3006001
#if GOOGLE_PROTOBUF_VERSION < 3006000
#error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
+2 -2
View File
@@ -8,12 +8,12 @@
#include <google/protobuf/stubs/common.h>
#if GOOGLE_PROTOBUF_VERSION < 3006001
#if GOOGLE_PROTOBUF_VERSION < 3006000
#error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
+2 -2
View File
@@ -8,12 +8,12 @@
#include <google/protobuf/stubs/common.h>
#if GOOGLE_PROTOBUF_VERSION < 3006001
#if GOOGLE_PROTOBUF_VERSION < 3006000
#error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
+52 -90
View File
@@ -69,22 +69,20 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, thumbnail_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, preview_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, licenseurl_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, releasetime_),
8,
9,
0,
1,
2,
3,
11,
10,
7,
4,
5,
6,
10,
};
static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
{ 0, 17, sizeof(::pb::Metadata)},
{ 0, 16, sizeof(::pb::Metadata)},
};
static ::google::protobuf::Message const * const file_default_instances[] = {
@@ -112,58 +110,58 @@ void protobuf_RegisterTypes(const ::std::string&) {
void AddDescriptorsImpl() {
InitDefaults();
static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
"\n\016metadata.proto\022\002pb\032\tfee.proto\"\374\016\n\010Meta"
"\n\016metadata.proto\022\002pb\032\tfee.proto\"\347\016\n\010Meta"
"data\022%\n\007version\030\001 \002(\0162\024.pb.Metadata.Vers"
"ion\022\'\n\010language\030\002 \002(\0162\025.pb.Metadata.Lang"
"uage\022\r\n\005title\030\003 \002(\t\022\023\n\013description\030\004 \002(\t"
"\022\016\n\006author\030\005 \002(\t\022\017\n\007license\030\006 \002(\t\022\014\n\004nsf"
"w\030\007 \002(\010\022\024\n\003fee\030\010 \001(\0132\007.pb.Fee\022\021\n\tthumbna"
"il\030\t \001(\t\022\017\n\007preview\030\n \001(\t\022\022\n\nlicenseUrl\030"
"\013 \001(\t\022\023\n\013releaseTime\030\014 \001(\022\"N\n\007Version\022\023\n"
"\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001\022\n\n\006_0_0_2"
"\020\002\022\n\n\006_0_0_3\020\003\022\n\n\006_0_1_0\020\004\"\231\014\n\010Language\022"
"\024\n\020UNKNOWN_LANGUAGE\020\000\022\006\n\002en\020\001\022\006\n\002aa\020\002\022\006\n"
"\002ab\020\003\022\006\n\002ae\020\004\022\006\n\002af\020\005\022\006\n\002ak\020\006\022\006\n\002am\020\007\022\006\n"
"\002an\020\010\022\006\n\002ar\020\t\022\006\n\002as\020\n\022\006\n\002av\020\013\022\006\n\002ay\020\014\022\006\n"
"\002az\020\r\022\006\n\002ba\020\016\022\006\n\002be\020\017\022\006\n\002bg\020\020\022\006\n\002bh\020\021\022\006\n"
"\002bi\020\022\022\006\n\002bm\020\023\022\006\n\002bn\020\024\022\006\n\002bo\020\025\022\006\n\002br\020\026\022\006\n"
"\002bs\020\027\022\006\n\002ca\020\030\022\006\n\002ce\020\031\022\006\n\002ch\020\032\022\006\n\002co\020\033\022\006\n"
"\002cr\020\034\022\006\n\002cs\020\035\022\006\n\002cu\020\036\022\006\n\002cv\020\037\022\006\n\002cy\020 \022\006\n"
"\002da\020!\022\006\n\002de\020\"\022\006\n\002dv\020#\022\006\n\002dz\020$\022\006\n\002ee\020%\022\006\n"
"\002el\020&\022\006\n\002eo\020\'\022\006\n\002es\020(\022\006\n\002et\020)\022\006\n\002eu\020*\022\006\n"
"\002fa\020+\022\006\n\002ff\020,\022\006\n\002fi\020-\022\006\n\002fj\020.\022\006\n\002fo\020/\022\006\n"
"\002fr\0200\022\006\n\002fy\0201\022\006\n\002ga\0202\022\006\n\002gd\0203\022\006\n\002gl\0204\022\006\n"
"\002gn\0205\022\006\n\002gu\0206\022\006\n\002gv\0207\022\006\n\002ha\0208\022\006\n\002he\0209\022\006\n"
"\002hi\020:\022\006\n\002ho\020;\022\006\n\002hr\020<\022\006\n\002ht\020=\022\006\n\002hu\020>\022\006\n"
"\002hy\020\?\022\006\n\002hz\020@\022\006\n\002ia\020A\022\006\n\002id\020B\022\006\n\002ie\020C\022\006\n"
"\002ig\020D\022\006\n\002ii\020E\022\006\n\002ik\020F\022\006\n\002io\020G\022\006\n\002is\020H\022\006\n"
"\002it\020I\022\006\n\002iu\020J\022\006\n\002ja\020K\022\006\n\002jv\020L\022\006\n\002ka\020M\022\006\n"
"\002kg\020N\022\006\n\002ki\020O\022\006\n\002kj\020P\022\006\n\002kk\020Q\022\006\n\002kl\020R\022\006\n"
"\002km\020S\022\006\n\002kn\020T\022\006\n\002ko\020U\022\006\n\002kr\020V\022\006\n\002ks\020W\022\006\n"
"\002ku\020X\022\006\n\002kv\020Y\022\006\n\002kw\020Z\022\006\n\002ky\020[\022\006\n\002la\020\\\022\006\n"
"\002lb\020]\022\006\n\002lg\020^\022\006\n\002li\020_\022\006\n\002ln\020`\022\006\n\002lo\020a\022\006\n"
"\002lt\020b\022\006\n\002lu\020c\022\006\n\002lv\020d\022\006\n\002mg\020e\022\006\n\002mh\020f\022\006\n"
"\002mi\020g\022\006\n\002mk\020h\022\006\n\002ml\020i\022\006\n\002mn\020j\022\006\n\002mr\020k\022\006\n"
"\002ms\020l\022\006\n\002mt\020m\022\006\n\002my\020n\022\006\n\002na\020o\022\006\n\002nb\020p\022\006\n"
"\002nd\020q\022\006\n\002ne\020r\022\006\n\002ng\020s\022\006\n\002nl\020t\022\006\n\002nn\020u\022\006\n"
"\002no\020v\022\006\n\002nr\020w\022\006\n\002nv\020x\022\006\n\002ny\020y\022\006\n\002oc\020z\022\006\n"
"\002oj\020{\022\006\n\002om\020|\022\006\n\002or\020}\022\006\n\002os\020~\022\006\n\002pa\020\177\022\007\n"
"\002pi\020\200\001\022\007\n\002pl\020\201\001\022\007\n\002ps\020\202\001\022\007\n\002pt\020\203\001\022\007\n\002qu\020"
"\204\001\022\007\n\002rm\020\205\001\022\007\n\002rn\020\206\001\022\007\n\002ro\020\207\001\022\007\n\002ru\020\210\001\022\007"
"\n\002rw\020\211\001\022\007\n\002sa\020\212\001\022\007\n\002sc\020\213\001\022\007\n\002sd\020\214\001\022\007\n\002se"
"\020\215\001\022\007\n\002sg\020\216\001\022\007\n\002si\020\217\001\022\007\n\002sk\020\220\001\022\007\n\002sl\020\221\001\022"
"\007\n\002sm\020\222\001\022\007\n\002sn\020\223\001\022\007\n\002so\020\224\001\022\007\n\002sq\020\225\001\022\007\n\002s"
"r\020\226\001\022\007\n\002ss\020\227\001\022\007\n\002st\020\230\001\022\007\n\002su\020\231\001\022\007\n\002sv\020\232\001"
"\022\007\n\002sw\020\233\001\022\007\n\002ta\020\234\001\022\007\n\002te\020\235\001\022\007\n\002tg\020\236\001\022\007\n\002"
"th\020\237\001\022\007\n\002ti\020\240\001\022\007\n\002tk\020\241\001\022\007\n\002tl\020\242\001\022\007\n\002tn\020\243"
"\001\022\007\n\002to\020\244\001\022\007\n\002tr\020\245\001\022\007\n\002ts\020\246\001\022\007\n\002tt\020\247\001\022\007\n"
"\002tw\020\250\001\022\007\n\002ty\020\251\001\022\007\n\002ug\020\252\001\022\007\n\002uk\020\253\001\022\007\n\002ur\020"
"\254\001\022\007\n\002uz\020\255\001\022\007\n\002ve\020\256\001\022\007\n\002vi\020\257\001\022\007\n\002vo\020\260\001\022\007"
"\n\002wa\020\261\001\022\007\n\002wo\020\262\001\022\007\n\002xh\020\263\001\022\007\n\002yi\020\264\001\022\007\n\002yo"
"\020\265\001\022\007\n\002za\020\266\001\022\007\n\002zh\020\267\001\022\007\n\002zu\020\270\001"
"\013 \001(\t\"N\n\007Version\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n"
"\006_0_0_1\020\001\022\n\n\006_0_0_2\020\002\022\n\n\006_0_0_3\020\003\022\n\n\006_0_"
"1_0\020\004\"\231\014\n\010Language\022\024\n\020UNKNOWN_LANGUAGE\020\000"
"\022\006\n\002en\020\001\022\006\n\002aa\020\002\022\006\n\002ab\020\003\022\006\n\002ae\020\004\022\006\n\002af\020\005"
"\022\006\n\002ak\020\006\022\006\n\002am\020\007\022\006\n\002an\020\010\022\006\n\002ar\020\t\022\006\n\002as\020\n"
"\022\006\n\002av\020\013\022\006\n\002ay\020\014\022\006\n\002az\020\r\022\006\n\002ba\020\016\022\006\n\002be\020\017"
"\022\006\n\002bg\020\020\022\006\n\002bh\020\021\022\006\n\002bi\020\022\022\006\n\002bm\020\023\022\006\n\002bn\020\024"
"\022\006\n\002bo\020\025\022\006\n\002br\020\026\022\006\n\002bs\020\027\022\006\n\002ca\020\030\022\006\n\002ce\020\031"
"\022\006\n\002ch\020\032\022\006\n\002co\020\033\022\006\n\002cr\020\034\022\006\n\002cs\020\035\022\006\n\002cu\020\036"
"\022\006\n\002cv\020\037\022\006\n\002cy\020 \022\006\n\002da\020!\022\006\n\002de\020\"\022\006\n\002dv\020#"
"\022\006\n\002dz\020$\022\006\n\002ee\020%\022\006\n\002el\020&\022\006\n\002eo\020\'\022\006\n\002es\020("
"\022\006\n\002et\020)\022\006\n\002eu\020*\022\006\n\002fa\020+\022\006\n\002ff\020,\022\006\n\002fi\020-"
"\022\006\n\002fj\020.\022\006\n\002fo\020/\022\006\n\002fr\0200\022\006\n\002fy\0201\022\006\n\002ga\0202"
"\022\006\n\002gd\0203\022\006\n\002gl\0204\022\006\n\002gn\0205\022\006\n\002gu\0206\022\006\n\002gv\0207"
"\022\006\n\002ha\0208\022\006\n\002he\0209\022\006\n\002hi\020:\022\006\n\002ho\020;\022\006\n\002hr\020<"
"\022\006\n\002ht\020=\022\006\n\002hu\020>\022\006\n\002hy\020\?\022\006\n\002hz\020@\022\006\n\002ia\020A"
"\022\006\n\002id\020B\022\006\n\002ie\020C\022\006\n\002ig\020D\022\006\n\002ii\020E\022\006\n\002ik\020F"
"\022\006\n\002io\020G\022\006\n\002is\020H\022\006\n\002it\020I\022\006\n\002iu\020J\022\006\n\002ja\020K"
"\022\006\n\002jv\020L\022\006\n\002ka\020M\022\006\n\002kg\020N\022\006\n\002ki\020O\022\006\n\002kj\020P"
"\022\006\n\002kk\020Q\022\006\n\002kl\020R\022\006\n\002km\020S\022\006\n\002kn\020T\022\006\n\002ko\020U"
"\022\006\n\002kr\020V\022\006\n\002ks\020W\022\006\n\002ku\020X\022\006\n\002kv\020Y\022\006\n\002kw\020Z"
"\022\006\n\002ky\020[\022\006\n\002la\020\\\022\006\n\002lb\020]\022\006\n\002lg\020^\022\006\n\002li\020_"
"\022\006\n\002ln\020`\022\006\n\002lo\020a\022\006\n\002lt\020b\022\006\n\002lu\020c\022\006\n\002lv\020d"
"\022\006\n\002mg\020e\022\006\n\002mh\020f\022\006\n\002mi\020g\022\006\n\002mk\020h\022\006\n\002ml\020i"
"\022\006\n\002mn\020j\022\006\n\002mr\020k\022\006\n\002ms\020l\022\006\n\002mt\020m\022\006\n\002my\020n"
"\022\006\n\002na\020o\022\006\n\002nb\020p\022\006\n\002nd\020q\022\006\n\002ne\020r\022\006\n\002ng\020s"
"\022\006\n\002nl\020t\022\006\n\002nn\020u\022\006\n\002no\020v\022\006\n\002nr\020w\022\006\n\002nv\020x"
"\022\006\n\002ny\020y\022\006\n\002oc\020z\022\006\n\002oj\020{\022\006\n\002om\020|\022\006\n\002or\020}"
"\022\006\n\002os\020~\022\006\n\002pa\020\177\022\007\n\002pi\020\200\001\022\007\n\002pl\020\201\001\022\007\n\002ps"
"\020\202\001\022\007\n\002pt\020\203\001\022\007\n\002qu\020\204\001\022\007\n\002rm\020\205\001\022\007\n\002rn\020\206\001\022"
"\007\n\002ro\020\207\001\022\007\n\002ru\020\210\001\022\007\n\002rw\020\211\001\022\007\n\002sa\020\212\001\022\007\n\002s"
"c\020\213\001\022\007\n\002sd\020\214\001\022\007\n\002se\020\215\001\022\007\n\002sg\020\216\001\022\007\n\002si\020\217\001"
"\022\007\n\002sk\020\220\001\022\007\n\002sl\020\221\001\022\007\n\002sm\020\222\001\022\007\n\002sn\020\223\001\022\007\n\002"
"so\020\224\001\022\007\n\002sq\020\225\001\022\007\n\002sr\020\226\001\022\007\n\002ss\020\227\001\022\007\n\002st\020\230"
"\001\022\007\n\002su\020\231\001\022\007\n\002sv\020\232\001\022\007\n\002sw\020\233\001\022\007\n\002ta\020\234\001\022\007\n"
"\002te\020\235\001\022\007\n\002tg\020\236\001\022\007\n\002th\020\237\001\022\007\n\002ti\020\240\001\022\007\n\002tk\020"
"\241\001\022\007\n\002tl\020\242\001\022\007\n\002tn\020\243\001\022\007\n\002to\020\244\001\022\007\n\002tr\020\245\001\022\007"
"\n\002ts\020\246\001\022\007\n\002tt\020\247\001\022\007\n\002tw\020\250\001\022\007\n\002ty\020\251\001\022\007\n\002ug"
"\020\252\001\022\007\n\002uk\020\253\001\022\007\n\002ur\020\254\001\022\007\n\002uz\020\255\001\022\007\n\002ve\020\256\001\022"
"\007\n\002vi\020\257\001\022\007\n\002vo\020\260\001\022\007\n\002wa\020\261\001\022\007\n\002wo\020\262\001\022\007\n\002x"
"h\020\263\001\022\007\n\002yi\020\264\001\022\007\n\002yo\020\265\001\022\007\n\002za\020\266\001\022\007\n\002zh\020\267\001"
"\022\007\n\002zu\020\270\001"
};
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
descriptor, 1950);
descriptor, 1929);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"metadata.proto", &protobuf_RegisterTypes);
::protobuf_fee_2eproto::AddDescriptors();
@@ -618,7 +616,6 @@ const int Metadata::kFeeFieldNumber;
const int Metadata::kThumbnailFieldNumber;
const int Metadata::kPreviewFieldNumber;
const int Metadata::kLicenseUrlFieldNumber;
const int Metadata::kReleaseTimeFieldNumber;
#endif // !defined(_MSC_VER) || _MSC_VER >= 1900
Metadata::Metadata()
@@ -749,7 +746,7 @@ void Metadata::Clear() {
fee_->Clear();
}
}
if (cached_has_bits & 3840u) {
if (cached_has_bits & 1792u) {
::memset(&version_, 0, static_cast<size_t>(
reinterpret_cast<char*>(&nsfw_) -
reinterpret_cast<char*>(&version_)) + sizeof(nsfw_));
@@ -946,20 +943,6 @@ bool Metadata::MergePartialFromCodedStream(
break;
}
// optional sint64 releaseTime = 12;
case 12: {
if (static_cast< ::google::protobuf::uint8>(tag) ==
static_cast< ::google::protobuf::uint8>(96u /* 96 & 0xFF */)) {
set_has_releasetime();
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_SINT64>(
input, &releasetime_)));
} else {
goto handle_unusual;
}
break;
}
default: {
handle_unusual:
if (tag == 0) {
@@ -1040,7 +1023,7 @@ void Metadata::SerializeWithCachedSizes(
}
// required bool nsfw = 7;
if (cached_has_bits & 0x00000800u) {
if (cached_has_bits & 0x00000400u) {
::google::protobuf::internal::WireFormatLite::WriteBool(7, this->nsfw(), output);
}
@@ -1080,11 +1063,6 @@ void Metadata::SerializeWithCachedSizes(
11, this->licenseurl(), output);
}
// optional sint64 releaseTime = 12;
if (cached_has_bits & 0x00000400u) {
::google::protobuf::internal::WireFormatLite::WriteSInt64(12, this->releasetime(), output);
}
if (_internal_metadata_.have_unknown_fields()) {
::google::protobuf::internal::WireFormat::SerializeUnknownFields(
_internal_metadata_.unknown_fields(), output);
@@ -1157,7 +1135,7 @@ void Metadata::SerializeWithCachedSizes(
}
// required bool nsfw = 7;
if (cached_has_bits & 0x00000800u) {
if (cached_has_bits & 0x00000400u) {
target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->nsfw(), target);
}
@@ -1201,11 +1179,6 @@ void Metadata::SerializeWithCachedSizes(
11, this->licenseurl(), target);
}
// optional sint64 releaseTime = 12;
if (cached_has_bits & 0x00000400u) {
target = ::google::protobuf::internal::WireFormatLite::WriteSInt64ToArray(12, this->releasetime(), target);
}
if (_internal_metadata_.have_unknown_fields()) {
target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
_internal_metadata_.unknown_fields(), target);
@@ -1274,7 +1247,7 @@ size_t Metadata::ByteSizeLong() const {
::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
_internal_metadata_.unknown_fields());
}
if (((_has_bits_[0] & 0x00000b0f) ^ 0x00000b0f) == 0) { // All required fields are present.
if (((_has_bits_[0] & 0x0000070f) ^ 0x0000070f) == 0) { // All required fields are present.
// required string title = 3;
total_size += 1 +
::google::protobuf::internal::WireFormatLite::StringSize(
@@ -1339,13 +1312,6 @@ size_t Metadata::ByteSizeLong() const {
}
}
// optional sint64 releaseTime = 12;
if (has_releasetime()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::SInt64Size(
this->releasetime());
}
int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
SetCachedSize(cached_size);
return total_size;
@@ -1407,7 +1373,7 @@ void Metadata::MergeFrom(const Metadata& from) {
mutable_fee()->::pb::Fee::MergeFrom(from.fee());
}
}
if (cached_has_bits & 3840u) {
if (cached_has_bits & 1792u) {
if (cached_has_bits & 0x00000100u) {
version_ = from.version_;
}
@@ -1415,9 +1381,6 @@ void Metadata::MergeFrom(const Metadata& from) {
language_ = from.language_;
}
if (cached_has_bits & 0x00000400u) {
releasetime_ = from.releasetime_;
}
if (cached_has_bits & 0x00000800u) {
nsfw_ = from.nsfw_;
}
_has_bits_[0] |= cached_has_bits;
@@ -1439,7 +1402,7 @@ void Metadata::CopyFrom(const Metadata& from) {
}
bool Metadata::IsInitialized() const {
if ((_has_bits_[0] & 0x00000b0f) != 0x00000b0f) return false;
if ((_has_bits_[0] & 0x0000070f) != 0x0000070f) return false;
if (has_fee()) {
if (!this->fee_->IsInitialized()) return false;
}
@@ -1469,7 +1432,6 @@ void Metadata::InternalSwap(Metadata* other) {
swap(fee_, other->fee_);
swap(version_, other->version_);
swap(language_, other->language_);
swap(releasetime_, other->releasetime_);
swap(nsfw_, other->nsfw_);
swap(_has_bits_[0], other->_has_bits_[0]);
_internal_metadata_.Swap(&other->_internal_metadata_);
+5 -39
View File
@@ -8,12 +8,12 @@
#include <google/protobuf/stubs/common.h>
#if GOOGLE_PROTOBUF_VERSION < 3006001
#if GOOGLE_PROTOBUF_VERSION < 3006000
#error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
@@ -934,13 +934,6 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
::pb::Metadata_Language language() const;
void set_language(::pb::Metadata_Language value);
// optional sint64 releaseTime = 12;
bool has_releasetime() const;
void clear_releasetime();
static const int kReleaseTimeFieldNumber = 12;
::google::protobuf::int64 releasetime() const;
void set_releasetime(::google::protobuf::int64 value);
// required bool nsfw = 7;
bool has_nsfw() const;
void clear_nsfw();
@@ -972,8 +965,6 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
void clear_has_preview();
void set_has_licenseurl();
void clear_has_licenseurl();
void set_has_releasetime();
void clear_has_releasetime();
// helper for ByteSizeLong()
size_t RequiredFieldsByteSizeFallback() const;
@@ -991,7 +982,6 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
::pb::Fee* fee_;
int version_;
int language_;
::google::protobuf::int64 releasetime_;
bool nsfw_;
friend struct ::protobuf_metadata_2eproto::TableStruct;
};
@@ -1322,13 +1312,13 @@ inline void Metadata::set_allocated_license(::std::string* license) {
// required bool nsfw = 7;
inline bool Metadata::has_nsfw() const {
return (_has_bits_[0] & 0x00000800u) != 0;
return (_has_bits_[0] & 0x00000400u) != 0;
}
inline void Metadata::set_has_nsfw() {
_has_bits_[0] |= 0x00000800u;
_has_bits_[0] |= 0x00000400u;
}
inline void Metadata::clear_has_nsfw() {
_has_bits_[0] &= ~0x00000800u;
_has_bits_[0] &= ~0x00000400u;
}
inline void Metadata::clear_nsfw() {
nsfw_ = false;
@@ -1596,30 +1586,6 @@ inline void Metadata::set_allocated_licenseurl(::std::string* licenseurl) {
// @@protoc_insertion_point(field_set_allocated:pb.Metadata.licenseUrl)
}
// optional sint64 releaseTime = 12;
inline bool Metadata::has_releasetime() const {
return (_has_bits_[0] & 0x00000400u) != 0;
}
inline void Metadata::set_has_releasetime() {
_has_bits_[0] |= 0x00000400u;
}
inline void Metadata::clear_has_releasetime() {
_has_bits_[0] &= ~0x00000400u;
}
inline void Metadata::clear_releasetime() {
releasetime_ = GOOGLE_LONGLONG(0);
clear_has_releasetime();
}
inline ::google::protobuf::int64 Metadata::releasetime() const {
// @@protoc_insertion_point(field_get:pb.Metadata.releaseTime)
return releasetime_;
}
inline void Metadata::set_releasetime(::google::protobuf::int64 value) {
set_has_releasetime();
releasetime_ = value;
// @@protoc_insertion_point(field_set:pb.Metadata.releaseTime)
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif // __GNUC__
+2 -2
View File
@@ -8,12 +8,12 @@
#include <google/protobuf/stubs/common.h>
#if GOOGLE_PROTOBUF_VERSION < 3006001
#if GOOGLE_PROTOBUF_VERSION < 3006000
#error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
+2 -2
View File
@@ -8,12 +8,12 @@
#include <google/protobuf/stubs/common.h>
#if GOOGLE_PROTOBUF_VERSION < 3006001
#if GOOGLE_PROTOBUF_VERSION < 3006000
#error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
+2 -2
View File
@@ -8,12 +8,12 @@
#include <google/protobuf/stubs/common.h>
#if GOOGLE_PROTOBUF_VERSION < 3006001
#if GOOGLE_PROTOBUF_VERSION < 3006000
#error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
+62 -71
View File
@@ -650,7 +650,6 @@ type Metadata struct {
Thumbnail *string `protobuf:"bytes,9,opt,name=thumbnail" json:"thumbnail,omitempty"`
Preview *string `protobuf:"bytes,10,opt,name=preview" json:"preview,omitempty"`
LicenseUrl *string `protobuf:"bytes,11,opt,name=licenseUrl" json:"licenseUrl,omitempty"`
ReleaseTime *int64 `protobuf:"zigzag64,12,opt,name=releaseTime" json:"releaseTime,omitempty"`
XXX_unrecognized []byte `json:"-"`
}
@@ -736,13 +735,6 @@ func (m *Metadata) GetLicenseUrl() string {
return ""
}
func (m *Metadata) GetReleaseTime() int64 {
if m != nil && m.ReleaseTime != nil {
return *m.ReleaseTime
}
return 0
}
func init() {
proto.RegisterType((*Metadata)(nil), "pb.Metadata")
proto.RegisterEnum("pb.Metadata_Version", Metadata_Version_name, Metadata_Version_value)
@@ -752,67 +744,66 @@ func init() {
func init() { proto.RegisterFile("metadata.proto", fileDescriptor3) }
var fileDescriptor3 = []byte{
// 984 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0xd0, 0x77, 0x7f, 0xdb, 0x44,
0x1c, 0xc7, 0xf1, 0xda, 0x49, 0x63, 0x5b, 0x29, 0xed, 0x17, 0x75, 0xa0, 0x96, 0x52, 0x4c, 0x58,
0x66, 0x99, 0x24, 0x65, 0xef, 0x02, 0x6d, 0x29, 0x4d, 0x1d, 0x70, 0x9b, 0x94, 0x6d, 0xce, 0xf6,
0x59, 0x56, 0x2c, 0x4b, 0x8e, 0x96, 0x6b, 0xb3, 0xf7, 0xde, 0xb3, 0xec, 0xbd, 0xf7, 0x7e, 0x50,
0x3c, 0x08, 0x5e, 0xfa, 0xfe, 0x9c, 0x34, 0xfc, 0xf5, 0xfe, 0xdc, 0xfd, 0x4e, 0xb9, 0xf8, 0x8c,
0x8d, 0x5d, 0x1d, 0xa9, 0xa6, 0x8a, 0x54, 0xb9, 0x17, 0xf8, 0x91, 0x6f, 0x66, 0x7b, 0xf5, 0x1d,
0x85, 0x96, 0xd6, 0xb2, 0x9c, 0xfa, 0x77, 0x93, 0x91, 0x3f, 0x34, 0x3a, 0x61, 0x96, 0x8d, 0x5c,
0xa2, 0x83, 0xd0, 0xf1, 0x3d, 0x2b, 0x53, 0xcc, 0x96, 0x36, 0xce, 0x6e, 0x29, 0xf7, 0xea, 0xe5,
0x95, 0x71, 0x79, 0x51, 0x66, 0xd5, 0x95, 0x43, 0xe6, 0x8c, 0x91, 0x77, 0x95, 0x67, 0xc7, 0xca,
0xd6, 0x56, 0x96, 0x1f, 0x6c, 0xfd, 0xdf, 0x07, 0x73, 0xa3, 0x61, 0x75, 0xf5, 0x98, 0xb9, 0xc5,
0x58, 0x1f, 0x39, 0x91, 0xab, 0xad, 0xb1, 0x62, 0xb6, 0x54, 0xa8, 0xca, 0xc2, 0x2c, 0x1a, 0x93,
0x4d, 0x1d, 0x36, 0x02, 0xa7, 0x17, 0xa5, 0x97, 0x8f, 0x73, 0xb6, 0x76, 0xcb, 0xdc, 0x66, 0x4c,
0xa8, 0x38, 0x6a, 0xfb, 0x81, 0xb5, 0x9e, 0xc3, 0xd1, 0xca, 0xb4, 0x8c, 0x9c, 0xeb, 0x34, 0xb4,
0x17, 0x6a, 0x6b, 0x82, 0x83, 0x95, 0xa5, 0x69, 0x1a, 0xe3, 0x5e, 0xd8, 0xea, 0x5b, 0xb9, 0x62,
0xb6, 0x94, 0xaf, 0xb2, 0xcd, 0xed, 0xc6, 0x58, 0x4b, 0x6b, 0x2b, 0x5f, 0xcc, 0x94, 0x26, 0x67,
0x73, 0xe9, 0xff, 0xba, 0x4f, 0xeb, 0x6a, 0xba, 0x67, 0xee, 0x34, 0x0a, 0x51, 0x3b, 0xee, 0xd6,
0x3d, 0xe5, 0xb8, 0x56, 0xa1, 0x98, 0x29, 0x15, 0xaa, 0x27, 0x36, 0xd2, 0x6b, 0x7a, 0x81, 0x4e,
0x1c, 0xdd, 0xb7, 0x0c, 0xce, 0x56, 0x96, 0xe6, 0x2e, 0xc3, 0x18, 0xdd, 0xb8, 0x10, 0xb8, 0xd6,
0x24, 0x87, 0x6b, 0x76, 0xd2, 0x9f, 0x16, 0x68, 0x57, 0xab, 0x50, 0x1f, 0x71, 0xba, 0xda, 0xda,
0x50, 0xcc, 0x94, 0xcc, 0xea, 0xda, 0xad, 0xa9, 0x8a, 0x91, 0x1b, 0xbd, 0xac, 0xb9, 0xd9, 0xd8,
0xb4, 0x50, 0x39, 0x58, 0x99, 0x3f, 0x5a, 0xa9, 0x2d, 0xee, 0xad, 0x1e, 0x3e, 0x30, 0x5f, 0xc1,
0x3a, 0xd3, 0x30, 0x26, 0x6a, 0xd3, 0xb5, 0xe9, 0xda, 0x0c, 0x32, 0xab, 0x3d, 0x8b, 0xec, 0x6a,
0xef, 0xc6, 0xd8, 0xa8, 0x67, 0x6a, 0xd3, 0x18, 0x9f, 0x3a, 0xbe, 0xc1, 0xc8, 0xcf, 0x9d, 0x78,
0x6f, 0xac, 0xfc, 0xc5, 0xb9, 0x3d, 0x95, 0xfd, 0x0b, 0x7b, 0xf6, 0xef, 0xc5, 0x3a, 0x73, 0xc2,
0xc8, 0x6a, 0x0f, 0x99, 0x54, 0xa5, 0x90, 0xa5, 0x75, 0x8c, 0x51, 0x8d, 0x71, 0xda, 0xc2, 0x7a,
0xda, 0xc1, 0x04, 0xed, 0x22, 0x47, 0x3d, 0xe4, 0x69, 0x80, 0x02, 0x0d, 0x61, 0xd0, 0x04, 0x93,
0x74, 0x80, 0x0d, 0x74, 0x88, 0x93, 0x52, 0xeb, 0x0a, 0x1b, 0xa9, 0xc6, 0x26, 0x6a, 0x03, 0xb4,
0x8d, 0x93, 0xa9, 0x03, 0x93, 0x76, 0xb1, 0x99, 0x7a, 0xd8, 0x42, 0x7d, 0x6c, 0xa5, 0x01, 0xb6,
0xd1, 0x10, 0xa7, 0xa4, 0x36, 0x14, 0x2c, 0xaa, 0xb1, 0x9d, 0xb6, 0xb1, 0x83, 0xfa, 0x38, 0x95,
0x06, 0xd8, 0x49, 0x43, 0x9c, 0x46, 0x63, 0xec, 0xa2, 0x09, 0x4e, 0xa7, 0x03, 0x14, 0x53, 0x9b,
0x0a, 0x67, 0x50, 0x8d, 0x29, 0x9a, 0xe0, 0x4c, 0x3a, 0xc4, 0x59, 0x7c, 0x1f, 0x8d, 0xb3, 0xa9,
0x8b, 0x73, 0xa8, 0x8f, 0x73, 0x69, 0x88, 0x12, 0x8d, 0x70, 0x1e, 0x8d, 0x71, 0x7e, 0x6a, 0x4b,
0xe1, 0x02, 0xda, 0xc2, 0x85, 0xd4, 0xc1, 0x45, 0x74, 0x09, 0x65, 0xea, 0xe3, 0x62, 0x1a, 0x60,
0x9a, 0x0e, 0x30, 0x93, 0x6a, 0x2b, 0xcc, 0xd2, 0x26, 0x76, 0x53, 0x17, 0x97, 0x50, 0x0f, 0x97,
0xd2, 0x18, 0x97, 0xd1, 0x04, 0x97, 0xa7, 0xb6, 0x15, 0xae, 0xa0, 0x1a, 0x57, 0x52, 0x07, 0x57,
0x51, 0x1f, 0x57, 0xd3, 0x00, 0xd7, 0xd0, 0x08, 0xd7, 0xd2, 0x18, 0xd7, 0xd1, 0x01, 0xae, 0xa7,
0x43, 0xdc, 0x90, 0xea, 0x28, 0xec, 0xa1, 0x4d, 0xdc, 0x48, 0x35, 0x6e, 0xa2, 0x36, 0x6e, 0xa6,
0x0e, 0xf6, 0xd2, 0x0e, 0xf6, 0x51, 0x1f, 0xfb, 0x69, 0x88, 0x5b, 0x68, 0x84, 0x03, 0x34, 0xc6,
0xad, 0xa9, 0x4b, 0x0a, 0x07, 0x69, 0x82, 0xb9, 0xd4, 0x8e, 0xc2, 0x21, 0x6a, 0xa3, 0x42, 0x1d,
0xcc, 0xd3, 0x25, 0xdc, 0x46, 0x3b, 0xb8, 0x9d, 0xba, 0xa8, 0xd2, 0x2e, 0x0e, 0x53, 0x0f, 0x47,
0xa8, 0x8f, 0x05, 0x1a, 0x60, 0x91, 0x86, 0x38, 0x4a, 0x63, 0xdc, 0x41, 0x13, 0xdc, 0x49, 0xfb,
0xb8, 0x8b, 0x0e, 0x70, 0x77, 0xaa, 0xab, 0x70, 0x0f, 0xad, 0xe3, 0x5e, 0x6a, 0xe3, 0x3e, 0xea,
0xa0, 0x46, 0x3d, 0xdc, 0x4f, 0x7d, 0x28, 0x1a, 0xa1, 0x4e, 0x63, 0x34, 0x68, 0x82, 0x66, 0x6a,
0xd7, 0x86, 0xa6, 0x6d, 0xb4, 0xa8, 0x03, 0x9b, 0x76, 0xd0, 0xa6, 0x2e, 0x1c, 0xea, 0x61, 0x89,
0x06, 0xe8, 0xd0, 0x10, 0x2e, 0x8d, 0xd0, 0xa5, 0x03, 0x78, 0xa9, 0x9e, 0x82, 0x4f, 0xeb, 0xe8,
0xd1, 0x26, 0x96, 0xa9, 0x46, 0x40, 0x6d, 0x84, 0xd4, 0x45, 0x44, 0x3d, 0xc4, 0xd4, 0x47, 0x42,
0x03, 0xf4, 0x69, 0x82, 0x63, 0x74, 0x80, 0x41, 0xaa, 0xdf, 0xc0, 0x90, 0x2e, 0xe1, 0x01, 0xda,
0xc5, 0x83, 0x34, 0xc0, 0x43, 0x34, 0xc4, 0xc3, 0xa9, 0x3d, 0x85, 0x47, 0xcc, 0x9c, 0x91, 0xed,
0x39, 0x78, 0x34, 0xc3, 0x70, 0xf1, 0x98, 0x44, 0x88, 0xc7, 0x25, 0x22, 0x3c, 0xc1, 0x58, 0x8e,
0xf1, 0x24, 0x23, 0xe8, 0xe2, 0x29, 0x09, 0x0f, 0x4f, 0x4b, 0xf8, 0x78, 0x46, 0x22, 0xc6, 0xb3,
0x12, 0x7d, 0x3c, 0xc7, 0x08, 0x15, 0x9e, 0x97, 0x68, 0xe0, 0x05, 0x89, 0x26, 0x5e, 0x94, 0xd0,
0x78, 0x49, 0xc2, 0xc6, 0xcb, 0x12, 0x0e, 0x5e, 0x91, 0xe8, 0xe0, 0x55, 0x09, 0x17, 0xaf, 0x49,
0x74, 0xf1, 0xba, 0x84, 0x87, 0x37, 0x24, 0x7c, 0xbc, 0x29, 0xb1, 0x8c, 0xb7, 0x24, 0x02, 0xbc,
0x2d, 0x11, 0xe2, 0x1d, 0x89, 0x08, 0xef, 0x4a, 0xc4, 0x38, 0x2e, 0x91, 0xe0, 0x3d, 0x89, 0x3e,
0xde, 0x67, 0x44, 0x0a, 0x1f, 0x48, 0x68, 0x7c, 0x28, 0x61, 0xe3, 0x23, 0x89, 0x36, 0x3e, 0x96,
0x70, 0xf0, 0x89, 0x44, 0x07, 0x9f, 0x4a, 0xb8, 0xf8, 0x4c, 0xc2, 0xc3, 0xe7, 0x12, 0x3e, 0xbe,
0x90, 0x08, 0xf0, 0xa5, 0x44, 0x88, 0xaf, 0x24, 0x22, 0x7c, 0x2d, 0xd1, 0xc7, 0x37, 0x12, 0x03,
0x7c, 0xcb, 0x88, 0x6d, 0x7c, 0x27, 0xd1, 0xc1, 0xf7, 0x12, 0x01, 0x7e, 0x90, 0x18, 0xe2, 0x47,
0x46, 0xa2, 0xf1, 0x93, 0x84, 0x83, 0x9f, 0x25, 0x7c, 0xfc, 0xc2, 0xe8, 0x2b, 0xfc, 0x2a, 0xe1,
0xe3, 0x37, 0xc6, 0xb1, 0x36, 0x7e, 0x67, 0x0c, 0x1c, 0xfc, 0x21, 0xe1, 0xe3, 0x4f, 0xc6, 0x50,
0xe1, 0x2f, 0x89, 0x36, 0xfe, 0x96, 0x88, 0xf1, 0x4f, 0xe6, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff,
0xc0, 0x79, 0xbe, 0x78, 0x0e, 0x08, 0x00, 0x00,
// 966 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0xd0, 0xe7, 0x7a, 0x1a, 0x47,
0x1b, 0xc6, 0x71, 0x83, 0x64, 0x01, 0x2b, 0xbf, 0xf6, 0xfd, 0xae, 0x4b, 0xd6, 0x8e, 0xe3, 0x10,
0xa5, 0x91, 0x46, 0x24, 0x39, 0xbd, 0x3b, 0x89, 0xac, 0x38, 0x96, 0x51, 0x82, 0x23, 0x39, 0x9d,
0x0c, 0x30, 0x2c, 0x2b, 0x96, 0x5d, 0xb4, 0x0d, 0x43, 0x7a, 0xef, 0xbd, 0x3a, 0xbd, 0xf7, 0xde,
0x8f, 0x21, 0x47, 0x95, 0x6b, 0xef, 0x07, 0xc9, 0xce, 0xa7, 0xdf, 0x7f, 0xe6, 0x99, 0x65, 0xb8,
0xc6, 0xd8, 0xdc, 0xd5, 0x91, 0x6a, 0xaa, 0x48, 0x95, 0x7b, 0x81, 0x1f, 0xf9, 0x66, 0xb6, 0x57,
0xdf, 0x55, 0x68, 0x69, 0x2d, 0xcb, 0xa9, 0x7f, 0xb6, 0x18, 0xf9, 0x43, 0xa3, 0x13, 0x66, 0xd9,
0xc8, 0x25, 0x3a, 0x08, 0x1d, 0xdf, 0xb3, 0x32, 0xc5, 0x6c, 0x69, 0xf3, 0xec, 0xb6, 0x72, 0xaf,
0x5e, 0x5e, 0x1b, 0x97, 0x97, 0x65, 0x56, 0x5d, 0x3b, 0x64, 0xce, 0x18, 0x79, 0x57, 0x79, 0x76,
0xac, 0x6c, 0x6d, 0x65, 0xf9, 0xc1, 0xf6, 0xff, 0x7c, 0xb0, 0x30, 0x1a, 0x56, 0xd7, 0x8f, 0x99,
0xdb, 0x8c, 0x8d, 0x91, 0x13, 0xb9, 0xda, 0x1a, 0x2b, 0x66, 0x4b, 0x85, 0xaa, 0x2c, 0xcc, 0xa2,
0x31, 0xd9, 0xd4, 0x61, 0x23, 0x70, 0x7a, 0x51, 0x7a, 0xf9, 0x38, 0x67, 0x27, 0x6e, 0x99, 0x3b,
0x8c, 0x09, 0x15, 0x47, 0x6d, 0x3f, 0xb0, 0x36, 0x72, 0x38, 0x5a, 0x99, 0x96, 0x91, 0x73, 0x9d,
0x86, 0xf6, 0x42, 0x6d, 0x4d, 0x70, 0xb0, 0xb6, 0x34, 0x4d, 0x63, 0xdc, 0x0b, 0x5b, 0x7d, 0x2b,
0x57, 0xcc, 0x96, 0xf2, 0x55, 0xb6, 0xb9, 0xd3, 0x18, 0x6b, 0x69, 0x6d, 0xe5, 0x8b, 0x99, 0xd2,
0xe4, 0x6c, 0x2e, 0xfd, 0xaf, 0xfb, 0xb5, 0xae, 0xa6, 0x7b, 0xe6, 0x6e, 0xa3, 0x10, 0xb5, 0xe3,
0x6e, 0xdd, 0x53, 0x8e, 0x6b, 0x15, 0x8a, 0x99, 0x52, 0xa1, 0x7a, 0x7c, 0x23, 0xbd, 0xa6, 0x17,
0xe8, 0xc4, 0xd1, 0x7d, 0xcb, 0xe0, 0x6c, 0x6d, 0x69, 0xee, 0x31, 0x8c, 0xd1, 0x8d, 0x4b, 0x81,
0x6b, 0x4d, 0x72, 0x78, 0xc2, 0xce, 0x54, 0xc5, 0xc8, 0x8d, 0xde, 0xcd, 0xdc, 0x6a, 0x6c, 0x59,
0xaa, 0x1c, 0xac, 0x2c, 0x1e, 0xa9, 0xd4, 0x96, 0xe7, 0xaa, 0x87, 0x0f, 0x2c, 0x56, 0xb0, 0xc1,
0x34, 0x8c, 0x89, 0xda, 0x74, 0x6d, 0xba, 0x36, 0x83, 0xcc, 0x7a, 0xcf, 0x22, 0xbb, 0xde, 0x7b,
0x31, 0x36, 0xea, 0x99, 0xda, 0x34, 0xc6, 0xa7, 0x8e, 0x6d, 0x32, 0xf2, 0x0b, 0xc7, 0x5f, 0x13,
0x6b, 0xbf, 0xb8, 0xb0, 0xaf, 0x32, 0xbf, 0xb4, 0x6f, 0x7e, 0x0e, 0x1b, 0xcc, 0x09, 0x23, 0xab,
0x3d, 0x64, 0x52, 0x95, 0x42, 0x96, 0xd6, 0x31, 0x46, 0x35, 0xc6, 0x69, 0x0b, 0x1b, 0x69, 0x07,
0x13, 0xb4, 0x8b, 0x1c, 0xf5, 0x90, 0xa7, 0x01, 0x0a, 0x34, 0x84, 0x41, 0x13, 0x4c, 0xd2, 0x01,
0x36, 0xd1, 0x21, 0xfe, 0x97, 0x5a, 0x57, 0xd8, 0x4c, 0x35, 0xb6, 0x50, 0x1b, 0xa0, 0x6d, 0xfc,
0x9f, 0x3a, 0x30, 0x69, 0x17, 0x5b, 0xa9, 0x87, 0x6d, 0xd4, 0xc7, 0x76, 0x1a, 0x60, 0x07, 0x0d,
0x71, 0x52, 0x6a, 0x43, 0xc1, 0xa2, 0x1a, 0x3b, 0x69, 0x1b, 0xbb, 0xa8, 0x8f, 0x93, 0x69, 0x80,
0xdd, 0x34, 0xc4, 0x29, 0x34, 0xc6, 0x1e, 0x9a, 0xe0, 0x54, 0x3a, 0x40, 0x31, 0xb5, 0xa9, 0x70,
0x1a, 0xd5, 0x98, 0xa2, 0x09, 0x4e, 0xa7, 0x43, 0x9c, 0xc1, 0xf7, 0xd1, 0x38, 0x93, 0xba, 0x38,
0x8b, 0xfa, 0x38, 0x9b, 0x86, 0x28, 0xd1, 0x08, 0xe7, 0xd0, 0x18, 0xe7, 0xa6, 0xb6, 0x14, 0xce,
0xa3, 0x2d, 0x9c, 0x4f, 0x1d, 0x5c, 0x40, 0x57, 0x50, 0xa6, 0x3e, 0x2e, 0xa4, 0x01, 0xa6, 0xe9,
0x00, 0x33, 0xa9, 0xb6, 0xc2, 0x2c, 0x6d, 0x62, 0x2f, 0x75, 0x71, 0x11, 0xf5, 0x70, 0x31, 0x8d,
0x71, 0x09, 0x4d, 0x70, 0x69, 0x6a, 0x5b, 0xe1, 0x32, 0xaa, 0x71, 0x39, 0x75, 0x70, 0x05, 0xf5,
0x71, 0x25, 0x0d, 0x70, 0x15, 0x8d, 0x70, 0x35, 0x8d, 0x71, 0x0d, 0x1d, 0xe0, 0x5a, 0x3a, 0xc4,
0x75, 0xa9, 0x8e, 0xc2, 0x3e, 0xda, 0xc4, 0xf5, 0x54, 0xe3, 0x06, 0x6a, 0xe3, 0x46, 0xea, 0x60,
0x8e, 0x76, 0xb0, 0x9f, 0xfa, 0x98, 0xa7, 0x21, 0x6e, 0xa2, 0x11, 0x0e, 0xd0, 0x18, 0x37, 0xa7,
0xae, 0x28, 0x1c, 0xa4, 0x09, 0x16, 0x52, 0x3b, 0x0a, 0x87, 0xa8, 0x8d, 0x0a, 0x75, 0xb0, 0x48,
0x57, 0x70, 0x0b, 0xed, 0xe0, 0x56, 0xea, 0xa2, 0x4a, 0xbb, 0x38, 0x4c, 0x3d, 0xdc, 0x46, 0x7d,
0x2c, 0xd1, 0x00, 0xcb, 0x34, 0xc4, 0x11, 0x1a, 0xe3, 0x76, 0x9a, 0xe0, 0x0e, 0xda, 0xc7, 0x9d,
0x74, 0x80, 0xbb, 0x52, 0x5d, 0x85, 0xbb, 0x69, 0x1d, 0xf7, 0x50, 0x1b, 0xf7, 0x52, 0x07, 0x35,
0xea, 0xe1, 0x3e, 0xea, 0x43, 0xd1, 0x08, 0x75, 0x1a, 0xa3, 0x41, 0x13, 0x34, 0x53, 0xbb, 0x36,
0x34, 0x6d, 0xa3, 0x45, 0x1d, 0xd8, 0xb4, 0x83, 0x36, 0x75, 0xe1, 0x50, 0x0f, 0x2b, 0x34, 0x40,
0x87, 0x86, 0x70, 0x69, 0x84, 0x2e, 0x1d, 0xc0, 0x4b, 0xf5, 0x14, 0x7c, 0x5a, 0x47, 0x8f, 0x36,
0xb1, 0x4a, 0x35, 0x02, 0x6a, 0x23, 0xa4, 0x2e, 0x22, 0xea, 0x21, 0xa6, 0x3e, 0x12, 0x1a, 0xa0,
0x4f, 0x13, 0x1c, 0xa5, 0x03, 0x0c, 0x52, 0xfd, 0x06, 0x86, 0x74, 0x05, 0xf7, 0xd3, 0x2e, 0x1e,
0xa0, 0x01, 0x1e, 0xa4, 0x21, 0x1e, 0x4a, 0xed, 0x29, 0x3c, 0x6c, 0xe6, 0x8c, 0x6c, 0xcf, 0xc1,
0x23, 0x19, 0x86, 0x8b, 0x47, 0x25, 0x42, 0x3c, 0x26, 0x11, 0xe1, 0x71, 0xc6, 0x6a, 0x8c, 0x27,
0x18, 0x41, 0x17, 0x4f, 0x4a, 0x78, 0x78, 0x4a, 0xc2, 0xc7, 0xd3, 0x12, 0x31, 0x9e, 0x91, 0xe8,
0xe3, 0x59, 0x46, 0xa8, 0xf0, 0x9c, 0x44, 0x03, 0xcf, 0x4b, 0x34, 0xf1, 0x82, 0x84, 0xc6, 0x8b,
0x12, 0x36, 0x5e, 0x92, 0x70, 0xf0, 0xb2, 0x44, 0x07, 0xaf, 0x48, 0xb8, 0x78, 0x55, 0xa2, 0x8b,
0xd7, 0x24, 0x3c, 0xbc, 0x2e, 0xe1, 0xe3, 0x0d, 0x89, 0x55, 0xbc, 0x29, 0x11, 0xe0, 0x2d, 0x89,
0x10, 0x6f, 0x4b, 0x44, 0x78, 0x47, 0x22, 0xc6, 0x31, 0x89, 0x04, 0xef, 0x4a, 0xf4, 0xf1, 0x1e,
0x23, 0x52, 0x78, 0x5f, 0x42, 0xe3, 0x03, 0x09, 0x1b, 0x1f, 0x4a, 0xb4, 0xf1, 0x91, 0x84, 0x83,
0x8f, 0x25, 0x3a, 0xf8, 0x44, 0xc2, 0xc5, 0xa7, 0x12, 0x1e, 0x3e, 0x93, 0xf0, 0xf1, 0xb9, 0x44,
0x80, 0x2f, 0x24, 0x42, 0x7c, 0x29, 0x11, 0xe1, 0x2b, 0x89, 0x3e, 0xbe, 0x96, 0x18, 0xe0, 0x1b,
0x46, 0x6c, 0xe3, 0x5b, 0x89, 0x0e, 0xbe, 0x93, 0x08, 0xf0, 0xbd, 0xc4, 0x10, 0x3f, 0x30, 0x12,
0x8d, 0x1f, 0x25, 0x1c, 0xfc, 0x24, 0xe1, 0xe3, 0x67, 0x46, 0x5f, 0xe1, 0x17, 0x09, 0x1f, 0xbf,
0x32, 0x8e, 0xb6, 0xf1, 0x1b, 0x63, 0xe0, 0xe0, 0x77, 0x09, 0x1f, 0x7f, 0x30, 0x86, 0x0a, 0x7f,
0x4a, 0xb4, 0xf1, 0x97, 0x44, 0x8c, 0xbf, 0x33, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x66,
0xd9, 0x2b, 0xec, 0x07, 0x00, 0x00,
}
+1 -42
View File
@@ -72,8 +72,7 @@ proto.pb.Metadata.toObject = function(includeInstance, msg) {
fee: (f = msg.getFee()) && fee_pb.Fee.toObject(includeInstance, f),
thumbnail: jspb.Message.getField(msg, 9),
preview: jspb.Message.getField(msg, 10),
licenseurl: jspb.Message.getField(msg, 11),
releasetime: jspb.Message.getField(msg, 12)
licenseurl: jspb.Message.getField(msg, 11)
};
if (includeInstance) {
@@ -155,10 +154,6 @@ proto.pb.Metadata.deserializeBinaryFromReader = function(msg, reader) {
var value = /** @type {string} */ (reader.readString());
msg.setLicenseurl(value);
break;
case 12:
var value = /** @type {number} */ (reader.readSint64());
msg.setReleasetime(value);
break;
default:
reader.skipField();
break;
@@ -266,13 +261,6 @@ proto.pb.Metadata.serializeBinaryToWriter = function(message, writer) {
f
);
}
f = /** @type {number} */ (jspb.Message.getField(message, 12));
if (f != null) {
writer.writeSint64(
12,
f
);
}
};
@@ -800,33 +788,4 @@ proto.pb.Metadata.prototype.hasLicenseurl = function() {
};
/**
* optional sint64 releaseTime = 12;
* @return {number}
*/
proto.pb.Metadata.prototype.getReleasetime = function() {
return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 12, 0));
};
/** @param {number} value */
proto.pb.Metadata.prototype.setReleasetime = function(value) {
jspb.Message.setField(this, 12, value);
};
proto.pb.Metadata.prototype.clearReleasetime = function() {
jspb.Message.setField(this, 12, undefined);
};
/**
* Returns whether this field is set.
* @return {!boolean}
*/
proto.pb.Metadata.prototype.hasReleasetime = function() {
return jspb.Message.getField(this, 12) != null;
};
goog.object.extend(exports, proto.pb);
-20
View File
@@ -1,20 +0,0 @@
syntax = "proto2";
package pb;
enum KeyType {
UNKNOWN_PUBLIC_KEY_TYPE = 0;
NIST256p = 1;
NIST384p = 2;
SECP256k1 = 3;
}
message Certificate {
enum Version {
UNKNOWN_VERSION = 0;
_0_0_1 = 1;
}
required Version version = 1;
required KeyType keyType = 2;
required bytes publicKey = 4;
}
+11
View File
@@ -0,0 +1,11 @@
syntax = "proto3";
package pb;
message Channel {
bytes public_key = 1;
string name = 2;
string description = 3;
string thumbnail_url = 4; // url or claim ID?
string cover_url = 5; // url or claim ID?
}
+9 -16
View File
@@ -1,24 +1,17 @@
syntax = "proto2";
syntax = "proto3";
package pb;
import "stream.proto";
import "certificate.proto";
import "signature.proto";
import "channel.proto";
message Claim {
enum Version {
UNKNOWN_VERSION = 0;
_0_0_1 = 1;
enum Type {
STREAM = 0;
CHANNEL = 1;
}
required Version version = 1;
enum ClaimType {
UNKNOWN_CLAIM_TYPE = 0;
streamType = 1;
certificateType = 2;
}
required ClaimType claimType = 2;
optional Stream stream = 3;
optional Certificate certificate = 4;
optional Signature publisherSignature = 5;
Type type = 1; // do we need this?
Stream stream = 2;
Channel channel = 3;
}
+8 -13
View File
@@ -1,20 +1,15 @@
syntax = "proto2";
syntax = "proto3";
package pb;
message Fee {
enum Version {
UNKNOWN_VERSION = 0;
_0_0_1 = 1;
}
enum Currency {
UNKNOWN_CURRENCY = 0;
LBC = 1;
BTC = 2;
USD = 3;
LBC = 0;
BTC = 1;
USD = 2;
}
required Version version = 1;
required Currency currency = 2;
required bytes address = 3;
required float amount = 4;
Currency currency = 1;
bytes address = 2;
float amount = 3;
}
+8
View File
@@ -0,0 +1,8 @@
syntax = "proto3";
package pb;
message File {
string name = 1;
uint64 size = 2;
}
-215
View File
@@ -1,215 +0,0 @@
syntax = "proto2";
package pb;
import "fee.proto";
message Metadata {
enum Version {
UNKNOWN_VERSION = 0;
_0_0_1 = 1;
_0_0_2 = 2;
_0_0_3 = 3;
_0_1_0 = 4;
}
enum Language {
UNKNOWN_LANGUAGE = 0;
en = 1;
aa = 2;
ab = 3;
ae = 4;
af = 5;
ak = 6;
am = 7;
an = 8;
ar = 9;
as = 10;
av = 11;
ay = 12;
az = 13;
ba = 14;
be = 15;
bg = 16;
bh = 17;
bi = 18;
bm = 19;
bn = 20;
bo = 21;
br = 22;
bs = 23;
ca = 24;
ce = 25;
ch = 26;
co = 27;
cr = 28;
cs = 29;
cu = 30;
cv = 31;
cy = 32;
da = 33;
de = 34;
dv = 35;
dz = 36;
ee = 37;
el = 38;
eo = 39;
es = 40;
et = 41;
eu = 42;
fa = 43;
ff = 44;
fi = 45;
fj = 46;
fo = 47;
fr = 48;
fy = 49;
ga = 50;
gd = 51;
gl = 52;
gn = 53;
gu = 54;
gv = 55;
ha = 56;
he = 57;
hi = 58;
ho = 59;
hr = 60;
ht = 61;
hu = 62;
hy = 63;
hz = 64;
ia = 65;
id = 66;
ie = 67;
ig = 68;
ii = 69;
ik = 70;
io = 71;
is = 72;
it = 73;
iu = 74;
ja = 75;
jv = 76;
ka = 77;
kg = 78;
ki = 79;
kj = 80;
kk = 81;
kl = 82;
km = 83;
kn = 84;
ko = 85;
kr = 86;
ks = 87;
ku = 88;
kv = 89;
kw = 90;
ky = 91;
la = 92;
lb = 93;
lg = 94;
li = 95;
ln = 96;
lo = 97;
lt = 98;
lu = 99;
lv = 100;
mg = 101;
mh = 102;
mi = 103;
mk = 104;
ml = 105;
mn = 106;
mr = 107;
ms = 108;
mt = 109;
my = 110;
na = 111;
nb = 112;
nd = 113;
ne = 114;
ng = 115;
nl = 116;
nn = 117;
no = 118;
nr = 119;
nv = 120;
ny = 121;
oc = 122;
oj = 123;
om = 124;
or = 125;
os = 126;
pa = 127;
pi = 128;
pl = 129;
ps = 130;
pt = 131;
qu = 132;
rm = 133;
rn = 134;
ro = 135;
ru = 136;
rw = 137;
sa = 138;
sc = 139;
sd = 140;
se = 141;
sg = 142;
si = 143;
sk = 144;
sl = 145;
sm = 146;
sn = 147;
so = 148;
sq = 149;
sr = 150;
ss = 151;
st = 152;
su = 153;
sv = 154;
sw = 155;
ta = 156;
te = 157;
tg = 158;
th = 159;
ti = 160;
tk = 161;
tl = 162;
tn = 163;
to = 164;
tr = 165;
ts = 166;
tt = 167;
tw = 168;
ty = 169;
ug = 170;
uk = 171;
ur = 172;
uz = 173;
ve = 174;
vi = 175;
vo = 176;
wa = 177;
wo = 178;
xh = 179;
yi = 180;
yo = 181;
za = 182;
zh = 183;
zu = 184;
}
required Version version = 1;
required Language language = 2;
required string title = 3;
required string description = 4;
required string author = 5;
required string license = 6;
required bool nsfw = 7;
optional Fee fee = 8;
optional string thumbnail = 9;
optional string preview = 10;
optional string licenseUrl = 11;
optional sint64 releaseTime = 12;
}
-16
View File
@@ -1,16 +0,0 @@
syntax = "proto2";
package pb;
import "certificate.proto";
message Signature {
enum Version {
UNKNOWN_VERSION = 0;
_0_0_1 = 1;
}
required Version version = 1;
required KeyType signatureType = 2;
required bytes signature = 3;
required bytes certificateId = 4;
}
-18
View File
@@ -1,18 +0,0 @@
syntax = "proto2";
package pb;
message Source {
enum Version {
UNKNOWN_VERSION = 0;
_0_0_1 = 1;
}
required Version version = 1;
enum SourceTypes {
UNKNOWN_SOURCE_TYPE = 0;
lbry_sd_hash = 1;
}
required SourceTypes sourceType = 2;
required bytes source = 3;
required string contentType = 4;
}
+18 -11
View File
@@ -1,17 +1,24 @@
syntax = "proto2";
syntax = "proto3";
package pb;
import "metadata.proto";
import "source.proto";
import "fee.proto";
import "file.proto";
message Stream {
enum Version {
UNKNOWN_VERSION = 0;
_0_0_1 = 1;
}
required Version version = 1;
required Metadata metadata = 2;
required Source source = 3;
bytes hash = 1;
string language = 2;
string title = 3;
string author = 4;
string description = 5;
string media_type = 6;
string license = 7;
File file = 8;
Fee fee = 16;
string license_url = 17;
string thumbnail_url = 18;
uint32 duration = 19;
repeated string tags = 20;
int64 release_time = 21; // seconds since UNIX epoch
}
+13 -13
View File
@@ -8,6 +8,7 @@ from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf import descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
@@ -19,7 +20,6 @@ DESCRIPTOR = _descriptor.FileDescriptor(
name='certificate.proto',
package='pb',
syntax='proto2',
serialized_options=None,
serialized_pb=_b('\n\x11\x63\x65rtificate.proto\x12\x02pb\"\x94\x01\n\x0b\x43\x65rtificate\x12(\n\x07version\x18\x01 \x02(\x0e\x32\x17.pb.Certificate.Version\x12\x1c\n\x07keyType\x18\x02 \x02(\x0e\x32\x0b.pb.KeyType\x12\x11\n\tpublicKey\x18\x04 \x02(\x0c\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01*Q\n\x07KeyType\x12\x1b\n\x17UNKNOWN_PUBLIC_KEY_TYPE\x10\x00\x12\x0c\n\x08NIST256p\x10\x01\x12\x0c\n\x08NIST384p\x10\x02\x12\r\n\tSECP256k1\x10\x03')
)
@@ -31,23 +31,23 @@ _KEYTYPE = _descriptor.EnumDescriptor(
values=[
_descriptor.EnumValueDescriptor(
name='UNKNOWN_PUBLIC_KEY_TYPE', index=0, number=0,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='NIST256p', index=1, number=1,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='NIST384p', index=2, number=2,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='SECP256k1', index=3, number=3,
serialized_options=None,
options=None,
type=None),
],
containing_type=None,
serialized_options=None,
options=None,
serialized_start=176,
serialized_end=257,
)
@@ -68,15 +68,15 @@ _CERTIFICATE_VERSION = _descriptor.EnumDescriptor(
values=[
_descriptor.EnumValueDescriptor(
name='UNKNOWN_VERSION', index=0, number=0,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='_0_0_1', index=1, number=1,
serialized_options=None,
options=None,
type=None),
],
containing_type=None,
serialized_options=None,
options=None,
serialized_start=132,
serialized_end=174,
)
@@ -96,21 +96,21 @@ _CERTIFICATE = _descriptor.Descriptor(
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='keyType', full_name='pb.Certificate.keyType', index=1,
number=2, type=14, cpp_type=8, label=2,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='publicKey', full_name='pb.Certificate.publicKey', index=2,
number=4, type=12, cpp_type=9, label=2,
has_default_value=False, default_value=_b(""),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -118,7 +118,7 @@ _CERTIFICATE = _descriptor.Descriptor(
enum_types=[
_CERTIFICATE_VERSION,
],
serialized_options=None,
options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
+14 -14
View File
@@ -7,6 +7,7 @@ from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf import descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
@@ -21,7 +22,6 @@ DESCRIPTOR = _descriptor.FileDescriptor(
name='claim.proto',
package='pb',
syntax='proto2',
serialized_options=None,
serialized_pb=_b('\n\x0b\x63laim.proto\x12\x02pb\x1a\x0cstream.proto\x1a\x11\x63\x65rtificate.proto\x1a\x0fsignature.proto\"\xb6\x02\n\x05\x43laim\x12\"\n\x07version\x18\x01 \x02(\x0e\x32\x11.pb.Claim.Version\x12&\n\tclaimType\x18\x02 \x02(\x0e\x32\x13.pb.Claim.ClaimType\x12\x1a\n\x06stream\x18\x03 \x01(\x0b\x32\n.pb.Stream\x12$\n\x0b\x63\x65rtificate\x18\x04 \x01(\x0b\x32\x0f.pb.Certificate\x12)\n\x12publisherSignature\x18\x05 \x01(\x0b\x32\r.pb.Signature\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\"H\n\tClaimType\x12\x16\n\x12UNKNOWN_CLAIM_TYPE\x10\x00\x12\x0e\n\nstreamType\x10\x01\x12\x13\n\x0f\x63\x65rtificateType\x10\x02')
,
dependencies=[stream__pb2.DESCRIPTOR,certificate__pb2.DESCRIPTOR,signature__pb2.DESCRIPTOR,])
@@ -36,15 +36,15 @@ _CLAIM_VERSION = _descriptor.EnumDescriptor(
values=[
_descriptor.EnumValueDescriptor(
name='UNKNOWN_VERSION', index=0, number=0,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='_0_0_1', index=1, number=1,
serialized_options=None,
options=None,
type=None),
],
containing_type=None,
serialized_options=None,
options=None,
serialized_start=264,
serialized_end=306,
)
@@ -58,19 +58,19 @@ _CLAIM_CLAIMTYPE = _descriptor.EnumDescriptor(
values=[
_descriptor.EnumValueDescriptor(
name='UNKNOWN_CLAIM_TYPE', index=0, number=0,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='streamType', index=1, number=1,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='certificateType', index=2, number=2,
serialized_options=None,
options=None,
type=None),
],
containing_type=None,
serialized_options=None,
options=None,
serialized_start=308,
serialized_end=380,
)
@@ -90,35 +90,35 @@ _CLAIM = _descriptor.Descriptor(
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='claimType', full_name='pb.Claim.claimType', index=1,
number=2, type=14, cpp_type=8, label=2,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='stream', full_name='pb.Claim.stream', index=2,
number=3, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='certificate', full_name='pb.Claim.certificate', index=3,
number=4, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='publisherSignature', full_name='pb.Claim.publisherSignature', index=4,
number=5, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -127,7 +127,7 @@ _CLAIM = _descriptor.Descriptor(
_CLAIM_VERSION,
_CLAIM_CLAIMTYPE,
],
serialized_options=None,
options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
+14 -14
View File
@@ -7,6 +7,7 @@ from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf import descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
@@ -18,7 +19,6 @@ DESCRIPTOR = _descriptor.FileDescriptor(
name='fee.proto',
package='pb',
syntax='proto2',
serialized_options=None,
serialized_pb=_b('\n\tfee.proto\x12\x02pb\"\xd5\x01\n\x03\x46\x65\x65\x12 \n\x07version\x18\x01 \x02(\x0e\x32\x0f.pb.Fee.Version\x12\"\n\x08\x63urrency\x18\x02 \x02(\x0e\x32\x10.pb.Fee.Currency\x12\x0f\n\x07\x61\x64\x64ress\x18\x03 \x02(\x0c\x12\x0e\n\x06\x61mount\x18\x04 \x02(\x02\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\";\n\x08\x43urrency\x12\x14\n\x10UNKNOWN_CURRENCY\x10\x00\x12\x07\n\x03LBC\x10\x01\x12\x07\n\x03\x42TC\x10\x02\x12\x07\n\x03USD\x10\x03')
)
@@ -32,15 +32,15 @@ _FEE_VERSION = _descriptor.EnumDescriptor(
values=[
_descriptor.EnumValueDescriptor(
name='UNKNOWN_VERSION', index=0, number=0,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='_0_0_1', index=1, number=1,
serialized_options=None,
options=None,
type=None),
],
containing_type=None,
serialized_options=None,
options=None,
serialized_start=128,
serialized_end=170,
)
@@ -54,23 +54,23 @@ _FEE_CURRENCY = _descriptor.EnumDescriptor(
values=[
_descriptor.EnumValueDescriptor(
name='UNKNOWN_CURRENCY', index=0, number=0,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='LBC', index=1, number=1,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='BTC', index=2, number=2,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='USD', index=3, number=3,
serialized_options=None,
options=None,
type=None),
],
containing_type=None,
serialized_options=None,
options=None,
serialized_start=172,
serialized_end=231,
)
@@ -90,28 +90,28 @@ _FEE = _descriptor.Descriptor(
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='currency', full_name='pb.Fee.currency', index=1,
number=2, type=14, cpp_type=8, label=2,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='address', full_name='pb.Fee.address', index=2,
number=3, type=12, cpp_type=9, label=2,
has_default_value=False, default_value=_b(""),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='amount', full_name='pb.Fee.amount', index=3,
number=4, type=2, cpp_type=6, label=2,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -120,7 +120,7 @@ _FEE = _descriptor.Descriptor(
_FEE_VERSION,
_FEE_CURRENCY,
],
serialized_options=None,
options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
+211 -218
View File
File diff suppressed because it is too large. Load diff
+9 -9
View File
@@ -7,6 +7,7 @@ from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf import descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
@@ -19,7 +20,6 @@ DESCRIPTOR = _descriptor.FileDescriptor(
name='signature.proto',
package='pb',
syntax='proto2',
serialized_options=None,
serialized_pb=_b('\n\x0fsignature.proto\x12\x02pb\x1a\x11\x63\x65rtificate.proto\"\xad\x01\n\tSignature\x12&\n\x07version\x18\x01 \x02(\x0e\x32\x15.pb.Signature.Version\x12\"\n\rsignatureType\x18\x02 \x02(\x0e\x32\x0b.pb.KeyType\x12\x11\n\tsignature\x18\x03 \x02(\x0c\x12\x15\n\rcertificateId\x18\x04 \x02(\x0c\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01')
,
dependencies=[certificate__pb2.DESCRIPTOR,])
@@ -34,15 +34,15 @@ _SIGNATURE_VERSION = _descriptor.EnumDescriptor(
values=[
_descriptor.EnumValueDescriptor(
name='UNKNOWN_VERSION', index=0, number=0,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='_0_0_1', index=1, number=1,
serialized_options=None,
options=None,
type=None),
],
containing_type=None,
serialized_options=None,
options=None,
serialized_start=174,
serialized_end=216,
)
@@ -62,28 +62,28 @@ _SIGNATURE = _descriptor.Descriptor(
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='signatureType', full_name='pb.Signature.signatureType', index=1,
number=2, type=14, cpp_type=8, label=2,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='signature', full_name='pb.Signature.signature', index=2,
number=3, type=12, cpp_type=9, label=2,
has_default_value=False, default_value=_b(""),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='certificateId', full_name='pb.Signature.certificateId', index=3,
number=4, type=12, cpp_type=9, label=2,
has_default_value=False, default_value=_b(""),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -91,7 +91,7 @@ _SIGNATURE = _descriptor.Descriptor(
enum_types=[
_SIGNATURE_VERSION,
],
serialized_options=None,
options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
+12 -12
View File
@@ -7,6 +7,7 @@ from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf import descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
@@ -18,7 +19,6 @@ DESCRIPTOR = _descriptor.FileDescriptor(
name='source.proto',
package='pb',
syntax='proto2',
serialized_options=None,
serialized_pb=_b('\n\x0csource.proto\x12\x02pb\"\xe4\x01\n\x06Source\x12#\n\x07version\x18\x01 \x02(\x0e\x32\x12.pb.Source.Version\x12*\n\nsourceType\x18\x02 \x02(\x0e\x32\x16.pb.Source.SourceTypes\x12\x0e\n\x06source\x18\x03 \x02(\x0c\x12\x13\n\x0b\x63ontentType\x18\x04 \x02(\t\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\"8\n\x0bSourceTypes\x12\x17\n\x13UNKNOWN_SOURCE_TYPE\x10\x00\x12\x10\n\x0clbry_sd_hash\x10\x01')
)
@@ -32,15 +32,15 @@ _SOURCE_VERSION = _descriptor.EnumDescriptor(
values=[
_descriptor.EnumValueDescriptor(
name='UNKNOWN_VERSION', index=0, number=0,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='_0_0_1', index=1, number=1,
serialized_options=None,
options=None,
type=None),
],
containing_type=None,
serialized_options=None,
options=None,
serialized_start=149,
serialized_end=191,
)
@@ -54,15 +54,15 @@ _SOURCE_SOURCETYPES = _descriptor.EnumDescriptor(
values=[
_descriptor.EnumValueDescriptor(
name='UNKNOWN_SOURCE_TYPE', index=0, number=0,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='lbry_sd_hash', index=1, number=1,
serialized_options=None,
options=None,
type=None),
],
containing_type=None,
serialized_options=None,
options=None,
serialized_start=193,
serialized_end=249,
)
@@ -82,28 +82,28 @@ _SOURCE = _descriptor.Descriptor(
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='sourceType', full_name='pb.Source.sourceType', index=1,
number=2, type=14, cpp_type=8, label=2,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='source', full_name='pb.Source.source', index=2,
number=3, type=12, cpp_type=9, label=2,
has_default_value=False, default_value=_b(""),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='contentType', full_name='pb.Source.contentType', index=3,
number=4, type=9, cpp_type=9, label=2,
has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -112,7 +112,7 @@ _SOURCE = _descriptor.Descriptor(
_SOURCE_VERSION,
_SOURCE_SOURCETYPES,
],
serialized_options=None,
options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
+8 -8
View File
@@ -7,6 +7,7 @@ from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf import descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
@@ -20,7 +21,6 @@ DESCRIPTOR = _descriptor.FileDescriptor(
name='stream.proto',
package='pb',
syntax='proto2',
serialized_options=None,
serialized_pb=_b('\n\x0cstream.proto\x12\x02pb\x1a\x0emetadata.proto\x1a\x0csource.proto\"\x95\x01\n\x06Stream\x12#\n\x07version\x18\x01 \x02(\x0e\x32\x12.pb.Stream.Version\x12\x1e\n\x08metadata\x18\x02 \x02(\x0b\x32\x0c.pb.Metadata\x12\x1a\n\x06source\x18\x03 \x02(\x0b\x32\n.pb.Source\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01')
,
dependencies=[metadata__pb2.DESCRIPTOR,source__pb2.DESCRIPTOR,])
@@ -35,15 +35,15 @@ _STREAM_VERSION = _descriptor.EnumDescriptor(
values=[
_descriptor.EnumValueDescriptor(
name='UNKNOWN_VERSION', index=0, number=0,
serialized_options=None,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='_0_0_1', index=1, number=1,
serialized_options=None,
options=None,
type=None),
],
containing_type=None,
serialized_options=None,
options=None,
serialized_start=158,
serialized_end=200,
)
@@ -63,21 +63,21 @@ _STREAM = _descriptor.Descriptor(
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='metadata', full_name='pb.Stream.metadata', index=1,
number=2, type=11, cpp_type=10, label=2,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='source', full_name='pb.Stream.source', index=2,
number=3, type=11, cpp_type=10, label=2,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -85,7 +85,7 @@ _STREAM = _descriptor.Descriptor(
enum_types=[
_STREAM_VERSION,
],
serialized_options=None,
options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],