Improved FileStat

Added last_modified() to struct FileStat.
Removed condition #ifdef CPPHTTPLIB_OPENSSL_SUPPORT around ETag
generation.
Adjusted tests.

Author: Spixmaster

httplib.h

@@ -2407,7 +2407,9 @@ struct FileStat {
   FileStat(const std::string &path);
   bool is_file() const;
   bool is_dir() const;
+  std::uint64_t last_modified() const;
 
+private:
 #if defined(_WIN32)
   struct _stat st_;
 #else
@@ -2883,6 +2885,17 @@ inline bool FileStat::is_file() const {
 inline bool FileStat::is_dir() const {
   return ret_ >= 0 && S_ISDIR(st_.st_mode);
 }
+inline std::uint64_t FileStat::last_modified() const {
+  if (is_dir() || is_file()) {
+#if defined(_WIN32)
+    return st_.st_mtime;
+#else
+    return st_.st_mtim.tv_sec;
+#endif
+  } else {
+    throw std::runtime_error("Invalid directory or file.");
+  }
+}
 
 inline std::string encode_path(const std::string &s) {
   std::string result;
@@ -7891,8 +7904,7 @@ inline bool Server::handle_file_request(const Request &req, Response &res) {
             return false;
           }
 
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-          if (is_etag_enabled && stat.ret_ >= 0)
+          if (is_etag_enabled)
             /*
              * The HTTP request header If-Match and If-None-Match can be used
              * with other methods where they have the meaning to only execute if
@@ -7905,10 +7917,9 @@ inline bool Server::handle_file_request(const Request &req, Response &res) {
              */
             if (req.method == "GET" || req.method == "HEAD") {
               // Value for HTTP response header ETag.
-              const std::string file_data(mm->data(), mm->size());
               const std::string etag =
-                  R"(")" + detail::from_i_to_hex(stat.st_.st_mtim.tv_sec) +
-                  "-" + detail::from_i_to_hex(mm->size()) + R"(")";
+                  R"(")" + detail::from_i_to_hex(stat.last_modified()) + "-" +
+                  detail::from_i_to_hex(mm->size()) + R"(")";
 
               /*
                * Weak validation is not used in both cases.
@@ -7973,7 +7984,6 @@ inline bool Server::handle_file_request(const Request &req, Response &res) {
                 }
               }
             }
-#endif
 
           res.set_content_provider(
               mm->size(),

test/test.cc

@@ -10306,17 +10306,24 @@ TEST(UniversalClientImplTest, Ipv6LiteralAddress) {
   EXPECT_EQ(cli.port(), port);
 }
 
-TEST(FileSystemTest, FileAndDirExistenceCheck) {
+TEST(FileSystemTest, FileStatTest) {
   auto file_path = "./www/dir/index.html";
   auto dir_path = "./www/dir";
 
   detail::FileStat stat_file(file_path);
   EXPECT_TRUE(stat_file.is_file());
   EXPECT_FALSE(stat_file.is_dir());
+  EXPECT_GT(stat_file.last_modified(), 0);
 
   detail::FileStat stat_dir(dir_path);
   EXPECT_FALSE(stat_dir.is_file());
   EXPECT_TRUE(stat_dir.is_dir());
+  EXPECT_GT(stat_dir.last_modified(), 0);
+
+  detail::FileStat stat_error("ranipsd");
+  EXPECT_FALSE(stat_error.is_file());
+  EXPECT_FALSE(stat_error.is_dir());
+  EXPECT_THROW(stat_error.last_modified(), std::runtime_error);
 }
 
 TEST(DirtyDataRequestTest, HeadFieldValueContains_CR_LF_NUL) {
@@ -10837,16 +10844,15 @@ TEST(is_etag_enabled, getter_and_setter) {
   EXPECT_TRUE(svr.get_is_etag_enabled());
 }
 
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
 TEST(StaticFileSever, If_Match) {
   detail::FileStat stat("./www/file");
-  ASSERT_GE(stat.ret_, 0);
+  ASSERT_TRUE(stat.is_file());
   auto mm = std::make_shared<detail::mmap>("./www/file");
   ASSERT_TRUE(mm->is_open());
 
   const std::string etag = R"(")" +
-                           detail::from_i_to_hex(stat.st_.st_mtim.tv_sec) +
-                           "-" + detail::from_i_to_hex(mm->size()) + R"(")";
+                           detail::from_i_to_hex(stat.last_modified()) + "-" +
+                           detail::from_i_to_hex(mm->size()) + R"(")";
 
   /*
    * 0: is_etag_enabled = false
@@ -10899,18 +10905,16 @@ TEST(StaticFileSever, If_Match) {
     }
   }
 }
-#endif
 
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
 TEST(StaticFileSever, If_None_Match) {
   detail::FileStat stat("./www/file");
-  ASSERT_GE(stat.ret_, 0);
+  ASSERT_TRUE(stat.is_file());
   auto mm = std::make_shared<detail::mmap>("./www/file");
   ASSERT_TRUE(mm->is_open());
 
   const std::string etag = R"(")" +
-                           detail::from_i_to_hex(stat.st_.st_mtim.tv_sec) +
-                           "-" + detail::from_i_to_hex(mm->size()) + R"(")";
+                           detail::from_i_to_hex(stat.last_modified()) + "-" +
+                           detail::from_i_to_hex(mm->size()) + R"(")";
 
   /*
    * 0: is_etag_enabled = false
@@ -10957,4 +10961,3 @@ TEST(StaticFileSever, If_None_Match) {
     }
   }
 }
-#endif