Skip to content

Commit b6052e5

Browse files
committed
refactor: move index.ts to src
1 parent 18c1b69 commit b6052e5

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN --mount=type=cache,id=pnpm,target=~/.pnpm-store pnpm install --frozen-lockfi
2424

2525
FROM base AS builder
2626
COPY src src/
27-
COPY index.ts esbuild.ts ./
27+
COPY esbuild.ts ./
2828

2929
RUN pnpm run build
3030

esbuild.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const externalizedModules = {};
44

55
await esbuild.build({
66
//inject: ["cjs-shim.ts"],
7-
entryPoints: ["index.ts"],
7+
entryPoints: ["./src/index.ts"],
88
bundle: true,
99
sourcemap: "inline",
1010
platform: "node",

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"coverage": "vitest run --coverage",
99
"generateApi": "tsx generate-api.ts && prettier src/__generated__ --write",
1010
"lint": "prettier . --check",
11-
"start": "tsx index.ts",
11+
"start": "tsx src/index.ts",
1212
"test": "vitest",
1313
"typecheck": "tsc --noEmit"
1414
},

index.ts renamed to src/index.ts

+13-20
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
11
import "dotenv/config";
22

33
import fs from "node:fs";
4-
import { MergedCustomFormatResource } from "./src/__generated__/mergedTypes";
5-
import { configureRadarrApi, configureSonarrApi, getArrApi, unsetApi } from "./src/api";
6-
import { getConfig, validateConfig } from "./src/config";
7-
import {
8-
calculateCFsToManage,
9-
loadCFFromConfig,
10-
loadLocalCfs,
11-
loadServerCustomFormats,
12-
manageCf,
13-
mergeCfSources,
14-
} from "./src/custom-formats";
15-
import { logHeading, logger } from "./src/logger";
16-
import { calculateQualityDefinitionDiff, loadQualityDefinitionFromServer } from "./src/quality-definitions";
4+
import { MergedCustomFormatResource } from "./__generated__/mergedTypes";
5+
import { configureRadarrApi, configureSonarrApi, getArrApi, unsetApi } from "./api";
6+
import { getConfig, validateConfig } from "./config";
7+
import { calculateCFsToManage, loadCFFromConfig, loadLocalCfs, loadServerCustomFormats, manageCf, mergeCfSources } from "./custom-formats";
8+
import { logHeading, logger } from "./logger";
9+
import { calculateQualityDefinitionDiff, loadQualityDefinitionFromServer } from "./quality-definitions";
1710
import {
1811
calculateQualityProfilesDiff,
1912
filterInvalidQualityProfiles,
2013
loadQualityProfilesFromServer,
2114
mapQualityProfiles,
22-
} from "./src/quality-profiles";
23-
import { cloneRecyclarrTemplateRepo, loadRecyclarrTemplates } from "./src/recyclarr-importer";
15+
} from "./quality-profiles";
16+
import { cloneRecyclarrTemplateRepo, loadRecyclarrTemplates } from "./recyclarr-importer";
2417
import {
2518
cloneTrashRepo,
2619
loadQPFromTrash,
2720
loadQualityDefinitionSonarrFromTrash,
2821
loadSonarrTrashCFs,
2922
transformTrashQPCFs,
3023
transformTrashQPToTemplate,
31-
} from "./src/trash-guide";
32-
import { ArrType, CFProcessing, MappedMergedTemplates } from "./src/types/common.types";
33-
import { ConfigQualityProfile, InputConfigArrInstance, InputConfigIncludeItem, MergedConfigInstance } from "./src/types/config.types";
34-
import { TrashQualityDefintion } from "./src/types/trashguide.types";
35-
import { DEBUG_CREATE_FILES, IS_DRY_RUN } from "./src/util";
24+
} from "./trash-guide";
25+
import { ArrType, CFProcessing, MappedMergedTemplates } from "./types/common.types";
26+
import { ConfigQualityProfile, InputConfigArrInstance, InputConfigIncludeItem, MergedConfigInstance } from "./types/config.types";
27+
import { TrashQualityDefintion } from "./types/trashguide.types";
28+
import { DEBUG_CREATE_FILES, IS_DRY_RUN } from "./util";
3629

3730
/**
3831
* Load data from trash, recyclarr, custom configs and merge.

src/quality-definitions.ts

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import path from "node:path";
22
import { MergedQualityDefinitionResource } from "./__generated__/mergedTypes";
33
import { getArrApi } from "./api";
4-
import { logger } from "./logger";
54
import { TrashQualityDefintion, TrashQualityDefintionQuality } from "./types/trashguide.types";
65
import { IS_LOCAL_SAMPLE_MODE, loadJsonFile } from "./util";
76

@@ -29,18 +28,14 @@ export const calculateQualityDefinitionDiff = (serverQDs: MergedQualityDefinitio
2928
if (element) {
3029
const changes: string[] = [];
3130

32-
if (!element.maxSize) {
33-
logger.info(`No maxSize defined: ${element.title}`);
34-
}
35-
3631
if (element.minSize !== tq.min) {
37-
changes.push(`MinSize diff: ${element.minSize} - ${tq.min}`);
32+
changes.push(`MinSize diff: Server ${element.minSize} - Config ${tq.min}`);
3833
}
3934
if (element.maxSize !== tq.max) {
40-
changes.push(`MaxSize diff: ${element.maxSize} - ${tq.max}`);
35+
changes.push(`MaxSize diff: Server ${element.maxSize} - Config ${tq.max}`);
4136
}
4237
if (element.preferredSize !== tq.preferred) {
43-
changes.push(`PreferredSize diff: ${element.preferredSize} - ${tq.preferred}`);
38+
changes.push(`PreferredSize diff: Server ${element.preferredSize} - Config ${tq.preferred}`);
4439
}
4540

4641
if (changes.length > 0) {

tsconfig.json

+13-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,23 @@
22
"$schema": "https://json.schemastore.org/tsconfig",
33
"compilerOptions": {
44
"allowJs": true,
5+
"baseUrl": ".",
6+
"esModuleInterop": true,
7+
"forceConsistentCasingInFileNames": true,
8+
"isolatedModules": true,
9+
"lib": ["DOM", "DOM.Iterable", "ESNext"],
510
"module": "ESNext",
611
"moduleResolution": "Bundler",
12+
"noUncheckedIndexedAccess": true,
13+
"paths": {
14+
"~/*": ["./src/*"]
15+
},
16+
"resolveJsonModule": true,
717
"skipLibCheck": true,
818
"strict": true,
19+
"strictNullChecks": true,
920
"target": "ESNext"
1021
},
11-
"exclude": ["./dist"]
22+
"exclude": ["./dist"],
23+
"include": ["**/*.ts", "**/*.tsx"]
1224
}

0 commit comments

Comments
 (0)