X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross_linux.cc;h=919927fdacddd53cf14b7e05c79d9052718b5a76;hp=87806b1e60d9038598e4832eb79767a6cead44f2;hb=2695f450ca00654cef8709e4e3cfb4cf5de48fc7;hpb=641e7622ac98f6e28e82ac2ebb335f278a9120f8 diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index 87806b1e6..919927fda 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2020 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,22 +18,19 @@ */ -#include "cross.h" + #include "compose.hpp" -#include "log.h" -#include "dcpomatic_log.h" #include "config.h" -#include "exceptions.h" +#include "cross.h" #include "dcpomatic_log.h" +#include "dcpomatic_log.h" +#include "exceptions.h" +#include "log.h" #include +#include #include -extern "C" { -#include -} #include -#include -#include -#ifdef DCPOMATIC_DISK +#if BOOST_VERSION >= 106100 #include #endif #include @@ -47,32 +44,17 @@ extern "C" { #include "i18n.h" -using std::pair; -using std::list; + +using std::cerr; +using std::cout; using std::ifstream; -using std::string; -using std::wstring; +using std::list; using std::make_pair; +using std::pair; +using std::string; using std::vector; -using std::cerr; -using std::cout; -using std::runtime_error; -using boost::shared_ptr; using boost::optional; -using boost::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 @@ -98,30 +80,42 @@ cpu_info () return info; } + boost::filesystem::path -shared_path () +resources_path () { - char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX"); - if (p) { - return p; + return directory_containing_executable().parent_path() / "share" / "dcpomatic2"; +} + + +boost::filesystem::path +libdcp_resources_path () +{ + if (auto appdir = getenv("APPDIR")) { + return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp"; } - return boost::filesystem::canonical (LINUX_SHARE_PREFIX); + return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp"; } + void run_ffprobe (boost::filesystem::path content, boost::filesystem::path out) { string ffprobe = "ffprobe \"" + content.string() + "\" 2> \"" + out.string() + "\""; LOG_GENERAL (N_("Probing with %1"), ffprobe); - system (ffprobe.c_str ()); + int const r = system (ffprobe.c_str()); + if (r == -1 || (WIFEXITED(r) && WEXITSTATUS(r) != 0)) { + LOG_GENERAL (N_("Could not run ffprobe (system returned %1"), r); + } } -list > + +list> mount_info () { - list > m; + list> m; - FILE* f = setmntent ("/etc/mtab", "r"); + auto f = setmntent ("/etc/mtab", "r"); if (!f) { return m; } @@ -157,7 +151,7 @@ directory_containing_executable () boost::filesystem::path openssl_path () { - boost::filesystem::path p = directory_containing_executable() / "dcpomatic2_openssl"; + auto p = directory_containing_executable() / "dcpomatic2_openssl"; if (boost::filesystem::is_regular_file(p)) { return p; } @@ -175,33 +169,19 @@ disk_writer_path () #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 () { } + Waker::~Waker () { @@ -211,7 +191,7 @@ Waker::~Waker () void start_tool (string executable) { - boost::filesystem::path batch = directory_containing_executable() / executable; + auto batch = directory_containing_executable() / executable; pid_t pid = fork (); if (pid == 0) { @@ -235,62 +215,11 @@ start_player () } -uint64_t -thread_id () -{ - return (uint64_t) pthread_self (); -} - -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) -{ - FILE* pipe = popen (cmd.c_str(), "r"); - if (!pipe) { - throw runtime_error ("popen failed"); - } - - string result; - char buffer[128]; - try { - while (fgets(buffer, sizeof(buffer), pipe)) { - result += buffer; - } - } catch (...) { - pclose (pipe); - throw; - } - - pclose (pipe); - return result; -} - -/** @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 Linux */ - return false; -} - - static -vector > +vector> get_mounts (string prefix) { - vector > mounts; + vector> mounts; std::ifstream f("/proc/mounts"); string line; @@ -315,10 +244,10 @@ Drive::get () vector drives; using namespace boost::filesystem; - vector > mounted_devices = get_mounts("/dev/"); + auto mounted_devices = get_mounts("/dev/"); - for (directory_iterator i = directory_iterator("/sys/block"); i != directory_iterator(); ++i) { - string const name = i->path().filename().string(); + for (auto i: directory_iterator("/sys/block")) { + string const name = i.path().filename().string(); path device_type_file("/sys/block/" + name + "/device/type"); optional device_type; if (exists(device_type_file)) { @@ -327,7 +256,7 @@ Drive::get () } /* Device type 5 is "SCSI_TYPE_ROM" in blkdev.h; seems usually to be a CD/DVD drive */ if (!boost::algorithm::starts_with(name, "loop") && (!device_type || *device_type != "5")) { - uint64_t const size = dcp::raw_convert(dcp::file_to_string(*i / "size")) * 512; + uint64_t const size = dcp::raw_convert(dcp::file_to_string(i / "size")) * 512; if (size == 0) { continue; } @@ -342,9 +271,9 @@ Drive::get () boost::trim(*model); } catch (...) {} vector mount_points; - for (vector >::const_iterator j = mounted_devices.begin(); j != mounted_devices.end(); ++j) { - if (boost::algorithm::starts_with(j->first, "/dev/" + name)) { - mount_points.push_back (j->second); + for (auto const& j: mounted_devices) { + if (boost::algorithm::starts_with(j.first, "/dev/" + name)) { + mount_points.push_back (j.second); } } drives.push_back(Drive("/dev/" + name, mount_points, size, vendor, model)); @@ -359,7 +288,7 @@ Drive::get () bool Drive::unmount () { - BOOST_FOREACH (boost::filesystem::path i, _mount_points) { + for (auto i: _mount_points) { int const r = umount(i.string().c_str()); LOG_DISK("Tried to unmount %1 and got %2 and %3", i.string(), r, errno); if (r == -1) { @@ -370,33 +299,15 @@ Drive::unmount () } -void -unprivileged () -{ - uid_t ruid, euid, suid; - if (getresuid(&ruid, &euid, &suid) == -1) { - cerr << "getresuid() failed.\n"; - exit (EXIT_FAILURE); - } - seteuid (ruid); -} - -PrivilegeEscalator::~PrivilegeEscalator () -{ - unprivileged (); -} - -PrivilegeEscalator::PrivilegeEscalator () -{ - seteuid (0); -} - boost::filesystem::path -config_path () +config_path (optional version) { boost::filesystem::path p; p /= g_get_user_config_dir (); p /= "dcpomatic2"; + if (version) { + p /= *version; + } return p; } @@ -407,3 +318,21 @@ disk_write_finished () } +bool +show_in_file_manager (boost::filesystem::path dir, boost::filesystem::path) +{ + int r = system ("which nautilus"); + if (WEXITSTATUS(r) == 0) { + r = system (String::compose("nautilus \"%1\"", dir.string()).c_str()); + return static_cast(WEXITSTATUS(r)); + } else { + int r = system ("which konqueror"); + if (WEXITSTATUS(r) == 0) { + r = system (String::compose("konqueror \"%1\"", dir.string()).c_str()); + return static_cast(WEXITSTATUS(r)); + } + } + + return true; +} +