rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

spelling: receive 

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
This commit is contained in:
Josh Soref 2022-05-05 21:33:30 -04:00
parent b00fa075e3
commit 754d854fb3
9 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/base/EventTypes.cpp
View File

@ -201,5 +201,5 @@ REGISTER_EVENT(Clipboard, clipboardSending)
// //
REGISTER_EVENT(File, fileChunkSending) REGISTER_EVENT(File, fileChunkSending)
REGISTER_EVENT(File, fileRecieveCompleted) REGISTER_EVENT(File, fileReceiveCompleted)
REGISTER_EVENT(File, keepAlive) REGISTER_EVENT(File, keepAlive)

6
src/lib/base/EventTypes.h
View File

@ -745,7 +745,7 @@ class FileEvents : public EventTypes {
public: public:
FileEvents() : FileEvents() :
m_fileChunkSending(Event::kUnknown), m_fileChunkSending(Event::kUnknown),
m_fileRecieveCompleted(Event::kUnknown), m_fileReceiveCompleted(Event::kUnknown),
m_keepAlive(Event::kUnknown) { } m_keepAlive(Event::kUnknown) { }
//! @name accessors //! @name accessors
@ -755,7 +755,7 @@ public:
Event::Type fileChunkSending(); Event::Type fileChunkSending();
//! Completed receiving a file //! Completed receiving a file
Event::Type fileRecieveCompleted(); Event::Type fileReceiveCompleted();
//! Send a keep alive //! Send a keep alive
Event::Type keepAlive(); Event::Type keepAlive();
@ -764,6 +764,6 @@ public:
private: private:
Event::Type m_fileChunkSending; Event::Type m_fileChunkSending;
Event::Type m_fileRecieveCompleted; Event::Type m_fileReceiveCompleted;
Event::Type m_keepAlive; Event::Type m_keepAlive;
}; };

10
src/lib/client/Client.cpp
View File

