cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ad9c582af7ff2ac001216deca464a8ba7398f5d2
commit ad9c582af7ff2ac001216deca464a8ba7398f5d2
Author: Xavi Artigas <xavierarti...@yahoo.es>
Date: Fri Apr 6 11:57:35 2018 +0200
Efl.Net.Dialer_*_ (from Efl.Net.Dialer_*.)
Ref https://phab.enlightenment.org/T6847
Reviewed-by: Cedric Bail <ced...@osg.samsung.com>
---
src/lib/ecore_con/efl_net_dialer_http.eo | 18 +++++++++---------
src/lib/ecore_con/efl_net_dialer_websocket.eo | 20 ++++++++++----------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/lib/ecore_con/efl_net_dialer_http.eo
b/src/lib/ecore_con/efl_net_dialer_http.eo
index 4d18fe52f4..db63927a12 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.eo
+++ b/src/lib/ecore_con/efl_net_dialer_http.eo
@@ -1,6 +1,6 @@
import efl_net_http_types;
-enum Efl.Net.Dialer.Http.Primary_Mode {
+enum Efl.Net.Dialer.Http_Primary_Mode {
[[Primary HTTP mode]]
auto, [[HTTP auto mode]]
download, [[HTTP download mode]]
@@ -71,20 +71,20 @@ class Efl.Net.Dialer.Http (Efl.Loop.Consumer,
Efl.Net.Dialer, Efl.Io.Sizer) {
This property will change the behavior of @Efl.Io.Sizer:
- - If @Efl.Net.Dialer.Http.Primary_Mode.auto, then
- @Efl.Net.Dialer.Http.Primary_Mode.download or
- @Efl.Net.Dialer.Http.Primary_Mode.upload will be
+ - If @Efl.Net.Dialer.Http_Primary_Mode.auto, then
+ @Efl.Net.Dialer.Http_Primary_Mode.download or
+ @Efl.Net.Dialer.Http_Primary_Mode.upload will be
choosen based on the @.method: if "PUT", then it's
upload, otherwise it's download.
- - If @Efl.Net.Dialer.Http.Primary_Mode.upload, applying
+ - If @Efl.Net.Dialer.Http_Primary_Mode.upload, applying
a new size with @Efl.Io.Sizer.resize or
@Efl.Io.Sizer.size.set will specify the
"Content-Length" to upload. If no size is previously
set, then the upload will happen in
"Transfer-encoding: chunked".
- - If @Efl.Net.Dialer.Http.Primary_Mode.download, then
+ - If @Efl.Net.Dialer.Http_Primary_Mode.download, then
@Efl.Io.Sizer.size.get will report the
"Content-Length" provided by the server, if any.
@@ -99,15 +99,15 @@ class Efl.Net.Dialer.Http (Efl.Loop.Consumer,
Efl.Net.Dialer, Efl.Io.Sizer) {
[[The effective primary mode.
This will return one of
- @Efl.Net.Dialer.Http.Primary_Mode.download or
- @Efl.Net.Dialer.Http.Primary_Mode.upload. If "auto"
+ @Efl.Net.Dialer.Http_Primary_Mode.download or
+ @Efl.Net.Dialer.Http_Primary_Mode.upload. If "auto"
was set (the default), then it will pick the best
based on the @.method in use.
]]
}
set { }
values {
- primary_mode: Efl.Net.Dialer.Http.Primary_Mode; [[Primary HTTP
mode]]
+ primary_mode: Efl.Net.Dialer.Http_Primary_Mode; [[Primary HTTP
mode]]
}
}
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.eo
b/src/lib/ecore_con/efl_net_dialer_websocket.eo
index d927474031..f87bed8edc 100644
--- a/src/lib/ecore_con/efl_net_dialer_websocket.eo
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.eo
@@ -1,7 +1,7 @@
import eina_types;
import efl_net_http_types;
-enum Efl.Net.Dialer.Websocket.Streaming_Mode {
+enum Efl.Net.Dialer.Websocket_Streaming_Mode {
[[How to map WebSocket to EFL I/O Interfaces.
@since 1.19
@@ -11,7 +11,7 @@ enum Efl.Net.Dialer.Websocket.Streaming_Mode {
text, [[@Efl.Io.Writer.write will result in
@Efl.Net.Dialer.Websocket.text_send]]
}
-enum Efl.Net.Dialer.Websocket.Close_Reason {
+enum Efl.Net.Dialer.Websocket_Close_Reason {
[[Registered reasons for the CLOSE (opcode=0x8).
These are the well known reasons, with some ranges being defined
@@ -38,12 +38,12 @@ enum Efl.Net.Dialer.Websocket.Close_Reason {
private_end = 4999, [[Applications can use range 4000-4999]]
}
-struct Efl.Net.Dialer.Websocket.Closed_Reason {
+struct Efl.Net.Dialer.Websocket_Closed_Reason {
[[Close reason event payload.
@since 1.19
]]
- reason: Efl.Net.Dialer.Websocket.Close_Reason; [[Closing reason]]
+ reason: Efl.Net.Dialer.Websocket_Close_Reason; [[Closing reason]]
message: string; [[Textual closing reason message]]
}
@@ -135,7 +135,7 @@ class Efl.Net.Dialer.Websocket (Efl.Loop.Consumer,
Efl.Net.Dialer) {
close message, which will be reported as "closed,reason".
]]
params {
- reason: Efl.Net.Dialer.Websocket.Close_Reason; [[Reason for
closing]]
+ reason: Efl.Net.Dialer.Websocket_Close_Reason; [[Reason for
closing]]
message: string @optional; [[Additional closing message]]
}
}
@@ -174,9 +174,9 @@ class Efl.Net.Dialer.Websocket (Efl.Loop.Consumer,
Efl.Net.Dialer) {
However this class can operate in streaming mode,
mapping each @Efl.Io.Writer.write to a @.binary_send if
streaming_mode is set to
- @Efl.Net.Dialer.Websocket.Streaming_Mode.binary, of
+ @Efl.Net.Dialer.Websocket_Streaming_Mode.binary, of
@.text_send if
- @Efl.Net.Dialer.Websocket.Streaming_Mode.text
+ @Efl.Net.Dialer.Websocket_Streaming_Mode.text
@Efl.Io.Reader.read may consume less then the whole
received message, in this case the rest of the message
@@ -184,12 +184,12 @@ class Efl.Net.Dialer.Websocket (Efl.Loop.Consumer,
Efl.Net.Dialer) {
SOCK_SEQPACKET + read(2)).
By default, streaming is disabled
- (@Efl.Net.Dialer.Websocket.Streaming_Mode.disabled).
+ (@Efl.Net.Dialer.Websocket_Streaming_Mode.disabled).
]]
get { }
set { }
values {
- streaming_mode: Efl.Net.Dialer.Websocket.Streaming_Mode;
[[Streaming mode]]
+ streaming_mode: Efl.Net.Dialer.Websocket_Streaming_Mode;
[[Streaming mode]]
}
}
@@ -309,7 +309,7 @@ class Efl.Net.Dialer.Websocket (Efl.Loop.Consumer,
Efl.Net.Dialer) {
message,text: string; [[Received a text string message (opcode=0x1)]]
message,binary: ptr(const(Eina.Slice)); [[Received a binary message
(opcode=0x2)]]
pong: string; [[Received a pong (opcode=0xA) with optional
message/reason]]
- closed,reason: Efl.Net.Dialer.Websocket.Closed_Reason; [[Received a
request to close the connection. It may be a reply/confirmation from a local
request, see @.close_request, or some server-generated reason. After this
point, no more messages are allowed to be sent and no more will be received.
@Efl.Io.Closer.close will be called.]]
+ closed,reason: Efl.Net.Dialer.Websocket_Closed_Reason; [[Received a
request to close the connection. It may be a reply/confirmation from a local
request, see @.close_request, or some server-generated reason. After this
point, no more messages are allowed to be sent and no more will be received.
@Efl.Io.Closer.close will be called.]]
}
implements {
--
