Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160991
Change subject: Use default papersize from /etc/papersize when bundling.
......................................................................
Use default papersize from /etc/papersize when bundling.
An explicit papersize in the metabook overrides this.
Bug: 68836
Change-Id: If9657503522a95fc3c30867c71526415a3bc9d15
---
M bin/mw-ocg-bundler
1 file changed, 19 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/bundler
refs/changes/91/160991/1
diff --git a/bin/mw-ocg-bundler b/bin/mw-ocg-bundler
index 7c6064a..973e40d 100755
--- a/bin/mw-ocg-bundler
+++ b/bin/mw-ocg-bundler
@@ -28,6 +28,8 @@
'Force collection to use the given default language',
null)
.option('-s, --size <max image size>',
'Force the given maximum image dimension (in pixels)',
null)
+ .option('--papersize <letter|a4|auto>',
+ 'Set paper size', 'auto')
.option('--title <title>',
'Set the title of the generated collection', null)
// set this to true to emit deprecated file formats for better
pediapress
@@ -138,6 +140,23 @@
if (program.title) {
metabook.title = program.title;
}
+ if (!metabook.papersize) {
+ if (program.papersize === 'auto') {
+ return P.call(fs.readFile, fs, '/etc/papersize',
'utf8').
+ then(function(papersize) {
+ metabook.papersize = papersize.trim();
+ return metabook;
+ });
+ }
+ metabook.papersize = program.papersize;
+ }
+ return metabook;
+}).then(function(metabook) {
+ if (metabook.papersize !== undefined &&
+ !/^(letter|a4)$/.test(metabook.papersize)) {
+ log("WARN: unknown papersize:", metabook.papersize);
+ delete metabook.papersize;
+ }
return bundler.bundle(metabook, {
nozip: !!program.directory,
output: program.directory || program.output,
--
To view, visit https://gerrit.wikimedia.org/r/160991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9657503522a95fc3c30867c71526415a3bc9d15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator/bundler
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
