replace boost filesystem with std filesystem; upgrade gtest and find it using cmake.
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
#include <iostream>
|
||||
|
||||
#include "boost/algorithm/string/predicate.hpp"
|
||||
#include "boost/filesystem/operations.hpp"
|
||||
#include "json/json.h"
|
||||
|
||||
#include "book_json.h"
|
||||
@@ -125,7 +124,8 @@ bool BookClient::Delete(const std::string& id) {
|
||||
}
|
||||
}
|
||||
|
||||
bool BookClient::GetPhoto(const std::string& id, const bfs::path& path) {
|
||||
bool BookClient::GetPhoto(const std::string& id,
|
||||
const std::filesystem::path& path) {
|
||||
try {
|
||||
auto r = session_.Send(WEBCC_GET(url_).
|
||||
Path("books").Path(id).Path("photo")(),
|
||||
@@ -145,7 +145,8 @@ bool BookClient::GetPhoto(const std::string& id, const bfs::path& path) {
|
||||
}
|
||||
}
|
||||
|
||||
bool BookClient::SetPhoto(const std::string& id, const bfs::path& path) {
|
||||
bool BookClient::SetPhoto(const std::string& id,
|
||||
const std::filesystem::path& path) {
|
||||
try {
|
||||
if (!CheckPhoto(path)) {
|
||||
return false;
|
||||
@@ -167,12 +168,13 @@ bool BookClient::SetPhoto(const std::string& id, const bfs::path& path) {
|
||||
}
|
||||
}
|
||||
|
||||
bool BookClient::CheckPhoto(const bfs::path& photo) {
|
||||
bool BookClient::CheckPhoto(const std::filesystem::path& photo) {
|
||||
if (photo.empty()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!bfs::is_regular_file(photo) || !bfs::exists(photo)) {
|
||||
if (!std::filesystem::is_regular_file(photo) ||
|
||||
!std::filesystem::exists(photo)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#ifndef BOOK_CLIENT_H_
|
||||
#define BOOK_CLIENT_H_
|
||||
|
||||
#include <filesystem>
|
||||
#include <list>
|
||||
#include <string>
|
||||
|
||||
@@ -11,8 +12,6 @@
|
||||
|
||||
#include "book.h"
|
||||
|
||||
namespace bfs = boost::filesystem;
|
||||
|
||||
class BookClient {
|
||||
public:
|
||||
explicit BookClient(const std::string& url, int timeout = 0);
|
||||
@@ -30,13 +29,13 @@ public:
|
||||
bool Delete(const std::string& id);
|
||||
|
||||
// Get photo, save to the given path.
|
||||
bool GetPhoto(const std::string& id, const bfs::path& path);
|
||||
bool GetPhoto(const std::string& id, const std::filesystem::path& path);
|
||||
|
||||
// Set photo using the file of the given path.
|
||||
bool SetPhoto(const std::string& id, const bfs::path& path);
|
||||
bool SetPhoto(const std::string& id, const std::filesystem::path& path);
|
||||
|
||||
private:
|
||||
bool CheckPhoto(const bfs::path& photo);
|
||||
bool CheckPhoto(const std::filesystem::path& photo);
|
||||
|
||||
// Check HTTP response status.
|
||||
bool CheckStatus(webcc::ResponsePtr response, int expected_status);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <filesystem>
|
||||
#include <iostream>
|
||||
|
||||
#include "boost/filesystem/operations.hpp"
|
||||
#include "webcc/logger.h"
|
||||
|
||||
#include "book_client.h"
|
||||
@@ -45,8 +45,9 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
std::string url = argv[1];
|
||||
|
||||
bfs::path photo_dir = argv[2];
|
||||
if (!bfs::is_directory(photo_dir) || !bfs::exists(photo_dir)) {
|
||||
std::filesystem::path photo_dir = argv[2];
|
||||
if (!std::filesystem::is_directory(photo_dir) ||
|
||||
!std::filesystem::exists(photo_dir)) {
|
||||
std::cerr << "Invalid photo dir!" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user