gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Msg: Migrated to use libshared

Browse Source
This commit is contained in:
Paul Beckingham
2016-12-11 20:33:13 -05:00
parent cdfd92ed9b
commit f6ae39cb82
6 changed files with 2 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -17,7 +17,6 @@ add_library (task CLI2.cpp CLI2.h
Hooks.cpp Hooks.h
ISO8601.cpp ISO8601.h
Lexer.cpp Lexer.h
Msg.cpp Msg.h
Nibbler.cpp Nibbler.h
TDB2.cpp TDB2.h
Task.cpp Task.h
@@ -38,6 +37,7 @@ add_library (libshared libshared/src/Datetime.cpp libshared/src/Datetime.h
libshared/src/Duration.cpp libshared/src/Duration.h
libshared/src/FS.cpp libshared/src/FS.h
libshared/src/JSON.cpp libshared/src/JSON.h
libshared/src/Msg.cpp libshared/src/Msg.h
libshared/src/Pig.cpp libshared/src/Pig.h
libshared/src/RX.cpp libshared/src/RX.h
libshared/src/Table.cpp libshared/src/Table.h

107
src/Msg.cpp
View File

@@ -1,107 +0,0 @@
////////////////////////////////////////////////////////////////////////////////
//
// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//
// http://www.opensource.org/licenses/mit-license.php
//
////////////////////////////////////////////////////////////////////////////////
#include <cmake.h>
#include <Msg.h>
#include <Lexer.h>
#include <shared.h>
////////////////////////////////////////////////////////////////////////////////
void Msg::set (const std::string& name, const std::string& value)
{
_header[name] = value;
}
////////////////////////////////////////////////////////////////////////////////
std::string Msg::get (const std::string& name) const
{
auto i = _header.find (name);
if (i != _header.end ())
return i->second;
return "";
}
////////////////////////////////////////////////////////////////////////////////
void Msg::setPayload (const std::string& payload)
{
_payload = payload;
}
////////////////////////////////////////////////////////////////////////////////
std::string Msg::getPayload () const
{
return _payload;
}
////////////////////////////////////////////////////////////////////////////////
std::vector <std::string> Msg::all () const
{
std::vector <std::string> names;
for (auto& i : _header)
names.push_back (i.first);
return names;
}
////////////////////////////////////////////////////////////////////////////////
std::string Msg::serialize () const
{
std::string output;
for (auto& i : _header)
output += i.first + ": " + i.second + '\n';
output += '\n' + _payload + '\n';
return output;
}
////////////////////////////////////////////////////////////////////////////////
bool Msg::parse (const std::string& input)
{
_header.clear ();
_payload = "";
auto separator = input.find ("\n\n");
if (separator == std::string::npos)
throw std::string ("ERROR: Malformed message");
// Parse header.
for (auto& i : split (input.substr (0, separator), '\n'))
{
auto delimiter = i.find (':');
if (delimiter == std::string::npos)
throw std::string ("ERROR: Malformed message header '") + i + '\'';
_header[Lexer::trim (i.substr (0, delimiter))] = Lexer::trim (i.substr (delimiter + 1));
}
// Parse payload.
_payload = input.substr (separator + 2);
return true;
}
////////////////////////////////////////////////////////////////////////////////

53
src/Msg.h
View File

@@ -1,53 +0,0 @@
////////////////////////////////////////////////////////////////////////////////
//
// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//
// http://www.opensource.org/licenses/mit-license.php
//
////////////////////////////////////////////////////////////////////////////////
#ifndef INCLUDED_MSG
#define INCLUDED_MSG
#include <map>
#include <vector>
#include <string>
class Msg
{
public:
void set (const std::string&, const std::string&);
std::string get (const std::string&) const;
void setPayload (const std::string&);
std::string getPayload () const;
std::vector <std::string> all () const;
std::string serialize () const;
bool parse (const std::string&);
private:
std::map <std::string, std::string> _header {};
std::string _payload {""};
};
#endif