Merge remote-tracking branch 'overseerr/develop' into develop

server/job/schedule.ts

@@ -16,6 +16,7 @@ interface ScheduledJob {
   name: string;
   type: 'process' | 'command';
   interval: 'short' | 'long' | 'fixed';
+  cronSchedule: string;
   running?: () => boolean;
   cancelFn?: () => void;
 }
@@ -33,6 +34,7 @@ export const startJobs = (): void => {
       name: 'Plex Recently Added Scan',
       type: 'process',
       interval: 'short',
+      cronSchedule: jobs['plex-recently-added-scan'].schedule,
       job: schedule.scheduleJob(
         jobs['plex-recently-added-scan'].schedule,
         () => {
@@ -52,6 +54,7 @@ export const startJobs = (): void => {
       name: 'Plex Full Library Scan',
       type: 'process',
       interval: 'long',
+      cronSchedule: jobs['plex-full-scan'].schedule,
       job: schedule.scheduleJob(jobs['plex-full-scan'].schedule, () => {
         logger.info('Starting scheduled job: Plex Full Library Scan', {
           label: 'Jobs',
@@ -71,6 +74,7 @@ export const startJobs = (): void => {
       name: 'Jellyfin Recently Added Sync',
       type: 'process',
       interval: 'long',
+      cronSchedule: jobs['jellyfin-recently-added-sync'].schedule,
       job: schedule.scheduleJob(
         jobs['jellyfin-recently-added-sync'].schedule,
         () => {
@@ -90,6 +94,7 @@ export const startJobs = (): void => {
       name: 'Jellyfin Full Library Sync',
       type: 'process',
       interval: 'long',
+      cronSchedule: jobs['jellyfin-full-sync'].schedule,
       job: schedule.scheduleJob(jobs['jellyfin-full-sync'].schedule, () => {
         logger.info('Starting scheduled job: Jellyfin Full Sync', {
           label: 'Jobs',
@@ -107,6 +112,7 @@ export const startJobs = (): void => {
     name: 'Plex Watchlist Sync',
     type: 'process',
     interval: 'long',
+    cronSchedule: jobs['plex-watchlist-sync'].schedule,
     job: schedule.scheduleJob(jobs['plex-watchlist-sync'].schedule, () => {
       logger.info('Starting scheduled job: Plex Watchlist Sync', {
         label: 'Jobs',
@@ -121,6 +127,7 @@ export const startJobs = (): void => {
     name: 'Radarr Scan',
     type: 'process',
     interval: 'long',
+    cronSchedule: jobs['radarr-scan'].schedule,
     job: schedule.scheduleJob(jobs['radarr-scan'].schedule, () => {
       logger.info('Starting scheduled job: Radarr Scan', { label: 'Jobs' });
       radarrScanner.run();
@@ -135,6 +142,7 @@ export const startJobs = (): void => {
     name: 'Sonarr Scan',
     type: 'process',
     interval: 'long',
+    cronSchedule: jobs['sonarr-scan'].schedule,
     job: schedule.scheduleJob(jobs['sonarr-scan'].schedule, () => {
       logger.info('Starting scheduled job: Sonarr Scan', { label: 'Jobs' });
       sonarrScanner.run();
@@ -149,6 +157,7 @@ export const startJobs = (): void => {
     name: 'Download Sync',
     type: 'command',
     interval: 'fixed',
+    cronSchedule: jobs['download-sync'].schedule,
     job: schedule.scheduleJob(jobs['download-sync'].schedule, () => {
       logger.debug('Starting scheduled job: Download Sync', {
         label: 'Jobs',
@@ -163,6 +172,7 @@ export const startJobs = (): void => {
     name: 'Download Sync Reset',
     type: 'command',
     interval: 'long',
+    cronSchedule: jobs['download-sync-reset'].schedule,
     job: schedule.scheduleJob(jobs['download-sync-reset'].schedule, () => {
       logger.info('Starting scheduled job: Download Sync Reset', {
         label: 'Jobs',

server/routes/settings/index.ts

@@ -27,7 +27,7 @@ import { getAppVersion } from '@server/utils/appVersion';
 import { Router } from 'express';
 import rateLimit from 'express-rate-limit';
 import fs from 'fs';
-import { merge, omit, set, sortBy } from 'lodash';
+import { escapeRegExp, merge, omit, set, sortBy } from 'lodash';
 import { rescheduleJob } from 'node-schedule';
 import path from 'path';
 import semver from 'semver';
@@ -454,6 +454,8 @@ settingsRoutes.get(
   (req, res, next) => {
     const pageSize = req.query.take ? Number(req.query.take) : 25;
     const skip = req.query.skip ? Number(req.query.skip) : 0;
+    const search = (req.query.search as string) ?? '';
+    const searchRegexp = new RegExp(escapeRegExp(search), 'i');
 
     let filter: string[] = [];
     switch (req.query.filter) {
@@ -485,6 +487,22 @@ settingsRoutes.get(
       'data',
     ];
 
+    const deepValueStrings = (obj: Record<string, unknown>): string[] => {
+      const values = [];
+
+      for (const val of Object.values(obj)) {
+        if (typeof val === 'string') {
+          values.push(val);
+        } else if (typeof val === 'number') {
+          values.push(val.toString());
+        } else if (val !== null && typeof val === 'object') {
+          values.push(...deepValueStrings(val as Record<string, unknown>));
+        }
+      }
+
+      return values;
+    };
+
     try {
       fs.readFileSync(logFile, 'utf-8')
         .split('\n')
@@ -509,6 +527,19 @@ settingsRoutes.get(
               });
           }
 
+          if (req.query.search) {
+            if (
+              // label and data are sometimes undefined
+              !searchRegexp.test(logMessage.label ?? '') &&
+              !searchRegexp.test(logMessage.message) &&
+              !deepValueStrings(logMessage.data ?? {}).some((val) =>
+                searchRegexp.test(val)
+              )
+            ) {
+              return;
+            }
+          }
+
           logs.push(logMessage);
         });
 
@@ -543,6 +574,7 @@ settingsRoutes.get('/jobs', (_req, res) => {
       name: job.name,
       type: job.type,
       interval: job.interval,
+      cronSchedule: job.cronSchedule,
       nextExecutionTime: job.job.nextInvocation(),
       running: job.running ? job.running() : false,
     }))
@@ -563,6 +595,7 @@ settingsRoutes.post<{ jobId: string }>('/jobs/:jobId/run', (req, res, next) => {
     name: scheduledJob.name,
     type: scheduledJob.type,
     interval: scheduledJob.interval,
+    cronSchedule: scheduledJob.cronSchedule,
     nextExecutionTime: scheduledJob.job.nextInvocation(),
     running: scheduledJob.running ? scheduledJob.running() : false,
   });
@@ -588,6 +621,7 @@ settingsRoutes.post<{ jobId: string }>(
       name: scheduledJob.name,
       type: scheduledJob.type,
       interval: scheduledJob.interval,
+      cronSchedule: scheduledJob.cronSchedule,
       nextExecutionTime: scheduledJob.job.nextInvocation(),
       running: scheduledJob.running ? scheduledJob.running() : false,
     });
@@ -612,11 +646,14 @@ settingsRoutes.post<{ jobId: string }>(
       settings.jobs[scheduledJob.id].schedule = req.body.schedule;
       settings.save();
 
+      scheduledJob.cronSchedule = req.body.schedule;
+
       return res.status(200).json({
         id: scheduledJob.id,
         name: scheduledJob.name,
         type: scheduledJob.type,
         interval: scheduledJob.interval,
+        cronSchedule: scheduledJob.cronSchedule,
         nextExecutionTime: scheduledJob.job.nextInvocation(),
         running: scheduledJob.running ? scheduledJob.running() : false,
       });