From d093e0cc357cbc63be6ef8143fe27cf99bd7b7ee Mon Sep 17 00:00:00 2001 From: Xavier Fontanet Date: Sat, 25 May 2024 16:47:20 +0200 Subject: [PATCH] slight improves --- src/main/java/tv/mangrana/config/ConfigLoader.java | 4 ++-- src/main/java/tv/mangrana/worker/FailedImportFixer.java | 2 +- src/main/java/tv/mangrana/worker/FileCopier.java | 4 ++-- src/main/java/tv/mangrana/worker/MainWorker.java | 5 +++++ src/main/java/tv/mangrana/worker/MissingFilesDetector.java | 4 ++++ src/main/java/tv/mangrana/worker/QueueFixer.java | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/tv/mangrana/config/ConfigLoader.java b/src/main/java/tv/mangrana/config/ConfigLoader.java index 486dc32..36fd610 100644 --- a/src/main/java/tv/mangrana/config/ConfigLoader.java +++ b/src/main/java/tv/mangrana/config/ConfigLoader.java @@ -21,8 +21,8 @@ public class ConfigLoader extends CommonConfigFileLoader getVideoFilesFrom(Path path) throws IOException { if (!Files.exists(path)) { - System.out.printf("path %s doesn't exist on the filesystem", path); + System.out.printf("path %s doesn't exist on the filesystem%n", path); return List.of(); } System.out.println("going to explore "+path); diff --git a/src/main/java/tv/mangrana/worker/FileCopier.java b/src/main/java/tv/mangrana/worker/FileCopier.java index a85e4c4..2167d48 100644 --- a/src/main/java/tv/mangrana/worker/FileCopier.java +++ b/src/main/java/tv/mangrana/worker/FileCopier.java @@ -14,7 +14,7 @@ class FileCopier { try { createDestinationFolderIfApply(destination); - if (ConfigLoader.isDisabled(TEST_MODE)) + if (!ConfigLoader.isEnabled(TEST_MODE)) Files.createLink(destination, source); } catch (IOException e) { System.out.printf("error when creating hardlink with destination %s, error: %s%n", @@ -27,7 +27,7 @@ class FileCopier { var destinationFolder = destinationFile.getParent(); if (isTemporaryDestination(destinationFolder) && !Files.exists(destinationFolder)) { System.out.printf("destination folder %s will be created", destinationFolder); - if (ConfigLoader.isDisabled(TEST_MODE)) + if (!ConfigLoader.isEnabled(TEST_MODE)) Files.createDirectories(destinationFile); } } diff --git a/src/main/java/tv/mangrana/worker/MainWorker.java b/src/main/java/tv/mangrana/worker/MainWorker.java index 34d0aeb..9505587 100644 --- a/src/main/java/tv/mangrana/worker/MainWorker.java +++ b/src/main/java/tv/mangrana/worker/MainWorker.java @@ -4,6 +4,8 @@ import tv.mangrana.config.ConfigLoader; import tv.mangrana.exception.IncorrectWorkingReferencesException; import tv.mangrana.sonarr.Sonarr; +import static tv.mangrana.config.ConfigLoader.ProjectConfiguration.TEST_MODE; + public class MainWorker { private final QueueFixer queueFixer; @@ -15,6 +17,9 @@ public class MainWorker { private MainWorker() throws IncorrectWorkingReferencesException { var configLoader = ConfigLoader.getLoader(); + if (ConfigLoader.isEnabled(TEST_MODE)) + System.out.println("ATTENTION! TEST MODE ENABLED. No folders will be created nor files copied."); + Sonarr.initService(configLoader); queueFixer = new QueueFixer(); } diff --git a/src/main/java/tv/mangrana/worker/MissingFilesDetector.java b/src/main/java/tv/mangrana/worker/MissingFilesDetector.java index f267f28..5d8ed7d 100644 --- a/src/main/java/tv/mangrana/worker/MissingFilesDetector.java +++ b/src/main/java/tv/mangrana/worker/MissingFilesDetector.java @@ -11,6 +11,10 @@ class MissingFilesDetector { private Map> torrentFilesByLength; List getMissingFilesAtDestination(List torrentFiles, List sonarrFiles) { + if (sonarrFiles.size() == 0) { + System.out.println("All files are missing at destination"); + return torrentFiles; + } System.out.printf("going to compare %d torrent files with %d sonar files%n", torrentFiles.size(), sonarrFiles.size()); digestTorrentFiles(torrentFiles); diff --git a/src/main/java/tv/mangrana/worker/QueueFixer.java b/src/main/java/tv/mangrana/worker/QueueFixer.java index f9fd3b6..549c51a 100644 --- a/src/main/java/tv/mangrana/worker/QueueFixer.java +++ b/src/main/java/tv/mangrana/worker/QueueFixer.java @@ -67,7 +67,7 @@ public class QueueFixer { private void cleanWorkedElementsFromQueue(List sonarQueue, List recordsToFix) { List workedTitles = mapRecord2Title(recordsToFix); List recordIds2Delete = filterPresentTitlesFromQueue(sonarQueue, workedTitles); - if (ConfigLoader.isDisabled(TEST_MODE)) + if (!ConfigLoader.isEnabled(TEST_MODE)) sonarrApiGateway.deleteQueueElements(recordIds2Delete); }