🔀 Used actual references to container instantiated directories

This commit is contained in:
2021-12-01 17:54:01 -08:00
parent 1a4f071032
commit e4bdfbdba1
7 changed files with 65 additions and 14221 deletions

2
constants/directories.ts Normal file
View File

@@ -0,0 +1,2 @@
export const COMICS_DIRECTORY = "./comics";
export const USERDATA_DIRECTORY = "./userdata";

View File

@@ -0,0 +1,5 @@
import { Server } from "socket.io";
export const SocketIOMixin = () => {
}

14256
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -34,20 +34,20 @@
"ts-node": "^8.8.1" "ts-node": "^8.8.1"
}, },
"dependencies": { "dependencies": {
"7zip-bin": "^5.1.1",
"7zip-min": "^1.4.0",
"@root/walk": "^1.1.0", "@root/walk": "^1.1.0",
"@types/jest": "^25.1.4", "@types/jest": "^25.1.4",
"@types/mkdirp": "^1.0.0", "@types/mkdirp": "^1.0.0",
"@types/node": "^13.9.8", "@types/node": "^13.9.8",
"@types/string-similarity": "^4.0.0", "@types/string-similarity": "^4.0.0",
"7zip-bin": "^5.1.1",
"7zip-min": "^1.4.0",
"klaw": "^4.0.1",
"chokidar": "^3.5.2", "chokidar": "^3.5.2",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"imghash": "^0.0.9", "imghash": "^0.0.9",
"ioredis": "^4.28.1", "ioredis": "^4.28.1",
"jsdom": "^15.2.1", "jsdom": "^15.2.1",
"klaw": "^4.0.1",
"leven": "^3.1.0", "leven": "^3.1.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mkdirp": "^0.5.5", "mkdirp": "^0.5.5",
@@ -64,7 +64,7 @@
"node-calibre": "^2.1.1", "node-calibre": "^2.1.1",
"node-unrar-js": "^1.0.2", "node-unrar-js": "^1.0.2",
"sharp": "^0.28.1", "sharp": "^0.28.1",
"socket.io": "^4.3.1", "socket.io": "^4.3.2",
"socket.io-stream": "^0.5.3", "socket.io-stream": "^0.5.3",
"threetwo-ui-typings": "^1.0.11", "threetwo-ui-typings": "^1.0.11",
"through2": "^4.0.2", "through2": "^4.0.2",

View File

@@ -28,6 +28,7 @@ import fsExtra from "fs-extra";
const through2 = require("through2"); const through2 = require("through2");
import klaw from "klaw"; import klaw from "klaw";
import path from "path"; import path from "path";
import { COMICS_DIRECTORY, USERDATA_DIRECTORY } from "../constants/directories";
export default class ImportService extends Service { export default class ImportService extends Service {
public constructor( public constructor(
@@ -82,7 +83,7 @@ export default class ImportService extends Service {
}> }>
) { ) {
// 1. Walk the Source folder // 1. Walk the Source folder
klaw(path.resolve(process.env.COMICS_DIRECTORY)) klaw(path.resolve(COMICS_DIRECTORY))
// 1.1 Filter on .cb* extensions // 1.1 Filter on .cb* extensions
.pipe( .pipe(
through2.obj(function ( through2.obj(function (
@@ -453,10 +454,10 @@ export default class ImportService extends Service {
.then((data) => { .then((data) => {
console.info(data); console.info(data);
const foo = fsExtra.emptyDirSync( const foo = fsExtra.emptyDirSync(
path.resolve("./userdata/covers") path.resolve(`${USERDATA_DIRECTORY}/covers`)
); );
const foo2 = fsExtra.emptyDirSync( const foo2 = fsExtra.emptyDirSync(
path.resolve("./userdata/expanded") path.resolve(`${USERDATA_DIRECTORY}/expanded`)
); );
return { data, foo, foo2 }; return { data, foo, foo2 };
}) })

View File

@@ -65,6 +65,7 @@ export default class LibraryQueueService extends Service {
}, },
}, },
actions: { actions: {
enqueue: { enqueue: {
rest: "POST /enqueue", rest: "POST /enqueue",
params: {}, params: {},

View File

@@ -48,8 +48,7 @@ import { isNil } from "lodash";
const sevenZip = require("7zip-min"); const sevenZip = require("7zip-min");
const unrar = require("node-unrar-js"); const unrar = require("node-unrar-js");
const { Calibre } = require("node-calibre"); const { Calibre } = require("node-calibre");
console.info("COMICS_DIRECTORY", process.env.COMICS_DIRECTORY); import { USERDATA_DIRECTORY, COMICS_DIRECTORY } from "../constants/directories";
console.info("USERDATA_DIRECTORY", process.env.USERDATA_DIRECTORY);
export const extractCoverFromFile = async ( export const extractCoverFromFile = async (
extractionOptions: IExtractionOptions, extractionOptions: IExtractionOptions,
@@ -142,7 +141,7 @@ export const extractCoverFromFile2 = async (
console.info(`Initiating extraction process for path ${filePath}`); console.info(`Initiating extraction process for path ${filePath}`);
// 1. Check for process.env.COMICS_DIRECTORY and process.env.USERDATA_DIRECTORY // 1. Check for process.env.COMICS_DIRECTORY and process.env.USERDATA_DIRECTORY
if (!isNil(process.env.USERDATA_DIRECTORY)) { if (!isNil(USERDATA_DIRECTORY)) {
// 2. Create the directory to which the cover image will be extracted // 2. Create the directory to which the cover image will be extracted
console.info("Attempting to create target directory for cover extraction..."); console.info("Attempting to create target directory for cover extraction...");
const directoryOptions = { const directoryOptions = {
@@ -150,7 +149,7 @@ export const extractCoverFromFile2 = async (
}; };
const fileNameWithExtension = path.basename(filePath); const fileNameWithExtension = path.basename(filePath);
const fileNameWithoutExtension = path.basename(filePath, path.extname(filePath)); const fileNameWithoutExtension = path.basename(filePath, path.extname(filePath));
const targetDirectory = `${process.env.USERDATA_DIRECTORY}/covers/${fileNameWithoutExtension}`; const targetDirectory = `${USERDATA_DIRECTORY}/covers/${fileNameWithoutExtension}`;
await fse.ensureDir(targetDirectory, directoryOptions); await fse.ensureDir(targetDirectory, directoryOptions);
console.info(`%s was created.`, targetDirectory); console.info(`%s was created.`, targetDirectory);