Skip to content

build-glyphs binary - allow different buffer sizes #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

build-glyphs binary - allow different buffer sizes #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e09932e
allow different buffer sizes
saskaale Dec 7, 2016
a211d85
error message for buffer size smaller than 1
saskaale Dec 7, 2016
ae8c498
test coverage for build-glyphs binary
saskaale Dec 8, 2016
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
13 changes: 9 additions & 4 deletions bin/build-glyphs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ var path = require('path');
var fs = require('fs');
var queue = require('queue-async');

if (process.argv.length !== 4) {
if (process.argv.length < 4 || process.argv.length > 5) {
console.log('Usage:');
console.log(' build-glyphs <fontstack path> <output dir>');
console.log(' build-glyphs <fontstack path> <output dir> [<buffer size>]');
console.log('');
console.log('Example:');
console.log(' build-glyphs ./fonts/open-sans/OpenSans-Regular.ttf ./glyphs');
Expand All @@ -16,6 +16,11 @@ if (process.argv.length !== 4) {

var fontstack = fs.readFileSync(process.argv[2]);
var dir = path.resolve(process.argv[3]);
var buffsize = parseInt(process.argv[4]) || 256;
if(buffsize < 1){
console.warn('Error: Buffer size must be greater than 1');
process.exit(1);
}

if (!fs.existsSync(dir)) {
console.warn('Error: Directory %s does not exist', dir);
Expand All @@ -24,11 +29,11 @@ if (!fs.existsSync(dir)) {

var q = queue(Math.max(4, require('os').cpus().length));
var queue = [];
for (var i = 0; i < 65536; (i = i + 256)) {
for (var i = 0; i < 65536; (i = i + buffsize)) {
q.defer(writeGlyphs, {
font: fontstack,
start: i,
end: Math.min(i + 255, 65535)
end: Math.min(i + buffsize-1, 65535)
});
}

Expand Down
100 changes: 81 additions & 19 deletions test/bin.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,83 @@ var mkdirp = require('mkdirp');

var bin_output = path.resolve(__dirname + '/bin_output');

var buffsizes = ['default', 100, 256, 512, 1024, 3000, 65536];

test('setup', function(t) {
mkdirp(bin_output, function(err) {
t.error(err, 'setup');
t.end();
buffsizes.forEach(function(buffsize){
t.test(' '+buffsize+' buffer size', function(q) {
mkdirp(bin_output+'/'+buffsize, function(err) {
q.error(err, 'setup '+buffsize);
q.end();
});
});
});
});

test('bin/build-glyphs', function(t) {
var script = path.normalize(__dirname + '/../bin/build-glyphs'),
font = path.normalize(__dirname + '/../fonts/open-sans/OpenSans-Regular.ttf'),
dir = path.resolve(__dirname + '/bin_output');
exec([script, font, dir].join(' '), function(err, stdout, stderr) {
t.error(err);
t.error(stderr);
fs.readdir(bin_output, function(err, files) {
t.equal(files.length, 256, 'outputs 256 files');
t.equal(files.indexOf('0-255.pbf'), 0, 'expected .pbf');
t.equal(files.filter(function(f) {
return f.indexOf('.pbf') > -1;
}).length, files.length, 'all .pbfs');
t.end();
})

buffsizes.forEach(function(buffsize){
t.test(' '+buffsize+' buffer size', function(q) {
var params = [script, font, dir+'/'+buffsize];
if(buffsize !== 'default')
params.push(buffsize);

exec(params.join(' '), function(err, stdout, stderr) {
q.error(err);
q.error(stderr);
fs.readdir(dir+'/'+buffsize, function(err, files) {
var buffsizeno = parseInt(buffsize)||256;
var filesno = Math.ceil(65536/buffsizeno);

q.equal(files.length, filesno, 'outputs '+filesno+' files');

//fist file ( for example 0-255.pbf )
q.equal(files.indexOf('0-'+(buffsizeno-1)+'.pbf'), 0, 'expected first .pbf');

var start = (filesno-1)*buffsizeno;
var end = Math.min(filesno*buffsizeno-1, 65535);
//there mustbe last file ( for example 65535 )
q.equal(files.indexOf(start+'-'+end+'.pbf')>=0, true, 'expected last '+start+'-'+end+'.pbf');

//all files must have valid format
q.equal(files.filter(function(f) {
var is;

//must match NUMBER-NUMBER.pbf
f.replace(/^([0-9]+)\-([0-9]+)\.pbf$/g, function(all, s, e){
is = true;
s = parseInt(s);
e = parseInt(e);

//start range must be divided by buffer size
if(s%buffsizeno !== 0) is = false;

//end range + 1 must be divided by buffer size
if(e !== 65535 && (e+1)%buffsizeno !== 0) is = false;

//start and and range must be between 0-65535
if(
( s < 0 || s > 65535 )
||
( e < 0 || e > 65535 )
){
is = false;
}
});


return is;
}).length, files.length, 'valid .pbfs names');
q.end();
})
});
});
});


});

test('bin/font-inspect', function(t) {
Expand Down Expand Up @@ -85,14 +139,22 @@ test('bin/font-inspect', function(t) {
});

test('teardown', function(t) {
var q = queue();
var q1 = queue();

var dirs = buffsizes.map(function(v){return path.join(bin_output, '/', v+"");});
dirs.forEach(function(dir){
fs.readdirSync(dir).forEach(function(f) {
q1.defer(fs.unlink, path.join(dir, '/', f));
});
});
q1.awaitAll(function(err) {
var q2 = queue();

fs.readdir(bin_output, function(err, files) {
files.forEach(function(f) {
q.defer(fs.unlink, path.join(bin_output, '/', f));
dirs.forEach(function(dir){
q2.defer(fs.rmdir, dir);
});

q.awaitAll(function(err) {
q2.awaitAll(function(err) {
t.error(err, 'teardown');
fs.rmdir(bin_output, function(err) {
t.error(err, 'teardown');
Expand Down