1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
|
Description: Overhaul -j to make it more flexible
(plus some backports)
Author: mirabilos <m@mirbsd.org>
Forwarded: https://github.com/musescore/MuseScore/pull/4166
Applied-Upstream: master, commit:66dba74, v3.1
--- a/mscore/file.cpp
+++ b/mscore/file.cpp
@@ -154,6 +154,11 @@ static QString createDefaultFileName(QSt
return fn;
}
+QString MuseScore::saveFilename(QString fn)
+ {
+ return createDefaultFileName(fn);
+ }
+
//---------------------------------------------------------
// readScoreError
// if "ask" is true, ask to ignore; returns true if
--- a/mscore/musescore.cpp
+++ b/mscore/musescore.cpp
@@ -2533,161 +2533,186 @@ static void loadScores(const QStringList
// doConvert
//---------------------------------------------------------
-static bool doConvert(Score* cs, QString fn, QString plugin = "")
+static bool doConvert(Score *cs, const QString& fn);
+
+static bool doConvert(Score* cs, const QJsonArray& outFiles, QString plugin)
{
- bool rv = true;
LayoutMode layoutMode = cs->layoutMode();
+ cs->setLayoutMode(LayoutMode::PAGE);
+ if (cs->layoutMode() != layoutMode) {
+ // need a cmd context for doLayout
+ cs->startCmd();
+ cs->doLayout();
+ cs->endCmd();
+ }
if (!styleFile.isEmpty()) {
QFile f(styleFile);
- if (f.open(QIODevice::ReadOnly))
+ if (f.open(QIODevice::ReadOnly)) {
+ fprintf(stderr, "\tusing style <%s>\n", qPrintable(styleFile));
cs->style()->load(&f);
+ }
}
if (!plugin.isEmpty()) {
- mscore->setCurrentScore(cs);
- LayoutMode layoutMode = cs->layoutMode();
- cs->startCmd();
- cs->setLayoutAll(true);
- cs->endCmd();
- cs->switchToPageMode();
- if (mscore->loadPlugin(plugin))
+ if (mscore->loadPlugin(plugin)) {
+ fprintf(stderr, "\tusing plugin <%s>\n", qPrintable(plugin));
mscore->pluginTriggered(0);
+ }
mscore->unloadPlugins();
- if (layoutMode != cs->layoutMode())
- cs->endCmd(true); // rollback
}
+ for (const QJsonValue& outFile : outFiles) {
+ if (outFile.isArray()) {
+ QJsonArray fns = outFile.toArray();
+ if (fns.size() != 2 || !fns[0].isString() || !fns[1].isString()) {
+ fprintf(stderr, "out element array length or type mismatch: %s\n",
+ QJsonDocument(QJsonArray{outFile}).toJson().constData());
+ return false;
+ }
+ if (cs->excerpts().size() == 0)
+ // no parts, silently ignore
+ continue;
+ // convert parts
+ QString fnbeg = fns[0].toString();
+ QString fnend = fns[1].toString();
+ for (Excerpt* e : cs->excerpts()) {
+ Score* pScore = e->partScore();
+ QString partfn = fnbeg + mscore->saveFilename(pScore->name()) + fnend;
+ fprintf(stderr, "\tpart <%s>\n", qPrintable(partfn));
+ QFileInfo fi(partfn);
+ if (!mscore->saveAs(pScore, true, partfn, fi.suffix()))
+ return false;
+ }
+ }
+ else if (!outFile.isString()) {
+ fprintf(stderr, "out element type mismatch: %s\n",
+ QJsonDocument(QJsonArray{outFile}).toJson().constData());
+ return false;
+ }
+ else {
+ QString fn = outFile.toString();
+ fprintf(stderr, "\tto <%s>\n", qPrintable(fn));
+ if (!doConvert(cs, fn))
+ return false;
+ }
+ }
+ // don’t bother cleaning up layoutMode:
+ // cs is destroyed immediately after return anyway
+ return true;
+ }
+
+static bool doConvert(Score *cs, const QString& fn)
+ {
if (fn.endsWith(".mscx")) {
QFileInfo fi(fn);
- if (!cs->saveFile(fi))
- return false;
- return true;
+ return cs->saveFile(fi);
}
else if (fn.endsWith(".mscz")) {
QFileInfo fi(fn);
- if (!cs->saveCompressedFile(fi, false))
- return false;
- return true;
- }
- else if (fn.endsWith(".xml") || fn.endsWith(".musicxml")) {
- cs->switchToPageMode();
- rv = saveXml(cs, fn);
- }
- else if (fn.endsWith(".mxl")) {
- cs->switchToPageMode();
- rv = saveMxl(cs, fn);
+ return cs->saveCompressedFile(fi, false);
}
+ else if (fn.endsWith(".xml") || fn.endsWith(".musicxml"))
+ return saveXml(cs, fn);
+ else if (fn.endsWith(".mxl"))
+ return saveMxl(cs, fn);
else if (fn.endsWith(".mid"))
return mscore->saveMidi(cs, fn);
else if (fn.endsWith(".pdf")) {
- if (!exportScoreParts) {
- cs->switchToPageMode();
- rv = mscore->savePdf(cs, fn);
- }
- else {
- if (cs->excerpts().size() == 0) {
- auto excerpts = Excerpt::createAllExcerpt(cs);
-
- for (Excerpt* e : excerpts) {
- Score* nscore = new Score(e->oscore());
- e->setPartScore(nscore);
- nscore->setName(e->title()); // needed before AddExcerpt
- nscore->style()->set(StyleIdx::createMultiMeasureRests, true);
- cs->startCmd();
- cs->undo(new AddExcerpt(nscore));
- createExcerpt(e);
- cs->endCmd();
- }
- }
- QList<Score*> scores;
- scores.append(cs);
- for (Excerpt* e : cs->excerpts())
- scores.append(e->partScore());
- return mscore->savePdf(scores, fn);
+ if (!exportScoreParts)
+ return mscore->savePdf(cs, fn);
+ if (cs->excerpts().size() == 0) {
+ auto excerpts = Excerpt::createAllExcerpt(cs);
+
+ for (Excerpt* e : excerpts) {
+ Score* nscore = new Score(e->oscore());
+ e->setPartScore(nscore);
+ nscore->setName(e->title()); // needed before AddExcerpt
+ nscore->style()->set(StyleIdx::createMultiMeasureRests, true);
+ cs->startCmd();
+ cs->undo(new AddExcerpt(nscore));
+ createExcerpt(e);
+ cs->endCmd();
+ }
}
+ QList<Score*> scores;
+ scores.append(cs);
+ for (Excerpt* e : cs->excerpts())
+ scores.append(e->partScore());
+ return mscore->savePdf(scores, fn);
}
else if (fn.endsWith(".png")) {
- cs->switchToPageMode();
if (!exportScoreParts)
return mscore->savePng(cs, fn);
- else {
- if (cs->excerpts().size() == 0) {
- auto excerpts = Excerpt::createAllExcerpt(cs);
+ if (cs->excerpts().size() == 0) {
+ auto excerpts = Excerpt::createAllExcerpt(cs);
- for (Excerpt* e: excerpts) {
- Score* nscore = new Score(e->oscore());
- e->setPartScore(nscore);
- nscore->setName(e->title()); // needed before AddExcerpt
- nscore->style()->set(StyleIdx::createMultiMeasureRests, true);
- cs->startCmd();
- cs->undo(new AddExcerpt(nscore));
- createExcerpt(e);
- cs->endCmd();
- }
+ for (Excerpt* e: excerpts) {
+ Score* nscore = new Score(e->oscore());
+ e->setPartScore(nscore);
+ nscore->setName(e->title()); // needed before AddExcerpt
+ nscore->style()->set(StyleIdx::createMultiMeasureRests, true);
+ cs->startCmd();
+ cs->undo(new AddExcerpt(nscore));
+ createExcerpt(e);
+ cs->endCmd();
}
- if (!mscore->savePng(cs, fn))
+ }
+ if (!mscore->savePng(cs, fn))
+ return false;
+ int idx = 0;
+ int padding = QString("%1").arg(cs->excerpts().size()).size();
+ for (Excerpt* e: cs->excerpts()) {
+ QString suffix = QString("__excerpt__%1.png").arg(idx, padding, 10, QLatin1Char('0'));
+ QString excerptFn = fn.left(fn.size() - 4) + suffix;
+ if (!mscore->savePng(e->partScore(), excerptFn))
return false;
- int idx = 0;
- int padding = QString("%1").arg(cs->excerpts().size()).size();
- for (Excerpt* e: cs->excerpts()) {
- QString suffix = QString("__excerpt__%1.png").arg(idx, padding, 10, QLatin1Char('0'));
- QString excerptFn = fn.left(fn.size() - 4) + suffix;
- if (!mscore->savePng(e->partScore(), excerptFn))
- return false;
- idx++;
- }
- return true;
+ idx++;
}
+ return true;
}
- else if (fn.endsWith(".svg")) {
- cs->switchToPageMode();
- rv = mscore->saveSvg(cs, fn);
- }
+ else if (fn.endsWith(".svg"))
+ return mscore->saveSvg(cs, fn);
#ifdef HAS_AUDIOFILE
- else if (fn.endsWith(".wav") || fn.endsWith(".ogg") || fn.endsWith(".flac"))
- return mscore->saveAudio(cs, fn);
+ else if (fn.endsWith(".wav") || fn.endsWith(".ogg") || fn.endsWith(".flac"))
+ return mscore->saveAudio(cs, fn);
#endif
#ifdef USE_LAME
- else if (fn.endsWith(".mp3"))
- return mscore->saveMp3(cs, fn);
+ else if (fn.endsWith(".mp3"))
+ return mscore->saveMp3(cs, fn);
#endif
- else if (fn.endsWith(".spos")) {
- cs->switchToPageMode();
- rv = savePositions(cs, fn, true);
- }
- else if (fn.endsWith(".mpos")) {
- cs->switchToPageMode();
- rv = savePositions(cs, fn, false);
- }
+ else if (fn.endsWith(".spos"))
+ return savePositions(cs, fn, true);
+ else if (fn.endsWith(".mpos"))
+ return savePositions(cs, fn, false);
else if (fn.endsWith(".mlog"))
return cs->sanityCheck(fn);
- else if (plugin.isEmpty()) {
- qDebug("don't know how to convert to %s", qPrintable(outFileName));
- return false;
- }
- if (layoutMode != cs->layoutMode())
- cs->endCmd(true); // rollback
- return rv;
+ // unknown file type
+ return false;
}
//---------------------------------------------------------
// convert
//---------------------------------------------------------
-static bool convert(const QString& inFile, const QString& outFile, const QString& plugin = "")
+static bool convert(const QString& inFile, const QJsonArray& outFiles, const QString& plugin = "")
{
- if (inFile.isEmpty() || (outFile.isEmpty() && plugin.isEmpty())) {
- fprintf(stderr, "cannot convert <%s> to <%s>\n", qPrintable(inFile), qPrintable(outFile));
+ if (inFile.isEmpty() || (outFiles.isEmpty() && plugin.isEmpty())) {
+ fprintf(stderr, "cannot convert <%s>: neither out nor plugin given\n", qPrintable(inFile));
return false;
}
- fprintf(stderr, "convert <%s> to <%s>\n", qPrintable(inFile), qPrintable(outFile));
Score* score = mscore->readScore(inFile);
if (!score)
return false;
- if (!doConvert(score, outFile, plugin)) {
- delete score;
- return false;
- }
+ mscore->setCurrentScore(score);
+ fprintf(stderr, "convert <%s>...\n", qPrintable(inFile));
+ bool success = doConvert(score, outFiles, plugin);
+ fprintf(stderr, success ? "... success!\n" : "... failed!\n");
+ mscore->setCurrentScore(nullptr);
delete score;
- return true;
+ return success;
+ }
+
+static bool convert(const QString& inFile, const QString& outFile)
+ {
+ return convert(inFile, QJsonArray{ outFile });
}
//---------------------------------------------------------
@@ -2715,7 +2740,7 @@ static bool doProcessJob(QString jsonFil
QJsonArray a = doc.array();
for (const auto i : a) {
QString inFile;
- QString outFile;
+ QJsonArray outFiles;
QString plugin;
if (!i.isObject()) {
fprintf(stderr, "array value is not an object\n");
@@ -2723,19 +2748,22 @@ static bool doProcessJob(QString jsonFil
}
QJsonObject obj = i.toObject();
for (const auto& key : obj.keys()) {
- QString val = obj.value(key).toString();
if (key == "in")
- inFile = val;
- else if (key == "out")
- outFile = val;
+ inFile = obj.value(key).toString();
+ else if (key == "out") {
+ if (obj.value(key).isArray())
+ outFiles = obj.value(key).toArray();
+ else
+ outFiles.push_back(obj.value(key));
+ }
else if (key == "plugin")
- plugin = val;
+ plugin = obj.value(key).toString();
else {
fprintf(stderr, "unknown key <%s>\n", qPrintable(key));
return false;
}
}
- if (!convert(inFile, outFile, plugin))
+ if (!convert(inFile, outFiles, plugin))
return false;
}
return true;
--- a/mscore/musescore.h
+++ b/mscore/musescore.h
@@ -598,6 +598,7 @@ class MuseScore : public QMainWindow, pu
void exportFile();
bool exportParts();
virtual bool saveAs(Score*, bool saveCopy, const QString& path, const QString& ext);
+ QString saveFilename(QString fn);
bool savePdf(const QString& saveName);
bool savePdf(Score* cs, const QString& saveName);
bool savePdf(QList<Score*> cs, const QString& saveName);
|
