UnknownObject/WebCC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
webcc/body.cc
+11 -7
View File
@@ -1,5 +1,7 @@
#include "webcc/body.h"
#include "boost/filesystem/operations.hpp"
#include "webcc/logger.h"
#include "webcc/utility.h"
@@ -7,6 +9,8 @@
#include "webcc/gzip.h"
#endif
namespace bfs = boost::filesystem;
namespace webcc {
// -----------------------------------------------------------------------------
@@ -153,7 +157,7 @@ void FormBody::Free(std::size_t index) {
// -----------------------------------------------------------------------------
FileBody::FileBody(const std::filesystem::path& path, std::size_t chunk_size)
FileBody::FileBody(const bfs::path& path, std::size_t chunk_size)
: path_(path), chunk_size_(chunk_size), auto_delete_(false), size_(0) {
size_ = utility::TellSize(path_);
if (size_ == kInvalidLength) {
@@ -161,15 +165,15 @@ FileBody::FileBody(const std::filesystem::path& path, std::size_t chunk_size)
}
}
FileBody::FileBody(const std::filesystem::path& path, bool auto_delete)
FileBody::FileBody(const bfs::path& path, bool auto_delete)
: path_(path), chunk_size_(0), auto_delete_(auto_delete), size_(0) {
// Don't need to tell file size.
}
FileBody::~FileBody() {
if (auto_delete_ && !path_.empty()) {
std::error_code ec;
std::filesystem::remove(path_, ec);
boost::system::error_code ec;
bfs::remove(path_, ec);
if (ec) {
LOG_ERRO("Failed to remove file (%s).", ec.message().c_str());
}
@@ -205,7 +209,7 @@ void FileBody::Dump(std::ostream& os, const std::string& prefix) const {
os << prefix << "<file: " << path_.string() << ">" << std::endl;
}
bool FileBody::Move(const std::filesystem::path& new_path) {
bool FileBody::Move(const bfs::path& new_path) {
if (path_ == new_path) {
return false;
}
@@ -214,8 +218,8 @@ bool FileBody::Move(const std::filesystem::path& new_path) {
ifstream_.close();
}
std::error_code ec;
std::filesystem::rename(path_, new_path, ec);
boost::system::error_code ec;
bfs::rename(path_, new_path, ec);
if (ec) {
LOG_ERRO("Failed to rename file (%s).", ec.message().c_str());