Updated es_ES translation from Manuel AC.

[dcpomatic.git] / src / lib / ext.cc

diff --git a/src/lib/ext.cc b/src/lib/ext.cc
index b88a88726b99c6f79fc5b91398b2a54487ec8281..feba68c1f6eec9c15951b1fa70cf010b6843fafd 100644 (file)
--- a/src/lib/ext.cc
+++ b/src/lib/ext.cc
@@ -78,12 +78,14 @@ static
 void
 count (boost::filesystem::path dir, uint64_t& total_bytes)
 {
+       dir = fix_long_path (dir);
+
        using namespace boost::filesystem;
-       for (directory_iterator i = directory_iterator(dir); i != directory_iterator(); ++i) {
-               if (is_directory(*i)) {
-                       count (*i, total_bytes);
+       for (auto i: directory_iterator(dir)) {
+               if (is_directory(i)) {
+                       count (i, total_bytes);
                } else {
-                       total_bytes += file_size (*i);
+                       total_bytes += file_size (i);
                }
        }
 }
@@ -218,6 +220,7 @@ void
 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);
 
        using namespace boost::filesystem;
 
@@ -301,10 +304,6 @@ try
        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) {
@@ -331,6 +330,18 @@ try
        file_windows_partition_set (bdevs.partitions[0].part_offset, bdevs.partitions[0].part_size);
 #else
        file_dev_name_set (posix_partition.c_str());
+
+       /* On macOS (at least) if you try to write to a drive that is sleeping the ext4_mkfs call
+        * below is liable to return EIO because it can't open the device.  Try to work around that
+        * here by opening and closing the device, waiting 5 seconds if it fails.
+        */
+       int wake = open(posix_partition.c_str(), O_RDWR);
+       if (wake == -1) {
+               dcpomatic_sleep_seconds (5);
+       } else {
+               close(wake);
+       }
+
        bd = file_dev_get ();
 #endif