mees/Undecked
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Mees van der Wijk
2023-08-29 20:06:52 +02:00
parent 7c2eec4446
commit 25702c073a
225 changed files with 1071 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Backend/dist/Decks/Deck.js vendored
View File

@@ -1,35 +1,35 @@
exports.__esModule = true;
Object.defineProperty(exports, "__esModule", { value: true });
exports.Deck = void 0;
var StreamDeck = require("@elgato-stream-deck/node");
var Jimp = require("jimp");
var canvas_1 = require("canvas");
var path = require("path");
var Logger_1 = require("../Logger");
canvas_1.registerFont(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-ExtraLight.ttf'), {
(0, canvas_1.registerFont)(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-ExtraLight.ttf'), {
family: 'Montserrat',
weight: '200'
});
canvas_1.registerFont(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-Light.ttf'), {
(0, canvas_1.registerFont)(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-Light.ttf'), {
family: 'Montserrat',
weight: '300'
});
canvas_1.registerFont(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-Regular.ttf'), {
(0, canvas_1.registerFont)(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-Regular.ttf'), {
family: 'Montserrat',
weight: '400'
});
canvas_1.registerFont(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-Medium.ttf'), {
(0, canvas_1.registerFont)(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-Medium.ttf'), {
family: 'Montserrat',
weight: '500'
});
canvas_1.registerFont(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-SemiBold.ttf'), {
(0, canvas_1.registerFont)(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-SemiBold.ttf'), {
family: 'Montserrat',
weight: '600'
});
canvas_1.registerFont(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-Bold.ttf'), {
(0, canvas_1.registerFont)(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-Bold.ttf'), {
family: 'Montserrat',
weight: '700'
});
canvas_1.registerFont(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-ExtraBold.ttf'), {
(0, canvas_1.registerFont)(path.join(__filename, '..', '..', '..', '..', 'Static', 'font', 'Montserrat-ExtraBold.ttf'), {
family: 'Montserrat',
weight: '800'
});
@@ -50,7 +50,7 @@ var Deck = /** @class */ (function () {
}
};
}
Deck.prototype["export"] = function () {
Deck.prototype.export = function () {
return {
name: this.name,
serialNumber: this.serialNumber,
@@ -101,7 +101,7 @@ var Deck = /** @class */ (function () {
else {
clearInterval(fadeInterval);
_this.ready = true;
Logger_1.Log('info', "Deck " + _this.name + " is ready for rendering");
(0, Logger_1.Log)('info', "Deck ".concat(_this.name, " is ready for rendering"));
_this.updateAll();
fadeInterval = setInterval(function () {
_this.Deck.setBrightness(fadeCounter);
@@ -126,7 +126,7 @@ var Deck = /** @class */ (function () {
this.listeners();
this.online = true;
this.Deck.on('error', function (error) {
console.error("Deck:" + _this.name, error);
console.error("Deck:".concat(_this.name), error);
_this.online = false;
});
this.init();
@@ -315,7 +315,7 @@ var Deck = /** @class */ (function () {
setTimeout(function () { return applyChanges(_this); }, delay);
}
var applyChanges = function (instance) {
var canvas = canvas_1.createCanvas(Undecked.quality, Undecked.quality);
var canvas = (0, canvas_1.createCanvas)(Undecked.quality, Undecked.quality);
var context = canvas.getContext('2d');
context.textBaseline = 'middle';
context.textAlign = 'center';
@@ -378,7 +378,7 @@ var Deck = /** @class */ (function () {
else if (key.state.type == 'currentpage') {
render({
text: {
value: "Page\\n\\n" + (instance.pageIndex + 1),
value: "Page\\n\\n".concat(instance.pageIndex + 1),
color: '#ffffff',
size: 22,
offsetX: 0,
@@ -415,7 +415,7 @@ var Deck = /** @class */ (function () {
if (imageAddress) {
var centerX = Undecked.quality / 2 + appearence.image.offsetX / 100 * Undecked.quality;
var centerY = Undecked.quality / 2 + appearence.image.offsetY / 100 * Undecked.quality;
canvas_1.loadImage(imageAddress).then(function (image) {
(0, canvas_1.loadImage)(imageAddress).then(function (image) {
context.save();
context.translate(centerX, centerY);
context.rotate(appearence.image.rotation * Math.PI / 180);
@@ -433,7 +433,7 @@ var Deck = /** @class */ (function () {
function text(cb) {
if (appearence.text != undefined) {
context.fillStyle = appearence.text.color;
context.font = "700 " + appearence.text.size * (Undecked.quality / 100) + "px \"Montserrat\"";
context.font = "700 ".concat(appearence.text.size * (Undecked.quality / 100), "px \"Montserrat\"");
var text = appearence.text.value;
var lineHeight = appearence.text.size * (Undecked.quality / 100);
var centerX = Undecked.quality / 2 + appearence.text.offsetX / 100 * (Undecked.quality * 2);

2
Backend/dist/Decks/Deck.js.map vendored
View File

File diff suppressed because one or more lines are too long

10
Backend/dist/Decks/DeckManager.js vendored
View File

@@ -1,4 +1,4 @@
exports.__esModule = true;
Object.defineProperty(exports, "__esModule", { value: true });
exports.DeckManager = void 0;
var path = require("path");
var Logger_1 = require("../Logger");
@@ -19,7 +19,7 @@ var DeckManager = /** @class */ (function () {
_this.decks[deckConfig.serialNumber] = new Deck_1.Deck(deckConfig, null);
}
_this.ensureDecks(function (newDecks) {
Logger_1.Log('info', "Loaded " + (Object.keys(_this.decks).length - newDecks) + " existing deck(s) and " + newDecks + " new deck(s)");
(0, Logger_1.Log)('info', "Loaded ".concat(Object.keys(_this.decks).length - newDecks, " existing deck(s) and ").concat(newDecks, " new deck(s)"));
callback();
});
});
@@ -48,10 +48,10 @@ var DeckManager = /** @class */ (function () {
decks: []
};
for (var serialNumber in this.decks)
toSave.decks.push(this.decks[serialNumber]["export"]());
toSave.decks.push(this.decks[serialNumber].export());
writeFile(this.managerConfigPath, JSON.stringify(toSave, null, 4), function (err) {
if (err)
Logger_1.Log('error', 'Error whilst saving manager config', err.message);
(0, Logger_1.Log)('error', 'Error whilst saving manager config', err.message);
if (callback)
callback();
});
@@ -73,7 +73,7 @@ var DeckManager = /** @class */ (function () {
this.decks[decks[i].serialNumber] = new Deck_1.Deck({
serialNumber: decks[i].serialNumber,
model: decks[i].model,
name: "Unnamed " + decks[i].model
name: "Unnamed ".concat(decks[i].model)
}, decks[i].path);
else
this.decks[decks[i].serialNumber].setDevicePath(decks[i].path);

2
Backend/dist/Decks/DeckManager.js.map vendored
View File

@@ -1 +1 @@
{"version":3,"file":"DeckManager.js","sourceRoot":"","sources":["../../src/Decks/DeckManager.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"DeckManager.js","sourceRoot":"","sources":["../../src/Decks/DeckManager.ts"],"names":[],"mappings":"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"}