#include "exceptions.h"
#include "ext.h"
#include "nanomsg.h"
+#include <dcp/file.h>
#ifdef DCPOMATIC_LINUX
#include <linux/fs.h>
#include <lwext4/ext4_mkfs.h>
}
#include <boost/filesystem.hpp>
+#include <chrono>
#include <string>
void
count (boost::filesystem::path dir, uint64_t& total_bytes)
{
- dir = fix_long_path (dir);
+ dir = dcp::fix_long_path (dir);
using namespace boost::filesystem;
for (auto i: directory_iterator(dir)) {
}
}
+
+static
+void
+set_timestamps_to_now (boost::filesystem::path path)
+{
+ auto const now = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count();
+ ext4_mtime_set (path.generic_string().c_str(), now);
+ ext4_ctime_set (path.generic_string().c_str(), now);
+ ext4_atime_set (path.generic_string().c_str(), now);
+}
+
+
static
string
write (boost::filesystem::path from, boost::filesystem::path to, uint64_t& total_remaining, uint64_t total, Nanomsg* nanomsg)
throw CopyError (String::compose("Failed to open file %1", to.generic_string()), r);
}
- FILE* in = fopen_boost (from, "rb");
+ dcp::File in(from, "rb");
if (!in) {
ext4_fclose (&out);
throw CopyError (String::compose("Failed to open file %1", from.string()), 0);
}
- uint8_t* buffer = new uint8_t[block_size];
+ std::vector<uint8_t> buffer(block_size);
Digester digester;
int progress_frequency = 1;
uint64_t remaining = file_size (from);
while (remaining > 0) {
uint64_t const this_time = min(remaining, block_size);
- size_t read = fread (buffer, 1, this_time, in);
+ size_t read = in.read(buffer.data(), 1, this_time);
if (read != this_time) {
- fclose (in);
ext4_fclose (&out);
- delete[] buffer;
throw CopyError (String::compose("Short read; expected %1 but read %2", this_time, read), 0);
}
- digester.add (buffer, this_time);
+ digester.add (buffer.data(), this_time);
size_t written;
- r = ext4_fwrite (&out, buffer, this_time, &written);
+ r = ext4_fwrite (&out, buffer.data(), this_time, &written);
if (r != EOK) {
- fclose (in);
ext4_fclose (&out);
- delete[] buffer;
throw CopyError ("Write failed", r);
}
if (written != this_time) {
- fclose (in);
ext4_fclose (&out);
- delete[] buffer;
throw CopyError (String::compose("Short write; expected %1 but wrote %2", this_time, written), 0);
}
remaining -= this_time;
}
}
- fclose (in);
ext4_fclose (&out);
- delete[] buffer;
+
+ set_timestamps_to_now (to);
return digester.get ();
}
}
LOG_DISK("Opened %1 for read", to.generic_string());
- uint8_t* buffer = new uint8_t[block_size];
+ std::vector<uint8_t> buffer(block_size);
Digester digester;
uint64_t remaining = file_size (from);
while (remaining > 0) {
uint64_t const this_time = min(remaining, block_size);
size_t read;
- r = ext4_fread (&in, buffer, this_time, &read);
+ r = ext4_fread (&in, buffer.data(), this_time, &read);
if (read != this_time) {
ext4_fclose (&in);
- delete[] buffer;
throw VerifyError (String::compose("Short read; expected %1 but read %2", this_time, read), 0);
}
- digester.add (buffer, this_time);
+ digester.add (buffer.data(), this_time);
remaining -= this_time;
total_remaining -= this_time;
if (nanomsg) {
}
ext4_fclose (&in);
- delete[] buffer;
return digester.get ();
}
copy (boost::filesystem::path from, boost::filesystem::path to, uint64_t& total_remaining, uint64_t total, vector<CopiedFile>& copied_files, Nanomsg* nanomsg)
{
LOG_DISK ("Copy %1 -> %2", from.string(), to.generic_string());
- from = fix_long_path (from);
+ from = dcp::fix_long_path (from);
using namespace boost::filesystem;
if (r != EOK) {
throw CopyError (String::compose("Failed to create directory %1", cr.generic_string()), r);
}
+ set_timestamps_to_now (cr);
- for (directory_iterator i = directory_iterator(from); i != directory_iterator(); ++i) {
- copy (i->path(), cr, total_remaining, total, copied_files, nanomsg);
+ for (auto i: directory_iterator(from)) {
+ copy (i.path(), cr, total_remaining, total, copied_files, nanomsg);
}
} else {
string const write_digest = write (from, cr, total_remaining, total, nanomsg);
parts.division[2] = 0;
parts.division[3] = 0;
-#ifdef DCPOMATIC_LINUX
- PrivilegeEscalator e;
-#endif
-
/* XXX: not sure if disk_id matters */
int r = ext4_mbr_write (bd, &parts, 0);
if (r) {