add addressbook demo

starwing · starwing · commit 0564bfd0ab5c · 2015-05-05T13:47:52.000+08:00
diff --git a/addressbook.pb b/addressbook.pb
diff --git a/addressbook.proto b/addressbook.proto
@@ -0,0 +1,39 @@
+// See README.txt for information and build instructions.
+
+package tutorial;
+
+option java_package = "com.example.tutorial";
+option java_outer_classname = "AddressBookProtos";
+
+message Person {
+  required string name = 1;
+  required int32 id = 2;        // Unique ID number for this person.
+  optional string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    required string number = 1;
+    optional PhoneType type = 2 [default = HOME];
+  }
+
+  repeated PhoneNumber phone = 4;
+  repeated int32 test = 5 [packed=true];
+
+  extensions 10 to max; 
+}
+
+message Ext {
+  extend Person {
+    optional int32 test = 10;
+  }
+}
+
+// Our address book file is just one of these.
+message AddressBook {
+  repeated Person person = 1;
+}
diff --git a/pb.lua b/pb.lua
@@ -51,6 +51,19 @@ local function make_package(package)
    return cur
 end
 
+function pb.cleartypes()
+   package.loaded.pb_typeinfo = nil
+   typeinfo = require "pb_typeinfo"
+end
+
+function pb.type(qname)
+   if qname then
+      return qualitied_type(qname)
+   else
+      return typeinfo
+   end
+end
+
 local buffer_pool = {}
 local buffer_used = setmetatable({}, { __mode="k" })
 
@@ -242,18 +255,22 @@ function encode(buff, t, ptype)
 end
 
 function pb.decode(s, ptype)
-   local realtype = qualitied_type(ptype)
+   if type(ptype) ~= "table" then
+      ptype = qualitied_type(ptype)
+   end
    dec:source(s)
-   local res = decode(dec, realtype)
+   local res = decode(dec, ptype)
    dec:reset()
    return res
 end
 
 function pb.encode(t, ptype)
-   local realtype = qualitied_type(ptype)
+   if type(ptype) ~= "table" then
+      ptype = qualitied_type(ptype)
+   end
    local buff = get_buffer()
    buff:clear()
-   encode(buff, t, realtype)
+   encode(buff, t, ptype)
    local res = buff:clear(nil, true)
    put_buffer(buff)
    return res
@@ -406,11 +423,14 @@ local function load_fileset(pb)
 end
 
 function pb.load(data)
-   load_fileset(pb.decode(data, "google.protobuf.FileDescriptorSet"))
+   local proto = pb.decode(data,
+      "google.protobuf.FileDescriptorSet")
+   load_fileset(proto)
+   return proto
 end
 
 function pb.loadfile(filename)
-   return pb.load(pbio.read(filename))
+   return pb.load(assert(pbio.read(filename)))
 end
 
 ------------------------------------------------------------
@@ -606,9 +626,12 @@ local function dump_info(info)
    G "}\n\n"
 end
 
-function pb.dump(filename, qtype)
+function pb.dump(filename, ptype)
    local realtype = typeinfo
-   if qtype then realtype = qualitied_type(type) end
+   if ptype then
+      realtype = type(ptype) == "table" and ptype
+         or qualitied_type(ptype)
+   end
    io.output(filename)
    dump_info(realtype)
    io.output():close()
diff --git a/test_protobuf.lua b/test_protobuf.lua
@@ -0,0 +1,42 @@
+local protobuf = require "pb"
+t = protobuf.loadfile "addressbook.pb"
+
+proto = t.file[1]
+
+print(proto.name)
+print(proto.package)
+
+message = proto.message_type
+
+for _,v in ipairs(message) do
+	print(v.name)
+	for _,v in ipairs(v.field or {}) do
+		print("\t".. v.name .. " ["..v.number.."] " .. v.label)
+	end
+end
+
+addressbook = {
+	name = "Alice",
+	id = 12345,
+	phone = {
+		{ number = "1301234567" },
+		{ number = "87654321", type = "WORK" },
+	}
+}
+
+local Person = protobuf.type "tutorial.Person"
+code = protobuf.encode(addressbook, Person)
+
+decode = protobuf.decode(code, Person)
+
+print(decode.name)
+print(decode.id)
+for _,v in ipairs(decode.phone) do
+	print("\t"..v.number, v.type)
+end
+
+--[[
+phonebuf = protobuf.pack("tutorial.Person.PhoneNumber number","87654321")
+buffer = protobuf.pack("tutorial.Person name id phone", "Alice", 123, { phonebuf })
+print(protobuf.unpack("tutorial.Person name id phone", buffer))
+--]]
