Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions src/converter/internal/convertercontroller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ Ret ConverterController::batchConvert(const muse::io::path_t& batchJobFile, cons
progress->progress(current, total, job.in.toStdString());
}

Ret ret = fileConvert(job.in, job.out, openParams, soundProfile, extensionUri, job.transposeOptions, job.pageNum);
Ret ret = fileConvert(job.in, job.out, openParams, soundProfile, extensionUri, job.transposeOptions, job.pageNum, job.visibleParts,
job.copyright);
if (!ret) {
errors.emplace_back(String(u"failed convert, err: %1, in: %2, out: %3")
.arg(String::fromStdString(ret.toString())).arg(job.in.toString()).arg(job.out.toString()));
Expand Down Expand Up @@ -125,7 +126,8 @@ Ret ConverterController::fileConvert(const muse::io::path_t& in, const muse::io:
const String& soundProfile,
const muse::UriQuery& extensionUri,
const std::optional<notation::TransposeOptions>& transposeOptions,
const std::optional<size_t>& pageNum)
const std::optional<size_t>& pageNum, const std::vector<size_t>& visibleParts,
const muse::String& copyright)
{
TRACEFUNC;

Expand Down Expand Up @@ -162,6 +164,16 @@ Ret ConverterController::fileConvert(const muse::io::path_t& in, const muse::io:
}
}

if (!visibleParts.empty()) {
ConverterUtils::setVisibleParts(notationProject->masterNotation()->notation(), visibleParts);
}

if (!copyright.isEmpty()) {
ProjectMeta meta = notationProject->metaInfo();
meta.copyright += copyright;
notationProject->setMetaInfo(meta);
}

globalContext()->setCurrentProject(notationProject);

DEFER {
Expand Down Expand Up @@ -298,6 +310,33 @@ RetVal<ConverterController::BatchJob> ConverterController::parseBatchJob(const m
job.pageNum = pageVal.toInt() - 1;
}

QJsonValue visibleParts = obj[u"visibleParts"];
if (!visibleParts.isUndefined()) {
if (visibleParts.isArray()) {
const QJsonArray partsArray = visibleParts.toArray();
for (const auto part : partsArray) {
if (part.isDouble()) {
job.visibleParts.push_back(part.toInt());
} else {
LOGE() << "Visible parts value must be a Number";
}
}
} else {
rv.ret = make_ret(Err::BatchJobFileFailedParse, err.errorString().toStdString());
return rv;
}
}

QJsonValue copyright = obj[u"copyright"];
if (!copyright.isUndefined()) {
if (copyright.isString()) {
job.copyright = copyright.toString();
} else {
rv.ret = make_ret(Err::BatchJobFileFailedParse, err.errorString().toStdString());
return rv;
}
}

const QJsonValue outValue = obj[u"out"];
if (outValue.isString()) {
job.out = correctUserInputPath(outValue.toString());
Expand Down
6 changes: 5 additions & 1 deletion src/converter/internal/convertercontroller.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,19 @@ class ConverterController : public IConverterController, public muse::Injectable
muse::io::path_t out;
std::optional<notation::TransposeOptions> transposeOptions;
std::optional<size_t> pageNum;
std::vector<size_t> visibleParts;
muse::String copyright;
};

using BatchJob = std::vector<Job>;
using TransposeOpts = std::optional<notation::TransposeOptions>;

muse::RetVal<BatchJob> parseBatchJob(const muse::io::path_t& batchJobFile) const;

muse::Ret fileConvert(const muse::io::path_t& in, const muse::io::path_t& out, const OpenParams& openParams = {},
const muse::String& soundProfile = muse::String(),
const muse::UriQuery& extensionUri = muse::UriQuery(), const std::optional<notation::TransposeOptions>& transposeOptions = std::nullopt, const std::optional<size_t>& pageNum = std::nullopt);
const muse::UriQuery& extensionUri = muse::UriQuery(), const TransposeOpts& transposeOptions = std::nullopt, const std::optional<size_t>& pageNum = std::nullopt, const std::vector<size_t>& visibleParts = std::vector<size_t>(),
const muse::String& copyright = muse::String());

muse::Ret convertScoreParts(project::INotationWriterPtr writer, notation::IMasterNotationPtr masterNotation,
const muse::io::path_t& out);
Expand Down
18 changes: 18 additions & 0 deletions src/converter/internal/converterutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,21 @@ Ret ConverterUtils::applyTranspose(const INotationPtr notation, const TransposeO

return ok ? make_ret(Ret::Code::Ok) : make_ret(Err::TransposeFailed);
}

void ConverterUtils::setVisibleParts(const INotationPtr notation, const std::vector<size_t>& visibleParts)
{
// Receiving in a 0 based order
const INotationPartsPtr parts = notation->parts();
std::vector<muse::ID> visiblePartIds;

for (size_t i = 0; i < parts->partList().size(); ++i) {
if (muse::contains(visibleParts, i)) {
const Part* p = parts->partList().at(i);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optimization: move partList into a variable and reuse it everywhere in this method

visiblePartIds.push_back(p->id());
}
}

for (const Part* p : parts->partList()) {
parts->setPartVisible(p->id(), muse::contains(visiblePartIds, p->id()));
}
}
1 change: 1 addition & 0 deletions src/converter/internal/converterutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ class ConverterUtils

static muse::Ret applyTranspose(const notation::INotationPtr notation, const std::string& optionsJson);
static muse::Ret applyTranspose(const notation::INotationPtr notation, const notation::TransposeOptions& options);
static void setVisibleParts(const notation::INotationPtr notation, const std::vector<size_t>& visibleParts);
};
}
Loading