workshop/{Library,Plan}*: use directory FileDescriptor instead of std::filesystem

Author: MaxKellermann

src/workshop/Library.hxx

@@ -5,9 +5,9 @@
 #pragma once
 
 #include "io/Logger.hxx"
+#include "io/UniqueFileDescriptor.hxx"
 
 #include <chrono>
-#include <filesystem>
 #include <memory>
 #include <string>
 #include <map>
@@ -53,7 +53,8 @@ class Library {
 
 	const LLogger logger;
 
-	const std::filesystem::path path;
+	const std::string path;
+	const UniqueFileDescriptor directory_fd;
 
 	std::map<std::string, PlanEntry, std::less<>> plans;
 
@@ -63,14 +64,12 @@ class Library {
 	struct statx_timestamp mtime{};
 
 public:
-	explicit Library(std::filesystem::path &&_path) noexcept
-		:logger("library"),
-		 path(std::move(_path)) {}
+	explicit Library(const char *path);
 
 	Library(const Library &other) = delete;
 
-	const std::filesystem::path &GetPath() const noexcept {
-		return path;
+	const FileDescriptor GetDirectory() const noexcept {
+		return directory_fd;
 	}
 
 	/**

src/workshop/MultiLibrary.hxx

@@ -16,8 +16,8 @@ class MultiLibrary {
 	std::forward_list<Library> libraries;
 
 public:
-	void InsertPath(std::filesystem::path &&_path) {
-		libraries.emplace_front(std::move(_path));
+	void InsertPath(const char *_path) {
+		libraries.emplace_front(_path);
 	}
 
 	bool Update(std::chrono::steady_clock::time_point now, bool force) {

src/workshop/PlanLibrary.cxx

@@ -6,10 +6,12 @@
 #include "Plan.hxx"
 #include "StatxTimestamp.hxx"
 #include "lib/fmt/ExceptionFormatter.hxx"
+#include "io/DirectoryReader.hxx"
+#include "io/FileAt.hxx"
+#include "io/FileName.hxx"
+#include "io/Open.hxx"
 #include "util/CharUtil.hxx"
 
-#include <fmt/std.h>
-
 #include <assert.h>
 #include <fcntl.h> // for AT_*
 #include <unistd.h>
@@ -20,6 +22,11 @@
 #include <sys/stat.h>
 #include <time.h>
 
+Library::Library(const char *_path)
+	:logger("library"),
+	 path(_path),
+	 directory_fd(OpenPath(_path, O_DIRECTORY)) {}
+
 static constexpr bool
 is_valid_plan_name_char(char ch) noexcept
 {
@@ -52,29 +59,29 @@ Library::UpdatePlans(std::chrono::steady_clock::time_point now)
 
 	bool modified = false;
 
-	for (const auto &entry : std::filesystem::directory_iterator(path)) {
-		const auto name = entry.path().filename();
-		if (!is_valid_plan_name(name.c_str()))
+	DirectoryReader dr{OpenDirectory({directory_fd, "."})};
+	while (const char *filename = dr.Read()) {
+		if (IsSpecialFilename(filename) || !is_valid_plan_name(filename))
 			continue;
 
-		auto old_i = old_plans.find(name.native());
+		auto old_i = old_plans.find(filename);
 		decltype(old_i) i;
 
 		if (old_i != old_plans.end()) {
 			i = plans.emplace(std::piecewise_construct,
-					  std::forward_as_tuple(name.native()),
+					  std::forward_as_tuple(filename),
 					  std::forward_as_tuple(std::move(old_i->second)))
 				.first;
 			old_plans.erase(old_i);
 		} else {
 			i = plans.emplace(std::piecewise_construct,
-					  std::forward_as_tuple(name.native()),
+					  std::forward_as_tuple(filename),
 					  std::forward_as_tuple())
 				.first;
 			modified = true;
 		}
 
-		if (UpdatePlan(name.c_str(), i->second, now))
+		if (UpdatePlan(filename, i->second, now))
 			modified = true;
 	}
 

src/workshop/PlanUpdate.cxx

@@ -9,8 +9,6 @@
 #include "lib/fmt/ExceptionFormatter.hxx"
 #include "util/Exception.hxx"
 
-#include <fmt/std.h>
-
 #include <assert.h>
 #include <fcntl.h> // for AT_*
 #include <stdlib.h>
@@ -33,16 +31,14 @@ Library::CheckPlanModified(const char *name, PlanEntry &entry,
 {
 	int ret;
 
-	const auto plan_path = GetPath() / name;
-
 	struct statx stx;
-	ret = statx(-1, plan_path.c_str(), AT_STATX_FORCE_SYNC,
+	ret = statx(directory_fd.Get(), name, AT_STATX_FORCE_SYNC,
 		    STATX_TYPE|STATX_MTIME,
 		    &stx);
 	if (ret < 0) {
 		if (ret != ENOENT)
-			logger.Fmt(2, "failed to stat {:?}: {}",
-				   plan_path, strerror(errno));
+			logger.Fmt(2, "failed to stat {:?}/{:?}: {}",
+				   path, name, strerror(errno));
 
 		entry.Clear();
 
@@ -114,7 +110,7 @@ Library::LoadPlan(const char *name, PlanEntry &entry,
 
 	logger.Fmt(6, "loading plan {:?}", name);
 
-	const auto plan_path = GetPath() / name;
+	const auto plan_path = fmt::format("{}/{}", path, name);
 
 	try {
 		entry.plan.reset(new Plan(LoadPlanFile(plan_path)));