X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross_common.cc;h=e8c209b21e098f8da981bd5676af55c0c00b65ab;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=250db3cd5a5ded8b0f98a3eb7799b214e2931d9a;hpb=59bb9538218eee564ab3c07f923628e0a47bf207;p=dcpomatic.git

diff --git a/src/lib/cross_common.cc b/src/lib/cross_common.cc
index 250db3cd5..e8c209b21 100644
--- a/src/lib/cross_common.cc
+++ b/src/lib/cross_common.cc
@@ -21,12 +21,13 @@
 
 #include "cross.h"
 #include "compose.hpp"
+#include "dcpomatic_assert.h"
 #include "dcpomatic_log.h"
-#include "warnings.h"
 #include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 
@@ -39,6 +40,9 @@ using std::vector;
 using boost::optional;
 
 
+auto constexpr MEDIA_PATH_REQUIRED_MATCHES = 3;
+
+
 Drive::Drive (string xml)
 {
 	cxml::Document doc;
@@ -124,8 +128,6 @@ Drive::log_summary () const
 optional<OSXMediaPath>
 analyse_osx_media_path (string path)
 {
-	using namespace boost::algorithm;
-
 	if (path.find("/IOHDIXController") != string::npos) {
 		/* This is a disk image, so we completely ignore it */
 		LOG_DISK_NC("Ignoring this as it seems to be a disk image");
@@ -133,27 +135,32 @@ analyse_osx_media_path (string path)
 	}
 
 	OSXMediaPath mp;
-	if (starts_with(path, "IODeviceTree:")) {
+	vector<string> parts;
+	split(parts, path, boost::is_any_of("/"));
+	std::copy(parts.begin() + 1, parts.end(), back_inserter(mp.parts));
+
+	if (!parts.empty() && parts[0] == "IODeviceTree:") {
 		mp.real = true;
-	} else if (starts_with(path, "IOService:")) {
+		if (mp.parts.size() < MEDIA_PATH_REQUIRED_MATCHES) {
+			/* Later we expect at least MEDIA_PATH_REQUIRED_MATCHES parts in a IODeviceTree */
+			LOG_DISK_NC("Ignoring this as it has a strange media path");
+			return {};
+		}
+	} else if (!parts.empty() && parts[0] == "IOService:") {
 		mp.real = false;
 	} else {
 		return {};
 	}
 
-	vector<string> bits;
-	split(bits, path, boost::is_any_of("/"));
-	for (auto i: bits) {
-		if (starts_with(i, "PRT")) {
-			mp.prt = i;
-		}
-	}
-
 	return mp;
 }
 
 
-/* This is in _common so we can use it in unit tests */
+/* Take some OSXDisk objects, representing disks that `DARegisterDiskAppearedCallback` told us about,
+ * and find those drives that we could write a DCP to.  The drives returned are "real" (not synthesized)
+ * and are whole disks (not partitions).  They may be mounted, or contain mounted partitions, in which
+ * their mounted() method will return true.
+ */
 vector<Drive>
 osx_disks_to_drives (vector<OSXDisk> disks)
 {
@@ -165,38 +172,44 @@ osx_disks_to_drives (vector<OSXDisk> disks)
 			continue;
 		}
 		for (auto& j: disks) {
-			if (!j.mount_points.empty() && starts_with(j.mount_point, i.mount_point)) {
-				LOG_DISK("Marking %1 as mounted because %2 is", i.mount_point, j.mount_point);
+			if (!j.mount_points.empty() && starts_with(j.device, i.device)) {
+				LOG_DISK("Marking %1 as mounted because %2 is", i.device, j.device);
 				std::copy(j.mount_points.begin(), j.mount_points.end(), back_inserter(i.mount_points));
 			}
 		}
 	}
 
-	/* Make a map of the PRT codes and mount points of mounted, synthesized disks */
-	map<string, vector<boost::filesystem::path>> mounted_synths;
-	for (auto const& i: disks) {
-		if (!i.real && !i.mount_points.empty()) {
-			LOG_DISK("Found a mounted synth %1 with %2", i.mount_point, i.prt);
-			mounted_synths[i.prt] = i.mount_points;
-		}
-	}
-
-	/* Mark containers of those mounted synths as themselves mounted */
+	/* Mark containers of mounted synths as themselves mounted */
 	for (auto& i: disks) {
-		if (i.real) {
-			auto j = mounted_synths.find(i.prt);
-			if (j != mounted_synths.end()) {
-				LOG_DISK("Marking %1 (%2) as mounted because it contains a mounted synth", i.mount_point, i.prt);
-				std::copy(j->second.begin(), j->second.end(), back_inserter(i.mount_points));
+		if (i.media_path.real) {
+			for (auto& j: disks) {
+				if (!j.media_path.real && !j.mount_points.empty()) {
+					/* i is real, j is a mounted synth; if we see the first MEDIA_PATH_REQUIRED_MATCHES parts
+					 * of i anywhere in j we assume they are related and so i shares j's mount points.
+					 */
+					bool one_missing = false;
+					string all_parts;
+					DCPOMATIC_ASSERT (i.media_path.parts.size() >= MEDIA_PATH_REQUIRED_MATCHES);
+					for (auto k = 0; k < MEDIA_PATH_REQUIRED_MATCHES; ++k) {
+						if (find(j.media_path.parts.begin(), j.media_path.parts.end(), i.media_path.parts[k]) == j.media_path.parts.end()) {
+							one_missing = true;
+						}
+						all_parts += i.media_path.parts[k] + " ";
+					}
+
+					if (!one_missing) {
+						LOG_DISK("Marking %1 as mounted because %2 is (found %3)", i.device, j.device, all_parts);
+						std::copy(j.mount_points.begin(), j.mount_points.end(), back_inserter(i.mount_points));
+					}
+				}
 			}
 		}
 	}
 
 	vector<Drive> drives;
 	for (auto const& i: disks) {
-		if (i.whole) {
-			/* A whole disk that is not a container for a mounted synth */
-			drives.push_back(Drive(i.mount_point, i.mount_points, i.size, i.vendor, i.model));
+		if (i.whole && i.media_path.real) {
+			drives.push_back(Drive(i.device, i.mount_points, i.size, i.vendor, i.model));
 			LOG_DISK_NC(drives.back().log_summary());
 		}
 	}