Skip to content

Commit d485d45

Browse files
evoskuilevoskuil
authored
Merge pull request #893 from evoskuil/master
Adapt to network rename of mime_type to media_type.
2 parents ca8078c + e115cbb commit d485d45

File tree

18 files changed

+440
-327
lines changed

18 files changed

+440
-327
lines changed

‎Makefile.am‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ src_libbitcoin_node_la_SOURCES = \
7070
src/protocols/protocol_performer.cpp \
7171
src/protocols/protocol_transaction_in_106.cpp \
7272
src/protocols/protocol_transaction_out_106.cpp \
73-
src/rest/rest.cpp \
73+
src/rest/media.cpp \
74+
src/rest/parse.cpp \
7475
src/sessions/session.cpp \
7576
src/sessions/session_inbound.cpp \
7677
src/sessions/session_manual.cpp \
@@ -107,7 +108,8 @@ test_libbitcoin_node_test_SOURCES = \
107108
test/chasers/chaser_transaction.cpp \
108109
test/chasers/chaser_validate.cpp \
109110
test/protocols/protocol.cpp \
110-
test/rest/rest.cpp \
111+
test/rest/media.cpp \
112+
test/rest/parse.cpp \
111113
test/sessions/session.cpp
112114

113115
endif WITH_TESTS
@@ -229,7 +231,8 @@ include_bitcoin_node_protocols_HEADERS = \
229231

230232
include_bitcoin_node_restdir = ${includedir}/bitcoin/node/rest
231233
include_bitcoin_node_rest_HEADERS = \
232-
include/bitcoin/node/rest/rest.hpp
234+
include/bitcoin/node/rest/media.hpp \
235+
include/bitcoin/node/rest/parse.hpp
233236

234237
include_bitcoin_node_sessionsdir = ${includedir}/bitcoin/node/sessions
235238
include_bitcoin_node_sessions_HEADERS = \

‎builds/cmake/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,8 @@ add_library( ${CANONICAL_LIB_NAME}
282282
"../../src/protocols/protocol_performer.cpp"
283283
"../../src/protocols/protocol_transaction_in_106.cpp"
284284
"../../src/protocols/protocol_transaction_out_106.cpp"
285-
"../../src/rest/rest.cpp"
285+
"../../src/rest/media.cpp"
286+
"../../src/rest/parse.cpp"
286287
"../../src/sessions/session.cpp"
287288
"../../src/sessions/session_inbound.cpp"
288289
"../../src/sessions/session_manual.cpp"
@@ -349,7 +350,8 @@ if (with-tests)
349350
"../../test/chasers/chaser_transaction.cpp"
350351
"../../test/chasers/chaser_validate.cpp"
351352
"../../test/protocols/protocol.cpp"
352-
"../../test/rest/rest.cpp"
353+
"../../test/rest/media.cpp"
354+
"../../test/rest/parse.cpp"
353355
"../../test/sessions/session.cpp" )
354356

355357
add_test( NAME libbitcoin-node-test COMMAND libbitcoin-node-test

‎builds/msvc/vs2022/libbitcoin-network.import.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<ItemDefinitionGroup>
1717
<ClCompile>
1818
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
19+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
1920
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-network)' == 'static' Or '$(Linkage-libbitcoin-network)' == 'ltcg'">BCT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2021
</ClCompile>
2122
<Link>

‎builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@
135135
<ClCompile Include="..\..\..\..\test\main.cpp" />
136136
<ClCompile Include="..\..\..\..\test\node.cpp" />
137137
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp" />
138-
<ClCompile Include="..\..\..\..\test\rest\rest.cpp" />
138+
<ClCompile Include="..\..\..\..\test\rest\media.cpp" />
139+
<ClCompile Include="..\..\..\..\test\rest\parse.cpp" />
139140
<ClCompile Include="..\..\..\..\test\sessions\session.cpp" />
140141
<ClCompile Include="..\..\..\..\test\settings.cpp" />
141142
<ClCompile Include="..\..\..\..\test\test.cpp" />

‎builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj.filters‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@
7575
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp">
7676
<Filter>src\protocols</Filter>
7777
</ClCompile>
78-
<ClCompile Include="..\..\..\..\test\rest\rest.cpp">
78+
<ClCompile Include="..\..\..\..\test\rest\media.cpp">
79+
<Filter>src\rest</Filter>
80+
</ClCompile>
81+
<ClCompile Include="..\..\..\..\test\rest\parse.cpp">
7982
<Filter>src\rest</Filter>
8083
</ClCompile>
8184
<ClCompile Include="..\..\..\..\test\sessions\session.cpp">

