replace boost filesystem with std filesystem; upgrade gtest and find it using cmake.
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
#include <filesystem>
|
||||
#include <iostream>
|
||||
|
||||
#include "boost/filesystem/operations.hpp"
|
||||
|
||||
#include "webcc/logger.h"
|
||||
#include "webcc/server.h"
|
||||
|
||||
@@ -28,16 +27,17 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
std::uint16_t port = static_cast<std::uint16_t>(std::atoi(argv[1]));
|
||||
|
||||
bfs::path upload_dir = argv[2];
|
||||
if (!bfs::is_directory(upload_dir) || !bfs::exists(upload_dir)) {
|
||||
std::filesystem::path upload_dir = argv[2];
|
||||
if (!std::filesystem::is_directory(upload_dir) ||
|
||||
!std::filesystem::exists(upload_dir)) {
|
||||
std::cerr << "Invalid upload dir!" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Add a sub-dir for book photos.
|
||||
bfs::path photo_dir = upload_dir / "books";
|
||||
if (!bfs::exists(photo_dir)) {
|
||||
bfs::create_directory(photo_dir);
|
||||
std::filesystem::path photo_dir = upload_dir / "books";
|
||||
if (!std::filesystem::exists(photo_dir)) {
|
||||
std::filesystem::create_directory(photo_dir);
|
||||
}
|
||||
|
||||
std::cout << "Book photos will be saved to: " << photo_dir << std::endl;
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
#include "json/json.h"
|
||||
|
||||
#include "boost/filesystem/operations.hpp"
|
||||
#include "webcc/response_builder.h"
|
||||
|
||||
#include "book.h"
|
||||
@@ -54,7 +53,7 @@ webcc::ResponsePtr BookListView::Post(webcc::RequestPtr request) {
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
BookDetailView::BookDetailView(bfs::path photo_dir)
|
||||
BookDetailView::BookDetailView(std::filesystem::path photo_dir)
|
||||
: photo_dir_(std::move(photo_dir)) {
|
||||
}
|
||||
|
||||
@@ -122,8 +121,8 @@ webcc::ResponsePtr BookDetailView::Delete(webcc::RequestPtr request) {
|
||||
|
||||
// Delete the photo from file system.
|
||||
if (!photo_name.empty()) {
|
||||
boost::system::error_code ec;
|
||||
bfs::remove(photo_dir_ / photo_name, ec);
|
||||
std::error_code ec;
|
||||
std::filesystem::remove(photo_dir_ / photo_name, ec);
|
||||
}
|
||||
|
||||
return webcc::ResponseBuilder{}.OK()();
|
||||
@@ -131,7 +130,7 @@ webcc::ResponsePtr BookDetailView::Delete(webcc::RequestPtr request) {
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
BookPhotoView::BookPhotoView(bfs::path photo_dir)
|
||||
BookPhotoView::BookPhotoView(std::filesystem::path photo_dir)
|
||||
: photo_dir_(std::move(photo_dir)) {
|
||||
}
|
||||
|
||||
@@ -161,8 +160,8 @@ webcc::ResponsePtr BookPhotoView::Get(webcc::RequestPtr request) {
|
||||
return webcc::ResponseBuilder{}.NotFound()();
|
||||
}
|
||||
|
||||
bfs::path photo_path = photo_dir_ / book.photo;
|
||||
if (!bfs::exists(photo_path)) {
|
||||
std::filesystem::path photo_path = photo_dir_ / book.photo;
|
||||
if (!std::filesystem::exists(photo_path)) {
|
||||
return webcc::ResponseBuilder{}.NotFound()();
|
||||
}
|
||||
|
||||
@@ -216,8 +215,8 @@ webcc::ResponsePtr BookPhotoView::Delete(webcc::RequestPtr request) {
|
||||
}
|
||||
|
||||
// Error handling is simplified.
|
||||
boost::system::error_code ec;
|
||||
bfs::remove(photo_dir_ / book.photo, ec);
|
||||
std::error_code ec;
|
||||
std::filesystem::remove(photo_dir_ / book.photo, ec);
|
||||
|
||||
return webcc::ResponseBuilder{}.OK()();
|
||||
}
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
#ifndef VIEWS_H_
|
||||
#define VIEWS_H_
|
||||
|
||||
#include <filesystem>
|
||||
|
||||
#include "webcc/view.h"
|
||||
|
||||
#include "boost/filesystem/path.hpp"
|
||||
|
||||
namespace bfs = boost::filesystem;
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
// URL: /books
|
||||
@@ -27,7 +25,7 @@ private:
|
||||
// URL: /books/{id}
|
||||
class BookDetailView : public webcc::View {
|
||||
public:
|
||||
explicit BookDetailView(bfs::path photo_dir);
|
||||
explicit BookDetailView(std::filesystem::path photo_dir);
|
||||
|
||||
webcc::ResponsePtr Handle(webcc::RequestPtr request) override;
|
||||
|
||||
@@ -42,7 +40,7 @@ private:
|
||||
webcc::ResponsePtr Delete(webcc::RequestPtr request);
|
||||
|
||||
private:
|
||||
bfs::path photo_dir_;
|
||||
std::filesystem::path photo_dir_;
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
@@ -50,7 +48,7 @@ private:
|
||||
// URL: /books/{id}/photo
|
||||
class BookPhotoView : public webcc::View {
|
||||
public:
|
||||
explicit BookPhotoView(bfs::path photo_dir);
|
||||
explicit BookPhotoView(std::filesystem::path photo_dir);
|
||||
|
||||
webcc::ResponsePtr Handle(webcc::RequestPtr request) override;
|
||||
|
||||
@@ -70,7 +68,7 @@ private:
|
||||
webcc::ResponsePtr Delete(webcc::RequestPtr request);
|
||||
|
||||
private:
|
||||
bfs::path photo_dir_;
|
||||
std::filesystem::path photo_dir_;
|
||||
};
|
||||
|
||||
#endif // VIEWS_H_
|
||||
|
||||
Reference in New Issue
Block a user