mirrors/jellyseerr
1
0
Fork 0
mirror of https://github.com/fallenbagel/jellyseerr.git synced 2026-01-04 05:38:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into features/deleteMediaFile

Browse Source
This commit is contained in:
dd060606
2022-09-14 14:58:37 +02:00
committed by GitHub
parent 7d4455ba6b e0f9a6e12f
commit 5a72f5f86e
483 changed files with 16584 additions and 8788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
server/routes/media.ts
View File

@@ -1,20 +1,22 @@
import { Router } from 'express';
import { FindOneOptions, FindOperator, getRepository, In } from 'typeorm';
import RadarrAPI from '../api/servarr/radarr';
import SonarrAPI from '../api/servarr/sonarr';
import TautulliAPI from '../api/tautulli';
import TheMovieDb from '../api/themoviedb';
import { MediaStatus, MediaType } from '../constants/media';
import Media from '../entity/Media';
import { User } from '../entity/User';
import {
import RadarrAPI from '@server/api/servarr/radarr';
import SonarrAPI from '@server/api/servarr/sonarr';
import TheMovieDb from '@server/api/themoviedb';
import TautulliAPI from '@server/api/tautulli';
import { MediaStatus, MediaType } from '@server/constants/media';
import { getRepository } from '@server/datasource';
import Media from '@server/entity/Media';
import { User } from '@server/entity/User';
import type {
MediaResultsResponse,
MediaWatchDataResponse,
} from '../interfaces/api/mediaInterfaces';
import { Permission } from '../lib/permissions';
import { getSettings } from '../lib/settings';
import logger from '../logger';
import { isAuthenticated } from '../middleware/auth';
} from '@server/interfaces/api/mediaInterfaces';
import { Permission } from '@server/lib/permissions';
import { getSettings } from '@server/lib/settings';
import logger from '@server/logger';
import { isAuthenticated } from '@server/middleware/auth';
import { Router } from 'express';
const mediaRoutes = Router();
@@ -24,8 +26,7 @@ mediaRoutes.get('/', async (req, res, next) => {
const pageSize = req.query.take ? Number(req.query.take) : 20;
const skip = req.query.skip ? Number(req.query.skip) : 0;
let statusFilter: MediaStatus | FindOperator<MediaStatus> | undefined =
undefined;
let statusFilter = undefined;
switch (req.query.filter) {
case 'available':
@@ -69,7 +70,7 @@ mediaRoutes.get('/', async (req, res, next) => {
try {
const [media, mediaCount] = await mediaRepository.findAndCount({
order: sortFilter,
where: {
where: statusFilter && {
status: statusFilter,
},
take: pageSize,
@@ -154,7 +155,7 @@ mediaRoutes.delete(
const mediaRepository = getRepository(Media);
const media = await mediaRepository.findOneOrFail({
where: { id: req.params.id },
where: { id: Number(req.params.id) },
});
await mediaRepository.remove(media);