From 7b0977c993ee7cda952244e4c77548501af4a916 Mon Sep 17 00:00:00 2001
From: Divarion-D <danil.dmitrievn@gmail.com>
Date: Mon, 16 Mar 2026 22:33:32 +0300
Subject: [PATCH] refactor(cli): move module commands from cli/ to modules/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Move PlexCronJob, PlexItemCommand → modules/plex/
- Move TmdbCronJob, TmdbPopularCronJob → modules/tmdb/
- Move WatchCronJob, WatchItemCommand → modules/watch/
- Delete originals from cli/Commands/ and cli/CronJobs/
- Module commands now registered via ModuleInterface::registerCommands()
- TmdbCronJob: use require_once __DIR__ for module-local includes
---
 src/{cli/CronJobs => modules/plex}/PlexCronJob.php        | 2 +-
 src/{cli/Commands => modules/plex}/PlexItemCommand.php    | 0
 src/{cli/CronJobs => modules/tmdb}/TmdbCronJob.php        | 6 +++---
 src/{cli/CronJobs => modules/tmdb}/TmdbPopularCronJob.php | 6 +++---
 src/{cli/CronJobs => modules/watch}/WatchCronJob.php      | 4 ++--
 src/{cli/Commands => modules/watch}/WatchItemCommand.php  | 0
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename src/{cli/CronJobs => modules/plex}/PlexCronJob.php (97%)
 rename src/{cli/Commands => modules/plex}/PlexItemCommand.php (100%)
 rename src/{cli/CronJobs => modules/tmdb}/TmdbCronJob.php (81%)
 rename src/{cli/CronJobs => modules/tmdb}/TmdbPopularCronJob.php (74%)
 rename src/{cli/CronJobs => modules/watch}/WatchCronJob.php (93%)
 rename src/{cli/Commands => modules/watch}/WatchItemCommand.php (100%)

diff --git a/src/cli/CronJobs/PlexCronJob.php b/src/modules/plex/PlexCronJob.php
similarity index 97%
rename from src/cli/CronJobs/PlexCronJob.php
rename to src/modules/plex/PlexCronJob.php
index 4bd0616..9087748 100644
--- a/src/cli/CronJobs/PlexCronJob.php
+++ b/src/modules/plex/PlexCronJob.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../CronTrait.php';
+require_once MAIN_HOME . 'cli/CronTrait.php';
 
 class PlexCronJob implements CommandInterface {
     use CronTrait;
diff --git a/src/cli/Commands/PlexItemCommand.php b/src/modules/plex/PlexItemCommand.php
similarity index 100%
rename from src/cli/Commands/PlexItemCommand.php
rename to src/modules/plex/PlexItemCommand.php
diff --git a/src/cli/CronJobs/TmdbCronJob.php b/src/modules/tmdb/TmdbCronJob.php
similarity index 81%
rename from src/cli/CronJobs/TmdbCronJob.php
rename to src/modules/tmdb/TmdbCronJob.php
index 7b700f6..39e029f 100644
--- a/src/cli/CronJobs/TmdbCronJob.php
+++ b/src/modules/tmdb/TmdbCronJob.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../CronTrait.php';
+require_once MAIN_HOME . 'cli/CronTrait.php';
 
 class TmdbCronJob implements CommandInterface {
     use CronTrait;
@@ -20,8 +20,8 @@ class TmdbCronJob implements CommandInterface {
 
         require INCLUDES_PATH . 'admin.php';
         require_once INCLUDES_PATH . 'libs/tmdb.php';
-        require INCLUDES_PATH . 'libs/tmdb_release.php';
-        require MAIN_HOME . 'modules/tmdb/TmdbCron.php';
+        require_once INCLUDES_PATH . 'libs/tmdb_release.php';
+        require_once __DIR__ . '/TmdbCron.php';
 
         $this->initCron('XC_VM[TMDB]');
 
diff --git a/src/cli/CronJobs/TmdbPopularCronJob.php b/src/modules/tmdb/TmdbPopularCronJob.php
similarity index 74%
rename from src/cli/CronJobs/TmdbPopularCronJob.php
rename to src/modules/tmdb/TmdbPopularCronJob.php
index 1d736fd..3047126 100644
--- a/src/cli/CronJobs/TmdbPopularCronJob.php
+++ b/src/modules/tmdb/TmdbPopularCronJob.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../CronTrait.php';
+require_once MAIN_HOME . 'cli/CronTrait.php';
 
 class TmdbPopularCronJob implements CommandInterface {
     use CronTrait;
@@ -20,8 +20,8 @@ class TmdbPopularCronJob implements CommandInterface {
 
         $this->initCron('XC_VM[Popular]');
 
-        require_once MAIN_HOME . 'includes/libs/tmdb.php';
-        require_once MAIN_HOME . 'modules/tmdb/TmdbPopularCron.php';
+        require_once INCLUDES_PATH . 'libs/tmdb.php';
+        require_once __DIR__ . '/TmdbPopularCron.php';
 
         TmdbPopularCron::run();
 
diff --git a/src/cli/CronJobs/WatchCronJob.php b/src/modules/watch/WatchCronJob.php
similarity index 93%
rename from src/cli/CronJobs/WatchCronJob.php
rename to src/modules/watch/WatchCronJob.php
index d7daf39..a421da1 100644
--- a/src/cli/CronJobs/WatchCronJob.php
+++ b/src/modules/watch/WatchCronJob.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../CronTrait.php';
+require_once MAIN_HOME . 'cli/CronTrait.php';
 
 class WatchCronJob implements CommandInterface {
     use CronTrait;
@@ -24,7 +24,7 @@ class WatchCronJob implements CommandInterface {
 
         $this->registerShutdown();
 
-        require_once MAIN_HOME . 'modules/watch/WatchCron.php';
+        require_once __DIR__ . '/WatchCron.php';
 
         $rForce = null;
         if (!empty($rArgs[0])) {
diff --git a/src/cli/Commands/WatchItemCommand.php b/src/modules/watch/WatchItemCommand.php
similarity index 100%
rename from src/cli/Commands/WatchItemCommand.php
rename to src/modules/watch/WatchItemCommand.php