🔢 Bumped up ui-typings version

This commit is contained in:
2021-11-13 17:00:08 -08:00
parent a952a7e528
commit e1d8f87a00
4 changed files with 32 additions and 43 deletions

14
package-lock.json generated
View File

@@ -41,7 +41,7 @@
"sharp": "^0.28.1", "sharp": "^0.28.1",
"socket.io": "^4.3.1", "socket.io": "^4.3.1",
"socket.io-stream": "^0.5.3", "socket.io-stream": "^0.5.3",
"threetwo-ui-typings": "^1.0.10", "threetwo-ui-typings": "^1.0.11",
"typescript": "^3.8.3", "typescript": "^3.8.3",
"unrar": "^0.2.0", "unrar": "^0.2.0",
"xml2js": "^0.4.23" "xml2js": "^0.4.23"
@@ -13751,9 +13751,9 @@
"dev": true "dev": true
}, },
"node_modules/threetwo-ui-typings": { "node_modules/threetwo-ui-typings": {
"version": "1.0.10", "version": "1.0.11",
"resolved": "https://registry.npmjs.org/threetwo-ui-typings/-/threetwo-ui-typings-1.0.10.tgz", "resolved": "https://registry.npmjs.org/threetwo-ui-typings/-/threetwo-ui-typings-1.0.11.tgz",
"integrity": "sha512-4FKd/Oq6wVgQZmgFErZ4/zIjp+T3UbV9zkVbgTqSyCsIu9MPXKAgHvfZaiV7TU05MCjuiaPJ+9XuUjtBrP6ixQ==", "integrity": "sha512-jRI1rUttoJDqsKFUPd4MM56NErftl2NSEo8MkeqllOtVf38Wy+wVvAT+OW6AoSguA5cLxSpOiA25c31FWjOvOw==",
"dependencies": { "dependencies": {
"typescript": "^4.3.2" "typescript": "^4.3.2"
} }
@@ -25115,9 +25115,9 @@
"dev": true "dev": true
}, },
"threetwo-ui-typings": { "threetwo-ui-typings": {
"version": "1.0.10", "version": "1.0.11",
"resolved": "https://registry.npmjs.org/threetwo-ui-typings/-/threetwo-ui-typings-1.0.10.tgz", "resolved": "https://registry.npmjs.org/threetwo-ui-typings/-/threetwo-ui-typings-1.0.11.tgz",
"integrity": "sha512-4FKd/Oq6wVgQZmgFErZ4/zIjp+T3UbV9zkVbgTqSyCsIu9MPXKAgHvfZaiV7TU05MCjuiaPJ+9XuUjtBrP6ixQ==", "integrity": "sha512-jRI1rUttoJDqsKFUPd4MM56NErftl2NSEo8MkeqllOtVf38Wy+wVvAT+OW6AoSguA5cLxSpOiA25c31FWjOvOw==",
"requires": { "requires": {
"typescript": "^4.3.2" "typescript": "^4.3.2"
}, },

View File

@@ -67,7 +67,7 @@
"sharp": "^0.28.1", "sharp": "^0.28.1",
"socket.io": "^4.3.1", "socket.io": "^4.3.1",
"socket.io-stream": "^0.5.3", "socket.io-stream": "^0.5.3",
"threetwo-ui-typings": "^1.0.10", "threetwo-ui-typings": "^1.0.11",
"typescript": "^3.8.3", "typescript": "^3.8.3",
"unrar": "^0.2.0", "unrar": "^0.2.0",
"xml2js": "^0.4.23" "xml2js": "^0.4.23"

View File

@@ -21,27 +21,22 @@ export default class SettingsService extends Service {
{ {
name: "settings", name: "settings",
mixins: [DbMixin("settings", Settings)], mixins: [DbMixin("settings", Settings)],
settings: { settings: {},
},
hooks: {}, hooks: {},
actions: { actions: {
getSettings: { getSettings: {
rest: "GET /getAllSettings", rest: "GET /getAllSettings",
params: {}, params: {},
async handler(ctx: Context<{}>) { async handler(ctx: Context<{}>) {},
},
} saveSettings: {
}, rest: "POST /saveSettings",
params: {},
saveSettings: { async handler(ctx: Context<{}>) {
rest: "POST /saveSettings", console.log(ctx.params);
params: {}, },
async handler(ctx: Context<{}>) { },
}
}
}, },
methods: {}, methods: {},
}, },

View File

@@ -84,11 +84,12 @@ export const extractCoverFromFile = async (
let result: string; let result: string;
const targetCoverImageFilePath = path.resolve( const targetCoverImageFilePath = path.resolve(
constructedPaths.targetPath + constructedPaths.targetPath +
"/" + "/" +
walkedFolder.name + walkedFolder.name +
"_cover.jpg" "_cover.jpg"
); );
const ebookMetaPath = `${process.env.CALIBRE_EBOOK_META_PATH}` || `ebook-meta`; const ebookMetaPath =
`${process.env.CALIBRE_EBOOK_META_PATH}` || `ebook-meta`;
result = await calibre.run( result = await calibre.run(
ebookMetaPath, ebookMetaPath,
[constructedPaths.inputFilePath], [constructedPaths.inputFilePath],
@@ -116,7 +117,6 @@ export const extractCoverFromFile = async (
extension: path.extname(constructedPaths.inputFilePath), extension: path.extname(constructedPaths.inputFilePath),
cover: { cover: {
filePath: renditionPath, filePath: renditionPath,
stats,
}, },
containedIn: walkedFolder.containedIn, containedIn: walkedFolder.containedIn,
calibreMetadata: { calibreMetadata: {
@@ -138,11 +138,11 @@ export const unrarArchive = async (
mode: 0o2775, mode: 0o2775,
}; };
const fileBuffer = await fse.readFile(filePath).catch((err) => const fileBuffer = await fse
console.error("Failed to read file", err) .readFile(filePath)
); .catch((err) => console.error("Failed to read file", err));
try { try {
logger.info("Unrar initiating.") logger.info("Unrar initiating.");
await fse.ensureDir(options.targetExtractionFolder, directoryOptions); await fse.ensureDir(options.targetExtractionFolder, directoryOptions);
logger.info(`${options.targetExtractionFolder} was created.`); logger.info(`${options.targetExtractionFolder} was created.`);
@@ -152,20 +152,15 @@ export const unrarArchive = async (
const files = extractor.extract({}); const files = extractor.extract({});
const extractedFiles = [...files.files]; const extractedFiles = [...files.files];
for (const file of extractedFiles) { for (const file of extractedFiles) {
logger.info( logger.info(`Attempting to write ${file.fileHeader.name}`);
`Attempting to write ${file.fileHeader.name}`
);
const fileBuffer = file.extraction; const fileBuffer = file.extraction;
const fileName = explodePath( const fileName = explodePath(file.fileHeader.name).fileName;
file.fileHeader.name
).fileName;
// resize image // resize image
await resizeImage( await resizeImage(
fileBuffer, fileBuffer,
path.resolve(options.targetExtractionFolder + "/" + fileName), path.resolve(options.targetExtractionFolder + "/" + fileName),
200 200
); );
} }
// walk the newly created folder and return results // walk the newly created folder and return results
return await walkFolder(options.targetExtractionFolder, [ return await walkFolder(options.targetExtractionFolder, [
@@ -173,7 +168,6 @@ export const unrarArchive = async (
".png", ".png",
".jpeg", ".jpeg",
]); ]);
} catch (error) { } catch (error) {
logger.error(`${error}`); logger.error(`${error}`);
} }