‎builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@
155155
<ClCompile Include="..\..\..\..\src\protocols\protocol_performer.cpp" />
156156
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_in_106.cpp" />
157157
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_106.cpp" />
158-
<ClCompile Include="..\..\..\..\src\rest\rest.cpp" />
158+
<ClCompile Include="..\..\..\..\src\rest\media.cpp" />
159+
<ClCompile Include="..\..\..\..\src\rest\parse.cpp" />
159160
<ClCompile Include="..\..\..\..\src\sessions\session.cpp" />
160161
<ClCompile Include="..\..\..\..\src\sessions\session_inbound.cpp" />
161162
<ClCompile Include="..\..\..\..\src\sessions\session_manual.cpp" />
@@ -218,7 +219,8 @@
218219
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_web.hpp" />
219220
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_ws.hpp" />
220221
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp" />
221-
<ClInclude Include="..\..\..\..\include\bitcoin\node\rest\rest.hpp" />
222+
<ClInclude Include="..\..\..\..\include\bitcoin\node\rest\media.hpp" />
223+
<ClInclude Include="..\..\..\..\include\bitcoin\node\rest\parse.hpp" />
222224
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session.hpp" />
223225
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_inbound.hpp" />
224226
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_manual.hpp" />

‎builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj.filters‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,10 @@
162162
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_106.cpp">
163163
<Filter>src\protocols</Filter>
164164
</ClCompile>
165-
<ClCompile Include="..\..\..\..\src\rest\rest.cpp">
165+
<ClCompile Include="..\..\..\..\src\rest\media.cpp">
166+
<Filter>src\rest</Filter>
167+
</ClCompile>
168+
<ClCompile Include="..\..\..\..\src\rest\parse.cpp">
166169
<Filter>src\rest</Filter>
167170
</ClCompile>
168171
<ClCompile Include="..\..\..\..\src\sessions\session.cpp">
@@ -347,7 +350,10 @@
347350
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp">
348351
<Filter>include\bitcoin\node\protocols</Filter>
349352
</ClInclude>
350-
<ClInclude Include="..\..\..\..\include\bitcoin\node\rest\rest.hpp">
353+
<ClInclude Include="..\..\..\..\include\bitcoin\node\rest\media.hpp">
354+
<Filter>include\bitcoin\node\rest</Filter>
355+
</ClInclude>
356+
<ClInclude Include="..\..\..\..\include\bitcoin\node\rest\parse.hpp">
351357
<Filter>include\bitcoin\node\rest</Filter>
352358
</ClInclude>
353359
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session.hpp">

‎include/bitcoin/node.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@
7171
#include <bitcoin/node/protocols/protocol_web.hpp>
7272
#include <bitcoin/node/protocols/protocol_ws.hpp>
7373
#include <bitcoin/node/protocols/protocols.hpp>
74-
#include <bitcoin/node/rest/rest.hpp>
74+
#include <bitcoin/node/rest/media.hpp>
75+
#include <bitcoin/node/rest/parse.hpp>
7576
#include <bitcoin/node/sessions/session.hpp>
7677
#include <bitcoin/node/sessions/session_inbound.hpp>
7778
#include <bitcoin/node/sessions/session_manual.hpp>

‎include/bitcoin/node/protocols/protocol.hpp‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,6 @@
3030
namespace libbitcoin {
3131
namespace node {
3232

33-
// TODO: first split node::protocol -> node::protocol and node::protocol_peer.
34-
// TODO: then create node::protocol_peer -> node::protocol + network::protocol_peer.
35-
// TODO: then create node::protocol_tcp -> node::protocol + network::protocol_tcp.
36-
// TODO: this is the same pattern as joining node::session + network::session_xxxx.
37-
// TODO: node::session_xxx => node::session_peer<network::session_xxx> : node::session.
38-
// TODO: node::protocol_xxx => node::protocol_peer<network::protocol_xxx> : node::protocol.
39-
// TODO: none of the node classes derive from shared_from_base and instead just
40-
// TODO: rely on the network base class and shared_from_sibling<> to obtain
41-
// TODO: node object methods within protocol_peer and derived, just as in
42-
// TODO: session_peer and derived. This could be normalized using an override
43-
// TODO: of shared_from_base<>() withing the two templates.
44-
4533
/// Abstract base for node protocols, thread safe.
4634
class BCN_API protocol
4735
{

‎include/bitcoin/node/protocols/protocol_html.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ class BCN_API protocol_html
6767
virtual void send_data(const network::http::request& request,
6868
system::data_chunk&& bytes) NOEXCEPT;
6969
virtual void send_file(const network::http::request& request,
70-
network::http::file&& file, network::http::mime_type type) NOEXCEPT;
70+
network::http::file&& file, network::http::media_type type) NOEXCEPT;
7171
virtual void send_span(const network::http::request& request,
7272
network::http::span_body::value_type&& span,
73-
network::http::mime_type type) NOEXCEPT;
73+
network::http::media_type type) NOEXCEPT;
7474
virtual void send_buffer(const network::http::request& request,
7575
network::http::buffer_body::value_type&& buffer,
76-
network::http::mime_type type) NOEXCEPT;
76+
network::http::media_type type) NOEXCEPT;
7777

7878
/// Utilities.
7979
bool is_allowed_origin(const network::http::fields& fields,

0 commit comments

Comments
 (0)