feat: implement ftp::observer::on_connected() event

deniskovalchuk · Sep 23, 2023 · ae41fbe · ae41fbe
1 parent bc75ad3
commit ae41fbe
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/include/ftp/client.hpp b/include/ftp/client.hpp
@@ -161,6 +161,8 @@ class client
 
     static std::string make_type_command(transfer_type type);
 
+    void notify_connected(std::string_view hostname, std::uint16_t port);
+
     void notify_request(std::string_view command);
 
     void notify_reply(const reply & reply);

diff --git a/include/ftp/observer.hpp b/include/ftp/observer.hpp
@@ -34,6 +34,8 @@ namespace ftp
 class observer
 {
 public:
+    virtual void on_connected(std::string_view hostname, std::uint16_t port) { };
+
     virtual void on_request(std::string_view command) { };
 
     virtual void on_reply(const reply & reply) { };

diff --git a/src/client.cpp b/src/client.cpp
@@ -49,6 +49,8 @@ replies client::connect(std::string_view hostname,
 {
     control_connection_.open(hostname, port);
 
+    notify_connected(hostname, port);
+
     replies replies;
     reply reply = recv(replies);
 
@@ -726,6 +728,14 @@ std::string client::make_type_command(transfer_type type)
     }
 }
 
+void client::notify_connected(std::string_view hostname, std::uint16_t port)
+{
+    for (const std::shared_ptr<observer> & observer : observers_)
+    {
+        observer->on_connected(hostname, port);
+    }
+}
+
 void client::notify_request(std::string_view command)
 {
     for (const std::shared_ptr<observer> & observer : observers_)

diff --git a/test/client.cpp b/test/client.cpp
@@ -47,6 +47,17 @@ class test_observer : public ftp::observer
         : mark_(mark)
     {}
 
+    void on_connected(std::string_view hostname, std::uint16_t port) override
+    {
+        status_strings_.append(mark_);
+        status_strings_.append(": -- ");
+        status_strings_.append("Connected to ");
+        status_strings_.append(hostname);
+        status_strings_.append(" on port ");
+        status_strings_.append(std::to_string(port));
+        status_strings_.append(".");
+    }
+
     void on_request(std::string_view command) override
     {
         status_strings_.append(mark_);
@@ -674,15 +685,17 @@ TEST_F(client, event_observer)
 
         check_reply(client.connect("localhost", 2121), "220 FTP server is ready.");
         check_reply(client.disconnect(), "221 Goodbye.");
-        ASSERT_EQ("observer1: <- 220 FTP server is ready."
+        ASSERT_EQ("observer1: -- Connected to localhost on port 2121."
+                  "observer1: <- 220 FTP server is ready."
                   "observer1: -> QUIT"
                   "observer1: <- 221 Goodbye.", obs1->get_status_strings());
 
         client.remove_observer(obs1);
 
         check_reply(client.connect("localhost", 2121), "220 FTP server is ready.");
         check_reply(client.disconnect(), "221 Goodbye.");
-        ASSERT_EQ("observer1: <- 220 FTP server is ready."
+        ASSERT_EQ("observer1: -- Connected to localhost on port 2121."
+                  "observer1: <- 220 FTP server is ready."
                   "observer1: -> QUIT"
                   "observer1: <- 221 Goodbye.", obs1->get_status_strings());
     }
@@ -697,23 +710,28 @@ TEST_F(client, event_observer)
 
         check_reply(client.connect("localhost", 2121), "220 FTP server is ready.");
         check_reply(client.disconnect(), "221 Goodbye.");
-        ASSERT_EQ("observer1: <- 220 FTP server is ready."
+        ASSERT_EQ("observer1: -- Connected to localhost on port 2121."
+                  "observer1: <- 220 FTP server is ready."
                   "observer1: -> QUIT"
                   "observer1: <- 221 Goodbye.", obs1->get_status_strings());
-        ASSERT_EQ("observer2: <- 220 FTP server is ready."
+        ASSERT_EQ("observer2: -- Connected to localhost on port 2121."
+                  "observer2: <- 220 FTP server is ready."
                   "observer2: -> QUIT"
                   "observer2: <- 221 Goodbye.", obs2->get_status_strings());
 
         client.remove_observer(obs1);
 
         check_reply(client.connect("localhost", 2121), "220 FTP server is ready.");
         check_reply(client.disconnect(), "221 Goodbye.");
-        ASSERT_EQ("observer1: <- 220 FTP server is ready."
+        ASSERT_EQ("observer1: -- Connected to localhost on port 2121."
+                  "observer1: <- 220 FTP server is ready."
                   "observer1: -> QUIT"
                   "observer1: <- 221 Goodbye.", obs1->get_status_strings());
-        ASSERT_EQ("observer2: <- 220 FTP server is ready."
+        ASSERT_EQ("observer2: -- Connected to localhost on port 2121."
+                  "observer2: <- 220 FTP server is ready."
                   "observer2: -> QUIT"
                   "observer2: <- 221 Goodbye."
+                  "observer2: -- Connected to localhost on port 2121."
                   "observer2: <- 220 FTP server is ready."
                   "observer2: -> QUIT"
                   "observer2: <- 221 Goodbye.", obs2->get_status_strings());