owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Subsonic API: do not use ffmpeg to remux the files when transcoding is off. fixes #36

Browse Source
This commit is contained in:
emeric
2020-03-08 17:03:49 +01:00
parent e1755342a4
commit 7d5654cb7d
18 changed files with 643 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/utils/impl/FileResourceHandler.cpp
+32 -51
View File
@@ -17,25 +17,30 @@
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "utils/FileResourceHandler.hpp"
#include "FileResourceHandler.hpp"
#include <fstream>
#include "utils/Logger.hpp"
namespace FileResourceHandler
std::unique_ptr<IResourceHandler>
createFileResourceHandler(const std::filesystem::path& path)
{
return std::make_unique<FileResourceHandler>(path);
}
static constexpr std::size_t _chunkSize {262144};
static
std::optional<ContinuationData>
handleRequestPiecewise(const Wt::Http::Request& request,
Wt::Http::Response& response,
ContinuationData continuationData)
FileResourceHandler::FileResourceHandler(const std::filesystem::path& path)
: _path {path}
{
::uint64_t startByte {continuationData.offset};
std::ifstream ifs {continuationData.path.string().c_str(), std::ios::in | std::ios::binary};
}
void
FileResourceHandler::processRequest(const Wt::Http::Request& request, Wt::Http::Response& response)
{
::uint64_t startByte {_offset};
std::ifstream ifs {_path.string().c_str(), std::ios::in | std::ios::binary};
LMS_LOG(UTILS, DEBUG) << "startByte = " << startByte;
@@ -43,9 +48,10 @@ handleRequestPiecewise(const Wt::Http::Request& request,
{
if (!ifs)
{
LMS_LOG(UTILS, ERROR) << "Cannot open file stream for '" << continuationData.path.string() << "'";
LMS_LOG(UTILS, ERROR) << "Cannot open file stream for '" << _path.string() << "'";
response.setStatus(404);
return std::nullopt;
_isFinished = true;
return;
}
else
{
@@ -67,7 +73,8 @@ handleRequestPiecewise(const Wt::Http::Request& request,
response.addHeader("Content-Range", contentRange.str());
LMS_LOG(UTILS, DEBUG) << "Range not satisfiable";
return std::nullopt;
_isFinished = true;
return;
}
if (ranges.size() == 1)
@@ -76,21 +83,21 @@ handleRequestPiecewise(const Wt::Http::Request& request,
response.setStatus(206);
startByte = ranges[0].firstByte();
continuationData.beyondLastByte = ranges[0].lastByte() + 1;
_beyondLastByte = ranges[0].lastByte() + 1;
std::ostringstream contentRange;
contentRange << "bytes " << startByte << "-"
<< continuationData.beyondLastByte - 1 << "/" << fileSize;
<< _beyondLastByte - 1 << "/" << fileSize;
response.addHeader("Content-Range", contentRange.str());
response.setContentLength(continuationData.beyondLastByte - startByte);
response.setContentLength(_beyondLastByte - startByte);
}
else
{
LMS_LOG(UTILS, DEBUG) << "No range requested";
continuationData.beyondLastByte = fileSize;
response.setContentLength(continuationData.beyondLastByte);
_beyondLastByte = fileSize;
response.setContentLength(_beyondLastByte);
}
}
@@ -99,7 +106,7 @@ handleRequestPiecewise(const Wt::Http::Request& request,
std::vector<char> buf;
buf.resize(_chunkSize);
::uint64_t restSize = continuationData.beyondLastByte - startByte;
::uint64_t restSize = _beyondLastByte - startByte;
::uint64_t pieceSize = buf.size() > restSize ? restSize : buf.size();
ifs.read(&buf[0], pieceSize);
@@ -111,47 +118,21 @@ handleRequestPiecewise(const Wt::Http::Request& request,
LMS_LOG(UTILS, DEBUG) << "Progress: " << actualPieceSize << "/" << restSize;
if (ifs.good() && actualPieceSize < restSize)
{
ContinuationData newContinuationData {continuationData};
newContinuationData.offset = startByte + actualPieceSize;
_offset = startByte + actualPieceSize;
LMS_LOG(UTILS, DEBUG) << "Job not complete! Next chunk offset = " << newContinuationData.offset;
return newContinuationData;
LMS_LOG(UTILS, DEBUG) << "Job not complete! Next chunk offset = " << _offset;
}
else
{
_isFinished = true;
LMS_LOG(UTILS, DEBUG) << "Job complete!";
}
return std::nullopt;
}
std::optional<ContinuationData>
handleInitialRequest(const Wt::Http::Request& request,
Wt::Http::Response& response,
const std::filesystem::path& path)
bool
FileResourceHandler::isFinished() const
{
ContinuationData continuationData;
continuationData.path = path;
continuationData.offset = 0;
continuationData.beyondLastByte = 0;
LMS_LOG(UTILS, DEBUG) << "Initial request for file '" << path << "'";
return handleRequestPiecewise(request, response, continuationData);
return _isFinished;
}
std::optional<ContinuationData>
handleContinuationRequest(const Wt::Http::Request& request,
Wt::Http::Response& response,
const ContinuationData& continuationData)
{
LMS_LOG(UTILS, DEBUG) << "Continuation request for file '" << continuationData.path << "', offset = " << continuationData.offset;
return handleRequestPiecewise(request, response, continuationData);
}
} // ns FileResourceHandler
src/libs/utils/impl/FileResourceHandler.hpp
+43
View File
@@ -0,0 +1,43 @@
/*
* Copyright (C) 2020 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <filesystem>
#include "utils/IResourceHandler.hpp"
class FileResourceHandler final : public IResourceHandler
{
public:
FileResourceHandler(const std::filesystem::path& filePath);
private:
void processRequest(const Wt::Http::Request& request, Wt::Http::Response& response) override;
bool isFinished() const override;
static constexpr std::size_t _chunkSize {262144};
std::filesystem::path _path;
::uint64_t _beyondLastByte {};
::uint64_t _offset {};
bool _isFinished {};
};
src/libs/utils/include/utils/FileResourceHandlerCreator.hpp
+28
View File
@@ -0,0 +1,28 @@
/*
* Copyright (C) 2020 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <filesystem>
#include <memory>
#include "utils/IResourceHandler.hpp"
std::unique_ptr<IResourceHandler> createFileResourceHandler(const std::filesystem::path& path);
src/libs/utils/include/utils/FileResourceHandler.hpp → src/libs/utils/include/utils/IResourceHandler.hpp
+7 -13
View File
@@ -19,22 +19,16 @@
#pragma once
#include <filesystem>
#include <Wt/Http/Request.h>
#include <Wt/Http/Response.h>
// Helper used to deliver file contents from a WResource
namespace FileResourceHandler
// Helper class to serve a resource (must be saved as continuation data if not complete)
class IResourceHandler
{
struct ContinuationData
{
std::filesystem::path path;
::uint64_t beyondLastByte;
::uint64_t offset;
};
public:
virtual ~IResourceHandler() = default;
std::optional<ContinuationData> handleInitialRequest(const Wt::Http::Request& request, Wt::Http::Response& response, const std::filesystem::path& path);
std::optional<ContinuationData> handleContinuationRequest(const Wt::Http::Request& request, Wt::Http::Response& response, const ContinuationData& continuationData);
}
virtual void processRequest(const Wt::Http::Request& request, Wt::Http::Response& response) = 0;
virtual bool isFinished() const = 0;
};