void disk_write_finished ();
+
+struct OSXMediaPath
+{
+ bool real; ///< true for a "real" disk, false for a synthesized APFS one
+ std::string prt; ///< "PRT" entry from the media path
+};
+
+
+boost::optional<OSXMediaPath> analyse_osx_media_path (std::string path);
+
+
#endif
DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
DCPOMATIC_ENABLE_WARNINGS
+#include <boost/algorithm/string.hpp>
#include <iostream>
#include "i18n.h"
using std::string;
+using std::vector;
+using boost::optional;
Drive::Drive (string xml)
_device, mp, _size, _vendor.get_value_or("[none]"), _model.get_value_or("[none]")
);
}
+
+
+
+/* This is in _common so we can use it in unit tests */
+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");
+ return {};
+ }
+
+ OSXMediaPath mp;
+ if (starts_with(path, "IODeviceTree:")) {
+ mp.real = true;
+ } else if (starts_with(path, "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;
+}
+
+
}
-struct MediaPath
-{
- bool real; ///< true for a "real" disk, false for a synthesized APFS one
- std::string prt; ///< "PRT" entry from the media path
-};
-
-
-static optional<MediaPath>
+static optional<OSXMediaPath>
analyse_media_path (CFDictionaryRef& description)
{
using namespace boost::algorithm;
string path(path_key_cstr);
LOG_DISK("MediaPathKey is %1", path);
-
- 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");
- return {};
- }
-
- MediaPath mp;
- if (starts_with(path, "IODeviceTree:")) {
- mp.real = true;
- } else if (starts_with(path, "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;
+ return analyse_osx_media_path (path);
}
}
LOG_DISK(
- "%1 prt %2 whole %3 mounted %4",
+ "%1 prt=%2 %3 %4",
this_disk.real ? "Real" : "Synth",
this_disk.prt,
this_disk.whole ? "whole" : "part",