Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion server/entity/MediaRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -325,13 +325,41 @@ export class MediaRequest {
) {
return false;
}
if (
rule.certification &&
!rule.certification.split(',').some((entry) => {
const [countryCode, certificationValue] = entry.split(':');

if ('release_dates' in tmdbMedia) {
const countryReleases = tmdbMedia.release_dates.results.find(
(r) => r.iso_3166_1 === countryCode
);
return countryReleases?.release_dates.some(
(rd) => rd.certification === certificationValue
);
} else if ('content_ratings' in tmdbMedia) {
const countryRating = tmdbMedia.content_ratings.results.find(
(r) => r.iso_3166_1 === countryCode
);
return countryRating?.rating === certificationValue;
}
return false;
})
) {
return false;
}
return true;
});

// hacky way to prioritize rules
// TODO: make this better
const prioritizedRule = appliedOverrideRules.sort((a, b) => {
const keys: (keyof OverrideRule)[] = ['genre', 'language', 'keywords'];
const keys: (keyof OverrideRule)[] = [
'genre',
'language',
'keywords',
'certification',
];

const aSpecificity = keys.filter((key) => a[key] !== null).length;
const bSpecificity = keys.filter((key) => b[key] !== null).length;
Expand Down
3 changes: 3 additions & 0 deletions server/entity/OverrideRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ class OverrideRule {
@Column({ nullable: true })
public keywords?: string;

@Column({ nullable: true })
public certification?: string;

@Column({ type: 'int', nullable: true })
public profileId?: number;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import type { MigrationInterface, QueryRunner } from 'typeorm';

export class AddCertificationToOverrideRules1785245866761 implements MigrationInterface {
name = 'AddCertificationToOverrideRules1785245866761';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "override_rule" ADD "certification" character varying`
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "override_rule" DROP COLUMN "certification"`
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import type { MigrationInterface, QueryRunner } from 'typeorm';

export class AddCertificationToOverrideRules1785245659122 implements MigrationInterface {
name = 'AddCertificationToOverrideRules1785245659122';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`CREATE TABLE "temporary_override_rule" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "radarrServiceId" integer, "sonarrServiceId" integer, "users" varchar, "genre" varchar, "language" varchar, "keywords" varchar, "profileId" integer, "rootFolder" varchar, "tags" varchar, "createdAt" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "updatedAt" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "certification" varchar)`
);
await queryRunner.query(
`INSERT INTO "temporary_override_rule"("id", "radarrServiceId", "sonarrServiceId", "users", "genre", "language", "keywords", "profileId", "rootFolder", "tags", "createdAt", "updatedAt") SELECT "id", "radarrServiceId", "sonarrServiceId", "users", "genre", "language", "keywords", "profileId", "rootFolder", "tags", "createdAt", "updatedAt" FROM "override_rule"`
);
await queryRunner.query(`DROP TABLE "override_rule"`);
await queryRunner.query(
`ALTER TABLE "temporary_override_rule" RENAME TO "override_rule"`
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "override_rule" RENAME TO "temporary_override_rule"`
);
await queryRunner.query(
`CREATE TABLE "override_rule" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "radarrServiceId" integer, "sonarrServiceId" integer, "users" varchar, "genre" varchar, "language" varchar, "keywords" varchar, "profileId" integer, "rootFolder" varchar, "tags" varchar, "createdAt" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "updatedAt" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP))`
);
await queryRunner.query(
`INSERT INTO "override_rule"("id", "radarrServiceId", "sonarrServiceId", "users", "genre", "language", "keywords", "profileId", "rootFolder", "tags", "createdAt", "updatedAt") SELECT "id", "radarrServiceId", "sonarrServiceId", "users", "genre", "language", "keywords", "profileId", "rootFolder", "tags", "createdAt", "updatedAt" FROM "temporary_override_rule"`
);
await queryRunner.query(`DROP TABLE "temporary_override_rule"`);
}
}
4 changes: 4 additions & 0 deletions server/routes/overrideRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ overrideRuleRoutes.post<
genre?: string;
language?: string;
keywords?: string;
certification?: string;
profileId?: number;
rootFolder?: string;
tags?: string;
Expand All @@ -46,6 +47,7 @@ overrideRuleRoutes.post<
genre: req.body.genre,
language: req.body.language,
keywords: req.body.keywords,
certification: req.body.certification,
profileId: req.body.profileId,
rootFolder: req.body.rootFolder,
tags: req.body.tags,
Expand All @@ -69,6 +71,7 @@ overrideRuleRoutes.put<
genre?: string;
language?: string;
keywords?: string;
certification?: string;
profileId?: number;
rootFolder?: string;
tags?: string;
Expand All @@ -93,6 +96,7 @@ overrideRuleRoutes.put<
rule.genre = req.body.genre;
rule.language = req.body.language;
rule.keywords = req.body.keywords;
rule.certification = req.body.certification;
rule.profileId = req.body.profileId;
rule.rootFolder = req.body.rootFolder;
rule.tags = req.body.tags;
Expand Down
Loading