Some Cleanup and Refactoring

ShokoAnime · Jan 6, 2024 · e60ea00 · e60ea00
1 parent db28cb6
commit e60ea00
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 25 deletions.
diff --git a/Shoko.Server/API/v1/Implementations/ShokoServiceImplementation/ShokoServiceImplementation.cs b/Shoko.Server/API/v1/Implementations/ShokoServiceImplementation/ShokoServiceImplementation.cs
@@ -18,7 +18,6 @@
 using Shoko.Server.Commands;
 using Shoko.Server.Commands.AniDB;
 using Shoko.Server.Extensions;
-using Shoko.Server.Filters;
 using Shoko.Server.Filters.Legacy;
 using Shoko.Server.Models;
 using Shoko.Server.Plex;
@@ -27,7 +26,7 @@
 using Shoko.Server.Providers.TraktTV;
 using Shoko.Server.Providers.TvDB;
 using Shoko.Server.Repositories;
-using Shoko.Server.Scheduling.Jobs;
+using Shoko.Server.Scheduling.Jobs.Actions;
 using Shoko.Server.Server;
 using Shoko.Server.Settings;
 using Shoko.Server.Utilities;

diff --git a/Shoko.Server/API/v2/Modules/Common.cs b/Shoko.Server/API/v2/Modules/Common.cs
@@ -26,7 +26,7 @@
 using Shoko.Server.Filters;
 using Shoko.Server.Models;
 using Shoko.Server.Repositories;
-using Shoko.Server.Scheduling.Jobs;
+using Shoko.Server.Scheduling.Jobs.Actions;
 using Shoko.Server.Server;
 using Shoko.Server.Settings;
 using Shoko.Server.Utilities;

diff --git a/Shoko.Server/API/v3/Controllers/ActionController.cs b/Shoko.Server/API/v3/Controllers/ActionController.cs
@@ -13,14 +13,13 @@
 using Shoko.Server.API.v3.Models.Shoko;
 using Shoko.Server.Commands;
 using Shoko.Server.Commands.AniDB;
-using Shoko.Server.Commands.Plex;
 using Shoko.Server.Models;
 using Shoko.Server.Providers.AniDB;
 using Shoko.Server.Providers.AniDB.Interfaces;
 using Shoko.Server.Providers.MovieDB;
 using Shoko.Server.Providers.TraktTV;
 using Shoko.Server.Repositories;
-using Shoko.Server.Scheduling.Jobs;
+using Shoko.Server.Scheduling.Jobs.Actions;
 using Shoko.Server.Server;
 using Shoko.Server.Settings;
 using Shoko.Server.Tasks;

diff --git a/...Scheduling/Jobs/ConnectivityMonitorJob.cs → ...bs/Actions/CheckNetworkAvailabilityJob.cs b/...Scheduling/Jobs/ConnectivityMonitorJob.cs → ...bs/Actions/CheckNetworkAvailabilityJob.cs
@@ -8,21 +8,21 @@
 using QuartzJobFactory.Attributes;
 using Shoko.Plugin.Abstractions.Services;
 
-namespace Shoko.Server.Scheduling.Jobs;
+namespace Shoko.Server.Scheduling.Jobs.Actions;
 
 [JobKeyMember("UptimeMonitor")]
 [JobKeyGroup("System")]
 [DisallowConcurrentExecution]
