/*
- Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#include "cross.h"
#include "compose.hpp"
#include "log.h"
#include "dcpomatic_log.h"
#include "config.h"
#include "exceptions.h"
+#include <dcp/filesystem.h>
#include <dcp/raw_convert.h>
#include <glib.h>
-extern "C" {
-#include <libavformat/avio.h>
-}
#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
#include <boost/regex.hpp>
+#if BOOST_VERSION >= 106100
+#include <boost/dll/runtime_symbol_info.hpp>
+#endif
+#include <ApplicationServices/ApplicationServices.h>
#include <sys/sysctl.h>
#include <mach-o/dyld.h>
#include <IOKit/pwr_mgt/IOPMLib.h>
#include "i18n.h"
+
using std::pair;
using std::list;
using std::ifstream;
using std::string;
-using std::wstring;
using std::make_pair;
using std::vector;
using std::cerr;
using std::cout;
using std::runtime_error;
using std::map;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
-using boost::function;
+using std::function;
-/** @param s Number of seconds to sleep for */
-void
-dcpomatic_sleep_seconds (int s)
-{
- sleep (s);
-}
-
-void
-dcpomatic_sleep_milliseconds (int ms)
-{
- usleep (ms * 1000);
-}
/** @return A string of CPU information (model name etc.) */
string
char buffer[64];
size_t N = sizeof (buffer);
- if (sysctlbyname ("machdep.cpu.brand_string", buffer, &N, 0, 0) == 0) {
+ if (sysctlbyname("machdep.cpu.brand_string", buffer, &N, 0, 0) == 0) {
info = buffer;
}
return info;
}
-/** @return Path of the Contents directory in the .app */
+
boost::filesystem::path
-app_contents ()
+directory_containing_executable ()
{
- /* Could use boost::dll::program_location().parent_path().parent_path() but that
- * boost library isn't in the 10.6 environment we're currently using and I don't
- * really want to change it right now.
- */
- uint32_t size = 1024;
- char buffer[size];
- if (_NSGetExecutablePath (buffer, &size)) {
- throw runtime_error ("_NSGetExecutablePath failed");
- }
+ return dcp::filesystem::canonical(boost::dll::program_location()).parent_path();
+}
+
- boost::filesystem::path path (buffer);
- path = boost::filesystem::canonical (path);
- path = path.parent_path ();
- path = path.parent_path ();
- return path;
+boost::filesystem::path
+resources_path ()
+{
+ return directory_containing_executable().parent_path() / "Resources";
}
+
boost::filesystem::path
-shared_path ()
+libdcp_resources_path ()
{
- return app_contents() / "Resources";
+ return resources_path();
}
+
void
-run_ffprobe (boost::filesystem::path content, boost::filesystem::path out)
+run_ffprobe(boost::filesystem::path content, boost::filesystem::path out, bool err, string args)
{
- boost::filesystem::path path = app_contents();
- path /= "MacOS";
- path /= "ffprobe";
+ auto path = directory_containing_executable () / "ffprobe";
+ if (!dcp::filesystem::exists(path)) {
+ /* This is a hack but we need ffprobe during tests */
+ path = "/Users/ci/workspace/bin/ffprobe";
+ }
+ string const redirect = err ? "2>" : ">";
- string ffprobe = "\"" + path.string() + "\" \"" + content.string() + "\" 2> \"" + out.string() + "\"";
+ auto const ffprobe = String::compose("\"%1\" %2 \"%3\" %4 \"%5\"", path, args.empty() ? " " : args, content.string(), redirect, out.string());
LOG_GENERAL (N_("Probing with %1"), ffprobe);
- system (ffprobe.c_str ());
+ system (ffprobe.c_str());
}
-list<pair<string, string> >
+
+
+list<pair<string, string>>
mount_info ()
{
- list<pair<string, string> > m;
- return m;
+ return {};
}
+
boost::filesystem::path
openssl_path ()
{
- boost::filesystem::path path = app_contents();
- path /= "MacOS";
- path /= "openssl";
- return path;
+ return directory_containing_executable() / "openssl";
}
+
#ifdef DCPOMATIC_DISK
/* Note: this isn't actually used at the moment as the disk writer is started as a service */
boost::filesystem::path
disk_writer_path ()
{
- boost::filesystem::path path = app_contents();
- path /= "MacOS";
- path /= "dcpomatic2_disk_writer";
- return path;
+ return directory_containing_executable() / "dcpomatic2_disk_writer";
}
#endif
-/* Apparently there is no way to create an ofstream using a UTF-8
- filename under Windows. We are hence reduced to using fopen
- with this wrapper.
-*/
-FILE *
-fopen_boost (boost::filesystem::path p, string t)
-{
- return fopen (p.c_str(), t.c_str ());
-}
-
-int
-dcpomatic_fseek (FILE* stream, int64_t offset, int whence)
-{
- return fseek (stream, offset, whence);
-}
void
Waker::nudge ()
}
+
Waker::Waker ()
{
boost::mutex::scoped_lock lm (_mutex);
- /* We should use this */
- // IOPMAssertionCreateWithName (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, CFSTR ("Encoding DCP"), &_assertion_id);
- /* but it's not available on 10.5, so we use this */
- IOPMAssertionCreate (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, &_assertion_id);
+ IOPMAssertionCreateWithName (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, CFSTR ("Encoding DCP"), &_assertion_id);
}
+
Waker::~Waker ()
{
boost::mutex::scoped_lock lm (_mutex);
IOPMAssertionRelease (_assertion_id);
}
+
void
-start_tool (boost::filesystem::path dcpomatic, string executable, string app)
+start_tool (string executable, string app)
{
- boost::filesystem::path batch = dcpomatic.parent_path ();
- batch = batch.parent_path (); // MacOS
- batch = batch.parent_path (); // Contents
- batch = batch.parent_path (); // DCP-o-matic.app
- batch = batch.parent_path (); // Applications
- batch /= app;
- batch /= "Contents";
- batch /= "MacOS";
- batch /= executable;
+ auto exe_path = directory_containing_executable();
+ exe_path = exe_path.parent_path(); // Contents
+ exe_path = exe_path.parent_path(); // DCP-o-matic 2.app
+ exe_path = exe_path.parent_path(); // Applications
+ exe_path /= app;
+ exe_path /= "Contents";
+ exe_path /= "MacOS";
+ exe_path /= executable;
pid_t pid = fork ();
if (pid == 0) {
- int const r = system (batch.string().c_str());
+ LOG_GENERAL ("start_tool %1 %2 with path %3", executable, app, exe_path.string());
+ int const r = system (exe_path.string().c_str());
exit (WEXITSTATUS (r));
+ } else if (pid == -1) {
+ LOG_ERROR_NC("Fork failed in start_tool");
}
}
-void
-start_batch_converter (boost::filesystem::path dcpomatic)
-{
- start_tool (dcpomatic, "dcpomatic2_batch", "DCP-o-matic\\ 2\\ Batch\\ Converter.app");
-}
void
-start_player (boost::filesystem::path dcpomatic)
-{
- start_tool (dcpomatic, "dcpomatic2_player", "DCP-o-matic\\ 2\\ Player.app");
-}
-
-uint64_t
-thread_id ()
+start_batch_converter ()
{
- return (uint64_t) pthread_self ();
+ start_tool ("dcpomatic2_batch", "DCP-o-matic\\ 2\\ Batch\\ Converter.app");
}
-int
-avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags)
-{
- return avio_open (s, file.c_str(), flags);
-}
-boost::filesystem::path
-home_directory ()
-{
- return getenv("HOME");
-}
-
-string
-command_and_read (string cmd)
+void
+start_player ()
{
- return "";
+ start_tool ("dcpomatic2_player", "DCP-o-matic\\ 2\\ Player.app");
}
-/** @return true if this process is a 32-bit one running on a 64-bit-capable OS */
-bool
-running_32_on_64 ()
-{
- /* I'm assuming nobody does this on OS X */
- return false;
-}
static optional<string>
get_vendor (CFDictionaryRef& description)
{
void const* str = CFDictionaryGetValue (description, kDADiskDescriptionDeviceVendorKey);
if (!str) {
- return optional<string>();
+ return {};
+ }
+
+ auto c_str = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8);
+ if (!c_str) {
+ return {};
}
- string s = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8);
+ string s (c_str);
boost::algorithm::trim (s);
return s;
}
+
static optional<string>
get_model (CFDictionaryRef& description)
{
void const* str = CFDictionaryGetValue (description, kDADiskDescriptionDeviceModelKey);
if (!str) {
- return optional<string>();
+ return {};
+ }
+
+ auto c_str = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8);
+ if (!c_str) {
+ return {};
}
- string s = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8);
+ string s (c_str);
boost::algorithm::trim (s);
return s;
}
-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;
void const* str = CFDictionaryGetValue (description, kDADiskDescriptionMediaPathKey);
if (!str) {
- return optional<MediaPath>();
+ LOG_DISK_NC("There is no MediaPathKey (no dictionary value)");
+ return {};
}
- string path(CFStringGetCStringPtr((CFStringRef) str, kCFStringEncodingUTF8));
- MediaPath mp;
- if (starts_with(path, "IODeviceTree:")) {
- mp.real = true;
- } else if (starts_with(path, "IOService:")) {
- mp.real = false;
- } else {
- return optional<MediaPath>();
+ auto path_key_cstr = CFStringGetCStringPtr((CFStringRef) str, kCFStringEncodingUTF8);
+ if (!path_key_cstr) {
+ LOG_DISK_NC("There is no MediaPathKey (no cstring)");
+ return {};
}
- vector<string> bits;
- split(bits, path, boost::is_any_of("/"));
- BOOST_FOREACH (string i, bits) {
- if (starts_with(i, "PRT")) {
- mp.prt = i;
- }
- }
-
- return mp;
+ string path(path_key_cstr);
+ LOG_DISK("MediaPathKey is %1", path);
+ return analyse_osx_media_path (path);
}
+
static bool
is_whole_drive (DADiskRef& disk)
{
return whole_media;
}
+
static optional<boost::filesystem::path>
mount_point (CFDictionaryRef& description)
{
- CFURLRef volume_path_key = (CFURLRef) CFDictionaryGetValue (description, kDADiskDescriptionVolumePathKey);
+ auto volume_path_key = (CFURLRef) CFDictionaryGetValue (description, kDADiskDescriptionVolumePathKey);
+ if (!volume_path_key) {
+ return {};
+ }
+
char mount_path_buffer[1024];
if (!CFURLGetFileSystemRepresentation(volume_path_key, false, (UInt8 *) mount_path_buffer, sizeof(mount_path_buffer))) {
- return boost::optional<boost::filesystem::path>();
+ return {};
}
return boost::filesystem::path(mount_path_buffer);
}
+
/* Here follows some rather intricate and (probably) fragile code to find the list of available
* "real" drives on macOS that we might want to write a DCP to.
*
* a partition /dev/disk2s2 whose content is made into a synthesized /dev/disk3, itself containing some partitions
* which are mounted. /dev/disk2s2 is not considered to be mounted, in this case. So we need to know that
* disk2s2 is related to disk3 so we can consider disk2s2 as mounted if any parts of disk3 are. In order to do
- * this I am picking out what looks like a suitable identifier prefixed with PRT from the MediaContentKey.
- * If disk2s2 and disk3 have the same PRT code I am assuming they are linked.
+ * this I am taking the first two parts of the IODeviceTree and seeing if they exist anywhere in a
+ * IOService identifier. If they do, I am assuming the IOService device is on the matching IODeviceTree device.
*
* Lots of this is guesswork and may be broken. In my defence the documentation that I have been able to
* unearth is, to put it impolitely, crap.
*/
-struct Disk
-{
- string mount_point;
- optional<string> vendor;
- optional<string> model;
- bool real;
- string prt;
- bool whole;
- vector<boost::filesystem::path> mount_points;
- unsigned long size;
-};
-
static void
disk_appeared (DADiskRef disk, void* context)
{
- const char* bsd_name = DADiskGetBSDName (disk);
+ auto bsd_name = DADiskGetBSDName (disk);
if (!bsd_name) {
+ LOG_DISK_NC("Disk with no BSDName appeared");
return;
}
LOG_DISK("%1 appeared", bsd_name);
- Disk this_disk;
+ OSXDisk this_disk;
- this_disk.mount_point = string("/dev/") + bsd_name;
+ this_disk.device = string("/dev/") + bsd_name;
+ LOG_DISK("Device is %1", this_disk.device);
CFDictionaryRef description = DADiskCopyDescription (disk);
this_disk.model = get_model (description);
LOG_DISK("Vendor/model: %1 %2", this_disk.vendor.get_value_or("[none]"), this_disk.model.get_value_or("[none]"));
- optional<MediaPath> media_path = analyse_media_path (description);
+ auto media_path = analyse_media_path (description);
if (!media_path) {
LOG_DISK("Finding media path for %1 failed", bsd_name);
return;
}
- this_disk.real = media_path->real;
- this_disk.prt = media_path->prt;
+ this_disk.media_path = *media_path;
this_disk.whole = is_whole_drive (disk);
- optional<boost::filesystem::path> mp = mount_point (description);
+ auto mp = mount_point (description);
if (mp) {
this_disk.mount_points.push_back (*mp);
}
LOG_DISK(
- "%1 prt %2 whole %3 mounted %4",
- this_disk.real ? "Real" : "Synth",
- this_disk.prt,
+ "%1 %2 mounted at %3",
+ this_disk.media_path.real ? "Real" : "Synth",
this_disk.whole ? "whole" : "part",
- mp ? ("mounted at " + mp->string()) : "unmounted"
+ mp ? mp->string() : "[nowhere]"
);
- CFNumberGetValue ((CFNumberRef) CFDictionaryGetValue (description, kDADiskDescriptionMediaSizeKey), kCFNumberLongType, &this_disk.size);
+ auto media_size_cstr = CFDictionaryGetValue (description, kDADiskDescriptionMediaSizeKey);
+ if (!media_size_cstr) {
+ LOG_DISK_NC("Could not read media size");
+ return;
+ }
+
+ CFNumberGetValue ((CFNumberRef) media_size_cstr, kCFNumberLongType, &this_disk.size);
CFRelease (description);
- reinterpret_cast<vector<Disk>*>(context)->push_back(this_disk);
+ reinterpret_cast<vector<OSXDisk>*>(context)->push_back(this_disk);
}
+
vector<Drive>
Drive::get ()
{
using namespace boost::algorithm;
- vector<Disk> disks;
+ vector<OSXDisk> disks;
- DASessionRef session = DASessionCreate(kCFAllocatorDefault);
+ LOG_DISK_NC("Drive::get() starts");
+
+ auto session = DASessionCreate(kCFAllocatorDefault);
if (!session) {
- return vector<Drive>();
+ return {};
}
+ LOG_DISK_NC("Drive::get() has session");
+
DARegisterDiskAppearedCallback (session, NULL, disk_appeared, &disks);
- CFRunLoopRef run_loop = CFRunLoopGetCurrent ();
+ auto run_loop = CFRunLoopGetCurrent ();
DASessionScheduleWithRunLoop (session, run_loop, kCFRunLoopDefaultMode);
CFRunLoopStop (run_loop);
CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.05, 0);
DAUnregisterCallback(session, (void *) disk_appeared, &disks);
CFRelease(session);
- /* Mark disks containing mounted partitions as themselves mounted */
- BOOST_FOREACH (Disk& i, disks) {
- if (!i.whole) {
- continue;
- }
- BOOST_FOREACH (Disk& 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);
- 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;
- BOOST_FOREACH (Disk& 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;
- }
- }
+ auto drives = osx_disks_to_drives(disks);
- /* Mark containers of those mounted synths as themselves mounted */
- BOOST_FOREACH (Disk& i, disks) {
- if (i.real) {
- map<string, vector<boost::filesystem::path> >::const_iterator 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));
- }
- }
+ LOG_DISK("Drive::get() found %1 drives:", drives.size());
+ for (auto const& drive: drives) {
+ LOG_DISK("%1 %2 mounted=%3", drive.description(), drive.device(), drive.mounted() ? "yes" : "no");
}
- vector<Drive> drives;
- BOOST_FOREACH (Disk& 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));
- LOG_DISK_NC(drives.back().log_summary());
- }
- }
return drives;
}
-string
-Drive::device_for_write () const
-{
- string w = _device;
- boost::replace_all (w, "/dev/disk", "/dev/rdisk");
- return w;
-}
-
-
boost::filesystem::path
-config_path ()
+config_path (optional<string> version)
{
boost::filesystem::path p;
p /= g_get_home_dir ();
p /= "Preferences";
p /= "com.dcpomatic";
p /= "2";
+ if (version) {
+ p /= *version;
+ }
return p;
}
-void done_callback(DADiskRef disk, DADissenterRef dissenter, void* context)
+struct UnmountState
+{
+ bool success = false;
+ bool callback = false;
+};
+
+
+void done_callback(DADiskRef, DADissenterRef dissenter, void* context)
{
LOG_DISK_NC("Unmount finished");
- bool* success = reinterpret_cast<bool*> (context);
+ auto state = reinterpret_cast<UnmountState*>(context);
+ state->callback = true;
if (dissenter) {
LOG_DISK("Error: %1", DADissenterGetStatus(dissenter));
- *success = false;
} else {
LOG_DISK_NC("Successful");
- *success = true;
+ state->success = true;
}
}
{
LOG_DISK_NC("Unmount operation started");
- DASessionRef session = DASessionCreate(kCFAllocatorDefault);
+ auto session = DASessionCreate(kCFAllocatorDefault);
if (!session) {
return false;
}
- DADiskRef disk = DADiskCreateFromBSDName(kCFAllocatorDefault, session, _device.c_str());
+ auto disk = DADiskCreateFromBSDName(kCFAllocatorDefault, session, _device.c_str());
if (!disk) {
return false;
}
LOG_DISK("Requesting unmount of %1 from %2", _device, thread_id());
- bool success = false;
- DADiskUnmount(disk, kDADiskUnmountOptionWhole, &done_callback, &success);
+ UnmountState state;
+ DADiskUnmount(disk, kDADiskUnmountOptionWhole, &done_callback, &state);
CFRelease (disk);
CFRunLoopRef run_loop = CFRunLoopGetCurrent ();
DASessionScheduleWithRunLoop (session, run_loop, kCFRunLoopDefaultMode);
CFRunLoopStop (run_loop);
- CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.5, 0);
+ CFRunLoopRunInMode(kCFRunLoopDefaultMode, 5, 0);
CFRelease(session);
- LOG_DISK_NC("End of unmount");
- return success;
+ if (!state.callback) {
+ LOG_DISK_NC("End of unmount: timeout");
+ } else {
+ LOG_DISK("End of unmount: %1", state.success ? "success" : "failure");
+ }
+ return state.success;
}
}
+
+void
+make_foreground_application ()
+{
+ ProcessSerialNumber serial;
+LIBDCP_DISABLE_WARNINGS
+ GetCurrentProcess (&serial);
+LIBDCP_ENABLE_WARNINGS
+ TransformProcessType (&serial, kProcessTransformToForegroundApplication);
+}
+
+
+bool
+show_in_file_manager (boost::filesystem::path, boost::filesystem::path select)
+{
+ int r = system (String::compose("open -R \"%1\"", select.string()).c_str());
+ return static_cast<bool>(WEXITSTATUS(r));
+}
+
projects / dcpomatic.git / blobdiff