@ -90,10 +90,10 @@ Client::Client(IEventQueue* events, const std::string& name, const NetworkAddres
this, this,
new TMethodEventJob<Client>(this, new TMethodEventJob<Client>(this,
&Client::handleFileChunkSending)); &Client::handleFileChunkSending));
m_events->adoptHandler(m_events->forFile().fileRecieveCompleted(), m_events->adoptHandler(m_events->forFile().fileReceiveCompleted(),
this, this,
new TMethodEventJob<Client>(this, new TMethodEventJob<Client>(this,
&Client::handleFileRecieveCompleted)); &Client::handleFileReceiveCompleted));
} }
} }
@ -750,13 +750,13 @@ Client::handleFileChunkSending(const Event& event, void*)
} }
void void
Client::handleFileRecieveCompleted(const Event& event, void*) Client::handleFileReceiveCompleted(const Event& event, void*)
{ {
onFileRecieveCompleted(); onFileReceiveCompleted();
} }
void void
Client::onFileRecieveCompleted() Client::onFileReceiveCompleted()
{ {
if (isReceivedFileSizeValid()) { if (isReceivedFileSizeValid()) {
m_writeToDropDirThread = new Thread([this](){ write_to_drop_dir_thread(); }); m_writeToDropDirThread = new Thread([this](){ write_to_drop_dir_thread(); });

4
src/lib/client/Client.h
View File

@ -189,9 +189,9 @@ private:
void handleSuspend(const Event& event, void*); void handleSuspend(const Event& event, void*);
void handleResume(const Event& event, void*); void handleResume(const Event& event, void*);
void handleFileChunkSending(const Event&, void*); void handleFileChunkSending(const Event&, void*);
void handleFileRecieveCompleted(const Event&, void*); void handleFileReceiveCompleted(const Event&, void*);
void handleStopRetry(const Event&, void*); void handleStopRetry(const Event&, void*);
void onFileRecieveCompleted(); void onFileReceiveCompleted();
void sendClipboardThread(void*); void sendClipboardThread(void*);
public: public:

2
src/lib/client/ServerProxy.cpp
View File

@ -879,7 +879,7 @@ ServerProxy::fileChunkReceived()
m_client->getExpectedFileSize()); m_client->getExpectedFileSize());
if (result == kFinish) { if (result == kFinish) {
m_events->addEvent(Event(m_events->forFile().fileRecieveCompleted(), m_client)); m_events->addEvent(Event(m_events->forFile().fileReceiveCompleted(), m_client));
} }
else if (result == kStart) { else if (result == kStart) {
if (m_client->getDragFileList().size() > 0) { if (m_client->getDragFileList().size() > 0) {

2
src/lib/server/ClientProxy1_5.cpp
View File

@ -89,7 +89,7 @@ ClientProxy1_5::fileChunkReceived()
if (result == kFinish) { if (result == kFinish) {
m_events->addEvent(Event(m_events->forFile().fileRecieveCompleted(), server)); m_events->addEvent(Event(m_events->forFile().fileReceiveCompleted(), server));
} }
else if (result == kStart) { else if (result == kStart) {
if (server->getFakeDragFileList().size() > 0) { if (server->getFakeDragFileList().size() > 0) {

10
src/lib/server/Server.cpp
View File

@ -191,10 +191,10 @@ Server::Server(
this, this,
new TMethodEventJob<Server>(this, new TMethodEventJob<Server>(this,
&Server::handleFileChunkSendingEvent)); &Server::handleFileChunkSendingEvent));
m_events->adoptHandler(m_events->forFile().fileRecieveCompleted(), m_events->adoptHandler(m_events->forFile().fileReceiveCompleted(),
this, this,
new TMethodEventJob<Server>(this, new TMethodEventJob<Server>(this,
&Server::handleFileRecieveCompletedEvent)); &Server::handleFileReceiveCompletedEvent));
} }
// add connection // add connection
@ -1528,9 +1528,9 @@ Server::handleFileChunkSendingEvent(const Event& event, void*)
} }
void void
Server::handleFileRecieveCompletedEvent(const Event& event, void*) Server::handleFileReceiveCompletedEvent(const Event& event, void*)
{ {
onFileRecieveCompleted(); onFileReceiveCompleted();
} }
void void
@ -2078,7 +2078,7 @@ Server::onFileChunkSending(const void* data)
} }
void void
Server::onFileRecieveCompleted() Server::onFileReceiveCompleted()
{ {
if (isReceivedFileSizeValid()) { if (isReceivedFileSizeValid()) {
m_writeToDropDirThread = new Thread([this]() { write_to_drop_dir_thread(); }); m_writeToDropDirThread = new Thread([this]() { write_to_drop_dir_thread(); });

4
src/lib/server/Server.h
View File

@ -315,7 +315,7 @@ private:
void handleFakeInputBeginEvent(const Event&, void*); void handleFakeInputBeginEvent(const Event&, void*);
void handleFakeInputEndEvent(const Event&, void*); void handleFakeInputEndEvent(const Event&, void*);
void handleFileChunkSendingEvent(const Event&, void*); void handleFileChunkSendingEvent(const Event&, void*);
void handleFileRecieveCompletedEvent(const Event&, void*); void handleFileReceiveCompletedEvent(const Event&, void*);
// event processing // event processing
void onClipboardChanged(BaseClientProxy* sender, void onClipboardChanged(BaseClientProxy* sender,
@ -332,7 +332,7 @@ private:
void onMouseMoveSecondary(SInt32 dx, SInt32 dy); void onMouseMoveSecondary(SInt32 dx, SInt32 dy);
void onMouseWheel(SInt32 xDelta, SInt32 yDelta); void onMouseWheel(SInt32 xDelta, SInt32 yDelta);
void onFileChunkSending(const void* data); void onFileChunkSending(const void* data);
void onFileRecieveCompleted(); void onFileReceiveCompleted();
// add client to list and attach event handlers for client // add client to list and attach event handlers for client
bool addClient(BaseClientProxy*); bool addClient(BaseClientProxy*);

40
src/test/integtests/net/NetworkTests.cpp
View File

@ -85,16 +85,16 @@ public:
void sendMockData(void* eventTarget); void sendMockData(void* eventTarget);
void sendToClient_mockData_handleClientConnected(const Event&, void* vlistener); void sendToClient_mockData_handleClientConnected(const Event&, void* vlistener);
void sendToClient_mockData_fileRecieveCompleted(const Event&, void*); void sendToClient_mockData_fileReceiveCompleted(const Event&, void*);
void sendToClient_mockFile_handleClientConnected(const Event&, void* vlistener); void sendToClient_mockFile_handleClientConnected(const Event&, void* vlistener);
void sendToClient_mockFile_fileRecieveCompleted(const Event& event, void*); void sendToClient_mockFile_fileReceiveCompleted(const Event& event, void*);
void sendToServer_mockData_handleClientConnected(const Event&, void* vlistener); void sendToServer_mockData_handleClientConnected(const Event&, void* vlistener);
void sendToServer_mockData_fileRecieveCompleted(const Event& event, void*); void sendToServer_mockData_fileReceiveCompleted(const Event& event, void*);
void sendToServer_mockFile_handleClientConnected(const Event&, void* vlistener); void sendToServer_mockFile_handleClientConnected(const Event&, void* vlistener);
void sendToServer_mockFile_fileRecieveCompleted(const Event& event, void*); void sendToServer_mockFile_fileReceiveCompleted(const Event& event, void*);
public: public:
TestEventQueue m_events; TestEventQueue m_events;
@ -150,16 +150,16 @@ TEST_F(NetworkTests, sendToClient_mockData)
Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, clientArgs); Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, clientArgs);
m_events.adoptHandler( m_events.adoptHandler(
m_events.forFile().fileRecieveCompleted(), &client, m_events.forFile().fileReceiveCompleted(), &client,
new TMethodEventJob<NetworkTests>( new TMethodEventJob<NetworkTests>(
this, &NetworkTests::sendToClient_mockData_fileRecieveCompleted)); this, &NetworkTests::sendToClient_mockData_fileReceiveCompleted));
client.connect(); client.connect();
m_events.initQuitTimeout(10); m_events.initQuitTimeout(10);
m_events.loop(); m_events.loop();
m_events.removeHandler(m_events.forClientListener().connected(), &listener); m_events.removeHandler(m_events.forClientListener().connected(), &listener);
m_events.removeHandler(m_events.forFile().fileRecieveCompleted(), &client); m_events.removeHandler(m_events.forFile().fileReceiveCompleted(), &client);
m_events.cleanupQuitTimeout(); m_events.cleanupQuitTimeout();
} }
@ -209,16 +209,16 @@ TEST_F(NetworkTests, sendToClient_mockFile)
Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, clientArgs); Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, clientArgs);
m_events.adoptHandler( m_events.adoptHandler(
m_events.forFile().fileRecieveCompleted(), &client, m_events.forFile().fileReceiveCompleted(), &client,
new TMethodEventJob<NetworkTests>( new TMethodEventJob<NetworkTests>(
this, &NetworkTests::sendToClient_mockFile_fileRecieveCompleted)); this, &NetworkTests::sendToClient_mockFile_fileReceiveCompleted));
client.connect(); client.connect();
m_events.initQuitTimeout(10); m_events.initQuitTimeout(10);
m_events.loop(); m_events.loop();
m_events.removeHandler(m_events.forClientListener().connected(), &listener); m_events.removeHandler(m_events.forClientListener().connected(), &listener);
m_events.removeHandler(m_events.forFile().fileRecieveCompleted(), &client); m_events.removeHandler(m_events.forFile().fileReceiveCompleted(), &client);
m_events.cleanupQuitTimeout(); m_events.cleanupQuitTimeout();
} }
@ -266,16 +266,16 @@ TEST_F(NetworkTests, sendToServer_mockData)
this, &NetworkTests::sendToServer_mockData_handleClientConnected, &client)); this, &NetworkTests::sendToServer_mockData_handleClientConnected, &client));
m_events.adoptHandler( m_events.adoptHandler(
m_events.forFile().fileRecieveCompleted(), &server, m_events.forFile().fileReceiveCompleted(), &server,
new TMethodEventJob<NetworkTests>( new TMethodEventJob<NetworkTests>(
this, &NetworkTests::sendToServer_mockData_fileRecieveCompleted)); this, &NetworkTests::sendToServer_mockData_fileReceiveCompleted));
client.connect(); client.connect();
m_events.initQuitTimeout(10); m_events.initQuitTimeout(10);
m_events.loop(); m_events.loop();
m_events.removeHandler(m_events.forClientListener().connected(), &listener); m_events.removeHandler(m_events.forClientListener().connected(), &listener);
m_events.removeHandler(m_events.forFile().fileRecieveCompleted(), &server); m_events.removeHandler(m_events.forFile().fileReceiveCompleted(), &server);
m_events.cleanupQuitTimeout(); m_events.cleanupQuitTimeout();
} }
@ -324,16 +324,16 @@ TEST_F(NetworkTests, sendToServer_mockFile)
this, &NetworkTests::sendToServer_mockFile_handleClientConnected, &client)); this, &NetworkTests::sendToServer_mockFile_handleClientConnected, &client));
m_events.adoptHandler( m_events.adoptHandler(
m_events.forFile().fileRecieveCompleted(), &server, m_events.forFile().fileReceiveCompleted(), &server,
new TMethodEventJob<NetworkTests>( new TMethodEventJob<NetworkTests>(
this, &NetworkTests::sendToServer_mockFile_fileRecieveCompleted)); this, &NetworkTests::sendToServer_mockFile_fileReceiveCompleted));
client.connect(); client.connect();
m_events.initQuitTimeout(10); m_events.initQuitTimeout(10);
m_events.loop(); m_events.loop();
m_events.removeHandler(m_events.forClientListener().connected(), &listener); m_events.removeHandler(m_events.forClientListener().connected(), &listener);
m_events.removeHandler(m_events.forFile().fileRecieveCompleted(), &server); m_events.removeHandler(m_events.forFile().fileReceiveCompleted(), &server);
m_events.cleanupQuitTimeout(); m_events.cleanupQuitTimeout();
} }
@ -356,7 +356,7 @@ NetworkTests::sendToClient_mockData_handleClientConnected(const Event&, void* vl
} }
void void
NetworkTests::sendToClient_mockData_fileRecieveCompleted(const Event& event, void*) NetworkTests::sendToClient_mockData_fileReceiveCompleted(const Event& event, void*)
{ {
Client* client = static_cast<Client*>(event.getTarget()); Client* client = static_cast<Client*>(event.getTarget());
EXPECT_TRUE(client->isReceivedFileSizeValid()); EXPECT_TRUE(client->isReceivedFileSizeValid());
@ -383,7 +383,7 @@ NetworkTests::sendToClient_mockFile_handleClientConnected(const Event&, void* vl
} }
void void
NetworkTests::sendToClient_mockFile_fileRecieveCompleted(const Event& event, void*) NetworkTests::sendToClient_mockFile_fileReceiveCompleted(const Event& event, void*)
{ {
Client* client = static_cast<Client*>(event.getTarget()); Client* client = static_cast<Client*>(event.getTarget());
EXPECT_TRUE(client->isReceivedFileSizeValid()); EXPECT_TRUE(client->isReceivedFileSizeValid());
@ -399,7 +399,7 @@ NetworkTests::sendToServer_mockData_handleClientConnected(const Event&, void* vc
} }
void void
NetworkTests::sendToServer_mockData_fileRecieveCompleted(const Event& event, void*) NetworkTests::sendToServer_mockData_fileReceiveCompleted(const Event& event, void*)
{ {
Server* server = static_cast<Server*>(event.getTarget()); Server* server = static_cast<Server*>(event.getTarget());
EXPECT_TRUE(server->isReceivedFileSizeValid()); EXPECT_TRUE(server->isReceivedFileSizeValid());
@ -415,7 +415,7 @@ NetworkTests::sendToServer_mockFile_handleClientConnected(const Event&, void* vc
} }
void void
NetworkTests::sendToServer_mockFile_fileRecieveCompleted(const Event& event, void*) NetworkTests::sendToServer_mockFile_fileReceiveCompleted(const Event& event, void*)
{ {
Server* server = static_cast<Server*>(event.getTarget()); Server* server = static_cast<Server*>(event.getTarget());
EXPECT_TRUE(server->isReceivedFileSizeValid()); EXPECT_TRUE(server->isReceivedFileSizeValid());