Skip to content
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

Restore the "chunked" methodology in getMeta #761

Merged
merged 1 commit into from
Oct 6, 2015
Merged

Restore the "chunked" methodology in getMeta #761

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 26 additions & 28 deletions controllers/scriptStorage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,55 +326,53 @@ function parseMeta(aParser, aString) {
}
exports.parseMeta = parseMeta;

exports.getMeta = function (aChunks, aCallback) {
exports.getMeta = function (aBufs, aCallback) {
// We need to convert the array of buffers to a string to
// parse the blocks. But strings are memory inefficient compared
// to buffers so we only convert the least number of chunks to
// get the metadata blocks.
var i = 0;
var len = 0;
var str = null;
var parser = null;
var rHeaderContent = null;
var headerContent = null;
var hasUserScriptHeaderContent = false;
var blocksContent = {};
var blocks = {};

if (isDbg) {
console.log('> getMeta() > aChunks.length');
console.log(aChunks.length);
}
for (; i < aBufs.length; ++i) {
// Convert the current Buffer to a `String` and accumulate it's `String` totalLength
len += aBufs[i].toString('utf8').length; // NOTE: Watchpoint

var buf = Buffer.concat(aChunks);
var str = buf.toString('utf8');
// Read from the start of the Buffers to the `String` length end-point
// See also #678
str = Buffer.concat(aBufs, len).toString('utf8');

if (isDbg) {
console.log('> getMeta() > str');
console.log(str);
}
for (parser in parsers) {
rHeaderContent = new RegExp(
'^(?:\\uFEFF)?\/\/ ==' + parser + '==([\\s\\S]*?)^\/\/ ==\/'+ parser + '==', 'm'
);
headerContent = rHeaderContent.exec(str);
if (headerContent && headerContent[1]) {
if (parser === 'UserScript') {
hasUserScriptHeaderContent = true;
}

for (parser in parsers) {
rHeaderContent = new RegExp(
'^(?:\\uFEFF)?\/\/ ==' + parser + '==([\\s\\S]*?)^\/\/ ==\/'+ parser + '==', 'm'
);
headerContent = rHeaderContent.exec(str);
if (headerContent && headerContent[1]) {
if (parser === 'UserScript') {
hasUserScriptHeaderContent = true;
blocksContent[parser] = headerContent[1];
}

blocksContent[parser] = headerContent[1];
}
}

if (hasUserScriptHeaderContent) {
for (parser in parsers) {
if (blocksContent[parser]) {
blocks[parser] = parseMeta(parsers[parser], blocksContent[parser]);
if (hasUserScriptHeaderContent) {
for (parser in parsers) {
if (blocksContent[parser]) {
blocks[parser] = parseMeta(parsers[parser], blocksContent[parser]);
}
}
return aCallback(blocks);
}
return aCallback(blocks);
}


aCallback(null);
};

Expand Down