Fs copy fix for "Invalid cross-device link" (#886)

* swap boost copy_file for std::filesystem * either/or file_copy
robotastic · Dec 6, 2023 · da711fe · da711fe
1 parent a1db105
commit da711fe
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/trunk-recorder/call_concluder/call_concluder.cc b/trunk-recorder/call_concluder/call_concluder.cc
@@ -143,14 +143,24 @@ void remove_call_files(Call_Data_t call_info) {
       // if the files are being archived, move them to the capture directory
       for (std::vector<Transmission>::iterator it = call_info.transmission_list.begin(); it != call_info.transmission_list.end(); ++it) {
         Transmission t = *it;
-        boost::filesystem::path target_file = boost::filesystem::path(fs::path(call_info.filename ).replace_filename(fs::path(t.filename).filename()));
-        boost::filesystem::path transmission_file = t.filename;
-        //boost::filesystem::path target_file = boost::filesystem::path(call_info.filename).replace_filename(transmission_file.filename()); // takes the capture dir from the call file and adds the transmission filename to it
-
+
         // Only move transmission wavs if they exist
         if (checkIfFile(t.filename)) {
-          boost::filesystem::copy_file(transmission_file, target_file); 
+
+          // Prevent "boost::filesystem::copy_file: Invalid cross-device link" errors by using std::filesystem if boost < 1.76
+          // This issue exists for old boost versions OR 5.x kernels
+          #if (BOOST_VERSION/100000) == 1 && ((BOOST_VERSION/100)%1000) < 76
+            fs::path target_file = fs::path(fs::path(call_info.filename ).replace_filename(fs::path(t.filename).filename()));
+            fs::path transmission_file = t.filename;      
+            fs::copy_file(transmission_file, target_file); 
+          #else
+            boost::filesystem::path target_file = boost::filesystem::path(call_info.filename ).replace_filename(boost::filesystem::path(t.filename).filename());
+            boost::filesystem::path transmission_file = t.filename;
+            boost::filesystem::copy_file(transmission_file, target_file); 
+          #endif
+        //boost::filesystem::path target_file = boost::filesystem::path(call_info.filename).replace_filename(transmission_file.filename()); // takes the capture dir from the call file and adds the transmission filename to it
         }
+
       }
     }