MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stockpules: fix protobuf-lite support 

Looks like we lost more than just TextFormat when we lost full protobuf
support. Copied these two serialization functions over.
develop
Casey Link 2014-11-27 16:36:42 +01:00
parent 1c496fb255
commit cb6d4da2f2
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/proto/stockpiles.proto
Unescape Escape View File

@ -1,6 +1,6 @@
package dfstockpiles;
option optimize_for = CODE_SIZE;
option optimize_for = LITE_RUNTIME;
message StockpileSettings {
@ -156,4 +156,4 @@ message StockpileSettings {
optional int32 max_bins = 21;
optional int32 max_wheelbarrows = 22;
optional bool use_links_only = 23;
}
}

38
plugins/stockpiles.cpp
Unescape Escape View File

@ -41,6 +41,7 @@
// protobuf
#include "proto/stockpiles.pb.h"
#include <google/protobuf/io/zero_copy_stream_impl.h>
// os
#include <sys/stat.h>
@ -463,28 +464,51 @@ public:
mOut = &out;
}
/**
* Since we depend on protobuf-lite, not the full lib, we copy this function from
* protobuf message.cc
*/
bool serialize_to_ostream(ostream* output)
{
mBuffer.Clear();
write();
{
io::OstreamOutputStream zero_copy_output(output);
if (!mBuffer.SerializeToZeroCopyStream(&zero_copy_output)) return false;
}
return output->good();
}
/**
* Will serialize stockpile settings to a file (overwrites existing files)
* @return success/failure
*/
bool serialize_to_file ( const std::string & file )
{
mBuffer.Clear();
write();
std::fstream output ( file, std::ios::out | std::ios::binary | std::ios::trunc );
return mBuffer.SerializeToOstream ( &output );
return serialize_to_ostream(&output);
}
/**
* Again, copied from message.cc
*/
bool parse_from_istream(istream* input)
{
mBuffer.Clear();
io::IstreamInputStream zero_copy_input(input);
const bool res = mBuffer.ParseFromZeroCopyStream(&zero_copy_input) && input->eof();
if( res ) read();
return res;
}
/**
* Read stockpile settings from file
*/
bool unserialize_from_file ( const std::string & file )
{
mBuffer.Clear();
std::fstream input ( file, std::ios::in | std::ios::binary );
const bool res = mBuffer.ParseFromIstream ( &input );
read();
return res;
return parse_from_istream(&input);
}
private: