murm
/
mrmBot-Matrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for DEBUG environment variable with image runner, make freeze use a similar method to speed

This commit is contained in:
TheEssem 2021-05-13 17:11:13 -05:00
parent e6b4db6e3e
commit 79bc36759c
No known key found for this signature in database
GPG Key ID: A3F9F02129092FCA
3 changed files with 65 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
messages.json
View File

@ -4,7 +4,8 @@
"<a:glxgears:802272302082293770>",
"<a:spunchbob:834829415661568000>",
"<a:processing:834861794794536990>",
"<a:processing:834861794802532432>"
"<a:processing:834861794802532432>",
"<a:processing:842228627223740419>"
],
"messages": [
"with your sanity",

76
natives/freeze.cc
View File

@ -21,27 +21,75 @@ Napi::Value Freeze(const Napi::CallbackInfo &info) {
? obj.Get("frame").As<Napi::Number>().Int32Value()
: -1;
Blob blob;
Napi::Object result = Napi::Object::New(env);
list<Image> frames;
readImages(&frames, Blob(data.Data(), data.Length()));
char *fileData = data.Data();
char *match = "\x21\xFF\x0BNETSCAPE2.0\x03\x01";
char *descriptor = "\x2C\x00\x00\x00\x00";
char *lastPos;
if (frame >= 0 && !loop) {
bool none = true;
if (loop) {
char *newData = (char *)malloc(data.Length() + 19);
memcpy(newData, fileData, data.Length());
lastPos = (char *)memchr(newData, '\x2C', data.Length());
while (lastPos != NULL) {
if (memcmp(lastPos, descriptor, 5) != 0) {
lastPos = (char *)memchr(lastPos + 1, '\x2C',
(data.Length() - (lastPos - newData)) - 1);
continue;
}
memcpy(lastPos + 19, lastPos, (data.Length() - (lastPos - newData)));
memcpy(lastPos, match, 16);
memcpy(lastPos + 16, "\x00\x00\x00", 3);
result.Set("data",
Napi::Buffer<char>::Copy(env, newData, data.Length() + 19));
none = false;
break;
}
if (none)
result.Set("data",
Napi::Buffer<char>::Copy(env, newData, data.Length()));
} else if (frame >= 0 && !loop) {
Blob blob;
list<Image> frames;
readImages(&frames, Blob(data.Data(), data.Length()));
size_t frameSize = frames.size();
int framePos = clamp(frame, 0, (int)frameSize);
frames.resize(framePos + 1);
for_each(frames.begin(), frames.end(),
animationIterationsImage(loop ? 0 : 1));
for_each(frames.begin(), frames.end(), magickImage(type));
if (delay != 0)
for_each(frames.begin(), frames.end(), animationDelayImage(delay));
writeImages(frames.begin(), frames.end(), &blob);
result.Set("data", Napi::Buffer<char>::Copy(env, (char *)blob.data(),
blob.length()));
} else {
lastPos = (char *)memchr(fileData, '\x21', data.Length());
while (lastPos != NULL) {
if (memcmp(lastPos, match, 16) != 0) {
lastPos = (char *)memchr(lastPos + 1, '\x21',
(data.Length() - (lastPos - fileData)) - 1);
continue;
}
memcpy(lastPos, lastPos + 19,
(data.Length() - (lastPos - fileData)) - 19);
result.Set("data",
Napi::Buffer<char>::Copy(env, fileData, data.Length() - 19));
none = false;
break;
}
if (none)
result.Set("data",
Napi::Buffer<char>::Copy(env, fileData, data.Length()));
}
for_each(frames.begin(), frames.end(),
animationIterationsImage(loop ? 0 : 1));
for_each(frames.begin(), frames.end(), magickImage(type));
if (delay != 0)
for_each(frames.begin(), frames.end(), animationDelayImage(delay));
writeImages(frames.begin(), frames.end(), &blob);
Napi::Object result = Napi::Object::New(env);
result.Set("data", Napi::Buffer<char>::Copy(env, (char *)blob.data(),
blob.length()));
result.Set("type", type);
return result;
} catch (Napi::Error const &err) {

2
utils/image-runner.js
View File

@ -1,4 +1,4 @@
const magick = require("../build/Release/image.node");
const magick = require(`../build/${process.env.DEBUG && process.env.DEBUG === "true" ? "Debug" : "Release"}/image.node`);
const { isMainThread, parentPort, workerData } = require("worker_threads");
const fetch = require("node-fetch");