3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-08 12:17:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove utils::file::exists

Browse source
This commit is contained in:
badaix 2021-12-18 15:16:59 +01:00
parent da687c1585
commit 01e35e9004
5 changed files with 27 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/streamreader/airplay_stream.cpp
View file

@ -24,9 +24,11 @@
#include "common/aixlog.hpp"
#include "common/snap_exception.hpp"
#include "common/utils.hpp"
#include "common/utils/file_utils.hpp"
#include "common/utils/string_utils.hpp"
// standard headers
#include <filesystem>
using namespace std;
namespace streamreader
@ -220,7 +222,7 @@ void AirplayStream::do_disconnect()
{
ProcessStream::do_disconnect();
// Shairpot-sync created but does not remove the pipe
if (utils::file::exists(pipePath_) && (remove(pipePath_.c_str()) != 0))
if (std::filesystem::exists(pipePath_) && (remove(pipePath_.c_str()) != 0))
LOG(INFO, LOG_TAG) << "Failed to remove metadata pipe \"" << pipePath_ << "\": " << errno << "\n";
}
@ -281,10 +283,10 @@ void AirplayStream::initExeAndPath(const string& filename)
{
path_ = "";
exe_ = findExe(filename);
if (!fileExists(exe_) || (exe_ == "/"))
if (!std::filesystem::exists(exe_) || (exe_ == "/"))
{
exe_ = findExe("shairport-sync");
if (!fileExists(exe_))
if (!std::filesystem::exists(exe_))
throw SnapException("shairport-sync not found");
}

5
server/streamreader/librespot_stream.cpp
View file

@ -26,6 +26,7 @@
#include "common/utils/string_utils.hpp"
// standard headers
#include <filesystem>
#include <regex>
@ -89,10 +90,10 @@ void LibrespotStream::initExeAndPath(const std::string& filename)
{
path_ = "";
exe_ = findExe(filename);
if (!fileExists(exe_) || (exe_ == "/"))
if (!std::filesystem::exists(exe_) || (exe_ == "/"))
{
exe_ = findExe("librespot");
if (!fileExists(exe_))
if (!std::filesystem::exists(exe_))
throw SnapException("librespot not found");
}

13
server/streamreader/process_stream.cpp
View file

@ -28,6 +28,8 @@
// standard headers
#include <climits>
#include <cstdio>
#include <filesystem>
using namespace std;
@ -48,17 +50,10 @@ ProcessStream::ProcessStream(PcmStream::Listener* pcmListener, boost::asio::io_c
}
bool ProcessStream::fileExists(const std::string& filename) const
{
struct stat buffer;
return (stat(filename.c_str(), &buffer) == 0);
}
std::string ProcessStream::findExe(const std::string& filename) const
{
/// check if filename exists
if (fileExists(filename))
if (std::filesystem::exists(filename))
return filename;
std::string exe = filename;
@ -95,7 +90,7 @@ void ProcessStream::initExeAndPath(const std::string& filename)
exe_ = exe_.substr(exe_.find_last_of('/') + 1);
}
if (!fileExists(path_ + exe_))
if (!std::filesystem::exists(path_ + exe_))
throw SnapException("file not found: \"" + filename + "\"");
}

1
server/streamreader/process_stream.hpp
View file

@ -68,7 +68,6 @@ protected:
virtual void onStderrMsg(const std::string& line);
virtual void initExeAndPath(const std::string& filename);
bool fileExists(const std::string& filename) const;
std::string findExe(const std::string& filename) const;
size_t wd_timeout_sec_;