-public class ConnectivityMonitorJob : IJob
+public class CheckNetworkAvailabilityJob : IJob
 {
     private readonly IConnectivityService _connectivityService;
 
-    public ConnectivityMonitorJob(IConnectivityService connectivityService)
+    public CheckNetworkAvailabilityJob(IConnectivityService connectivityService)
     {
         _connectivityService = connectivityService;
     }
 
-    protected ConnectivityMonitorJob() { }
+    protected CheckNetworkAvailabilityJob() { }
 
     public async Task Execute(IJobExecutionContext context)
     {

diff --git a/Shoko.Server/Scheduling/Jobs/ImportJob.cs → ...rver/Scheduling/Jobs/Actions/ImportJob.cs b/Shoko.Server/Scheduling/Jobs/ImportJob.cs → ...rver/Scheduling/Jobs/Actions/ImportJob.cs
@@ -7,7 +7,7 @@
 using Quartz;
 using QuartzJobFactory.Attributes;
 
-namespace Shoko.Server.Scheduling.Jobs;
+namespace Shoko.Server.Scheduling.Jobs.Actions;
 
 [JobKeyMember("Import")]
 [JobKeyGroup("Legacy")]

diff --git a/Shoko.Server/Scheduling/Jobs/MediaInfoJob.cs → ...r/Scheduling/Jobs/Actions/MediaInfoJob.cs b/Shoko.Server/Scheduling/Jobs/MediaInfoJob.cs → ...r/Scheduling/Jobs/Actions/MediaInfoJob.cs
@@ -9,7 +9,7 @@
 using Shoko.Server.Commands;
 using Shoko.Server.Repositories;
 
-namespace Shoko.Server.Scheduling.Jobs;
+namespace Shoko.Server.Scheduling.Jobs.Actions;
 
 [JobKeyMember("MediaInfo")]
 [JobKeyGroup("Legacy")]

diff --git a/.../Scheduling/Jobs/RemoveMissingFilesJob.cs → ...ing/Jobs/Actions/RemoveMissingFilesJob.cs b/.../Scheduling/Jobs/RemoveMissingFilesJob.cs → ...ing/Jobs/Actions/RemoveMissingFilesJob.cs
@@ -7,7 +7,7 @@
 using Quartz;
 using QuartzJobFactory.Attributes;
 
-namespace Shoko.Server.Scheduling.Jobs;
+namespace Shoko.Server.Scheduling.Jobs.Actions;
 
 [JobKeyMember("RemoveMissingFiles")]
 [JobKeyGroup("Legacy")]

diff --git a/...ver/Scheduling/Jobs/ScanDropFoldersJob.cs → ...duling/Jobs/Actions/ScanDropFoldersJob.cs b/...ver/Scheduling/Jobs/ScanDropFoldersJob.cs → ...duling/Jobs/Actions/ScanDropFoldersJob.cs
@@ -7,7 +7,7 @@
 using Quartz;
 using QuartzJobFactory.Attributes;
 
-namespace Shoko.Server.Scheduling.Jobs;
+namespace Shoko.Server.Scheduling.Jobs.Actions;
 
 [JobKeyMember("ScanDropFolders")]
 [JobKeyGroup("Legacy")]

diff --git a/.../Scheduling/Jobs/DeleteImportFolderJob.cs → ...uling/Jobs/Shoko/DeleteImportFolderJob.cs b/.../Scheduling/Jobs/DeleteImportFolderJob.cs → ...uling/Jobs/Shoko/DeleteImportFolderJob.cs
@@ -7,7 +7,7 @@
 using Quartz;
 using QuartzJobFactory.Attributes;
 
-namespace Shoko.Server.Scheduling.Jobs;
+namespace Shoko.Server.Scheduling.Jobs.Shoko;
 
 [JobKeyMember("DeleteImportFolder")]
 [JobKeyGroup("Actions")]

diff --git a/...o.Server/Scheduling/Jobs/ScanFolderJob.cs → ...er/Scheduling/Jobs/Shoko/ScanFolderJob.cs b/...o.Server/Scheduling/Jobs/ScanFolderJob.cs → ...er/Scheduling/Jobs/Shoko/ScanFolderJob.cs
@@ -7,7 +7,7 @@
 using Quartz;
 using QuartzJobFactory.Attributes;
 
-namespace Shoko.Server.Scheduling.Jobs;
+namespace Shoko.Server.Scheduling.Jobs.Shoko;
 
 [JobKeyMember("ScanFolder")]
 [JobKeyGroup("Actions")]

diff --git a/Shoko.Server/Scheduling/QuartzStartup.cs b/Shoko.Server/Scheduling/QuartzStartup.cs
@@ -6,7 +6,7 @@
 using Quartz;
 using Quartz.AspNetCore;
 using QuartzJobFactory;
-using Shoko.Server.Scheduling.Jobs;
+using Shoko.Server.Scheduling.Jobs.Actions;
 using Shoko.Server.Server;
 using Shoko.Server.Utilities;
 
@@ -19,14 +19,9 @@ internal static void AddQuartz(this IServiceCollection services)
         services.AddQuartz(q =>
         {
             q.UseDatabase();
-            // as of 3.3.2 this also injects scoped services (like EF DbContext) without problems
-            q.UseMicrosoftDependencyInjectionJobFactory();
-
-            // use the database that we have selected for quartz
-            //q.UseDatabase();
 
             // Register the connectivity monitor job with a trigger that executes every 5 minutes
-            q.ScheduleJob<ConnectivityMonitorJob>(
+            q.ScheduleJob<CheckNetworkAvailabilityJob>(
                 trigger => trigger.WithSimpleSchedule(tr => tr.WithIntervalInMinutes(5).RepeatForever()).StartNow(),
                 j => j.DisallowConcurrentExecution().WithGeneratedIdentity());
 

diff --git a/Shoko.Server/Server/ShokoServer.cs b/Shoko.Server/Server/ShokoServer.cs
@@ -16,7 +16,6 @@
 using Sentry;
 using Shoko.Commons.Properties;
 using Shoko.Server.Commands;
-using Shoko.Server.Commands.Generic;
 using Shoko.Server.Commands.Plex;
 using Shoko.Server.Databases;
 using Shoko.Server.FileHelper;
@@ -26,7 +25,8 @@
 using Shoko.Server.Providers.JMMAutoUpdates;
 using Shoko.Server.Repositories;
 using Shoko.Server.Repositories.Cached;
-using Shoko.Server.Scheduling.Jobs;
+using Shoko.Server.Scheduling.Jobs.Actions;
+using Shoko.Server.Scheduling.Jobs.Shoko;
 using Shoko.Server.Settings;
 using Shoko.Server.Utilities;
 using Shoko.Server.Utilities.FileSystemWatcher;

diff --git a/Shoko.Server/Server/Startup.cs b/Shoko.Server/Server/Startup.cs
@@ -18,7 +18,8 @@
 using Shoko.Server.Providers.TraktTV;
 using Shoko.Server.Providers.TvDB;
 using Shoko.Server.Scheduling;
-using Shoko.Server.Scheduling.Jobs;
+using Shoko.Server.Scheduling.Jobs.Actions;
+using Shoko.Server.Scheduling.Jobs.Shoko;
 using Shoko.Server.Services.Connectivity;
 using Shoko.Server.Settings;
 using Shoko.Server.Utilities;