switch back to boost::filesystem to avoid the requirement of c++17

This commit is contained in:
Chunting Gu
2020-09-07 19:01:31 +08:00
parent e7f88da2b2
commit 84476f75f7
31 changed files with 175 additions and 192 deletions
+8 -7
View File
@@ -2,12 +2,16 @@
#include <iostream>
#include "boost/filesystem/operations.hpp"
#include "json/json.h"
#include "webcc/string.h"
#include "book_json.h"
namespace bfs = boost::filesystem;
BookClient::BookClient(const std::string& url, int timeout)
: url_(url), session_(timeout) {
// Default Content-Type for requests with a body.
@@ -124,8 +128,7 @@ bool BookClient::Delete(const std::string& id) {
}
}
bool BookClient::GetPhoto(const std::string& id,
const std::filesystem::path& path) {
bool BookClient::GetPhoto(const std::string& id, const bfs::path& path) {
try {
auto r = session_.Send(WEBCC_GET(url_).
Path("books").Path(id).Path("photo")(),
@@ -145,8 +148,7 @@ bool BookClient::GetPhoto(const std::string& id,
}
}
bool BookClient::SetPhoto(const std::string& id,
const std::filesystem::path& path) {
bool BookClient::SetPhoto(const std::string& id, const bfs::path& path) {
try {
if (!CheckPhoto(path)) {
return false;
@@ -168,13 +170,12 @@ bool BookClient::SetPhoto(const std::string& id,
}
}
bool BookClient::CheckPhoto(const std::filesystem::path& photo) {
bool BookClient::CheckPhoto(const bfs::path& photo) {
if (photo.empty()) {
return false;
}
if (!std::filesystem::is_regular_file(photo) ||
!std::filesystem::exists(photo)) {
if (!bfs::is_regular_file(photo) || !bfs::exists(photo)) {
return false;
}
+5 -4
View File
@@ -1,10 +1,11 @@
#ifndef BOOK_CLIENT_H_
#define BOOK_CLIENT_H_
#include <filesystem>
#include <list>
#include <string>
#include "boost/filesystem/path.hpp"
#include "json/json-forwards.h"
#include "webcc/client_session.h"
@@ -28,13 +29,13 @@ public:
bool Delete(const std::string& id);
// Get photo, save to the given path.
bool GetPhoto(const std::string& id, const std::filesystem::path& path);
bool GetPhoto(const std::string& id, const boost::filesystem::path& path);
// Set photo using the file of the given path.
bool SetPhoto(const std::string& id, const std::filesystem::path& path);
bool SetPhoto(const std::string& id, const boost::filesystem::path& path);
private:
bool CheckPhoto(const std::filesystem::path& photo);
bool CheckPhoto(const boost::filesystem::path& photo);
// Check HTTP response status.
bool CheckStatus(webcc::ResponsePtr response, int expected_status);
+6 -4
View File
@@ -1,10 +1,13 @@
#include <filesystem>
#include <iostream>
#include "boost/filesystem/operations.hpp"
#include "webcc/logger.h"
#include "book_client.h"
namespace bfs = boost::filesystem;
// -----------------------------------------------------------------------------
void PrintSeparator() {
@@ -36,9 +39,8 @@ int main(int argc, char* argv[]) {
std::string url = argv[1];
std::filesystem::path photo_dir = argv[2];
if (!std::filesystem::is_directory(photo_dir) ||
!std::filesystem::exists(photo_dir)) {
bfs::path photo_dir = argv[2];
if (!bfs::is_directory(photo_dir) || !bfs::exists(photo_dir)) {
std::cerr << "Invalid photo dir!" << std::endl;
return 1;
}