diff --git a/src/main/java/tv/mangrana/config/CommonConfigFileLoader.java b/src/main/java/tv/mangrana/config/CommonConfigFileLoader.java
index efbddb4..65b8206 100644
--- a/src/main/java/tv/mangrana/config/CommonConfigFileLoader.java
+++ b/src/main/java/tv/mangrana/config/CommonConfigFileLoader.java
@@ -11,6 +11,7 @@ public abstract class CommonConfigFileLoader
> {
private static final String CONFIG_FOLDER = "/config";
public enum CommonProjectConfiguration {
+ FILEBOT_PATHS_STARTER,
SONARR_API_HOST,
SONARR_API_KEY,
SONARR_PATHS_STARTER,
diff --git a/src/main/java/tv/mangrana/config/LocalEnvironmentManager.java b/src/main/java/tv/mangrana/config/LocalEnvironmentManager.java
index 60430cf..eedd44b 100644
--- a/src/main/java/tv/mangrana/config/LocalEnvironmentManager.java
+++ b/src/main/java/tv/mangrana/config/LocalEnvironmentManager.java
@@ -5,11 +5,11 @@ import org.apache.commons.lang.StringUtils;
public class LocalEnvironmentManager {
- public enum LocalMode {NAS, PC, CONTABO}
+ public enum LocalMode {NAS, PC}
static LocalMode mode;
static {
- mode = LocalMode.CONTABO;
+ mode = LocalMode.NAS;
}
public static final String PROJECT_ROOT = System.getProperty("user.dir");
@@ -35,7 +35,7 @@ public class LocalEnvironmentManager {
}
public static boolean isWorkingWithProdFiles () {
- return mode.equals(LocalMode.CONTABO) || !isLocal();
+ return mode.equals(LocalMode.NAS) || !isLocal();
}
public static LocalMode getLocalMode() {
diff --git a/src/main/java/tv/mangrana/jobs/JobFile.java b/src/main/java/tv/mangrana/jobs/JobFile.java
deleted file mode 100644
index 761e8a1..0000000
--- a/src/main/java/tv/mangrana/jobs/JobFile.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package tv.mangrana.jobs;
-
-import tv.mangrana.config.LocalEnvironmentManager;
-import tv.mangrana.exception.JobFileNotMovedException;
-
-import java.io.File;
-
-import static tv.mangrana.jobs.JobFile.JobLocation.*;
-import static tv.mangrana.utils.PathUtils.shiftFileFolder;
-
-public abstract class JobFile {
-
- public enum JobLocation {
- PATH_TODO("to_do"),
- PATH_DOING("doing"),
- PATH_DONE("done");
- private final String folderName;
- private static final String LOCAL_WORKING_PATH = "local_test";
- JobLocation(String folderName) {
- this.folderName=folderName;
- }
- public String getFolderName(){
- return getLocalNameIfNecessary(this);
- }
- private String getLocalNameIfNecessary(JobLocation location) {
- if (LocalEnvironmentManager.isLocal() && !LocalEnvironmentManager.isWorkingWithProdFiles()
- && (location.equals(JobLocation.PATH_TODO) || location.equals(JobLocation.PATH_DOING))) {
- return LOCAL_WORKING_PATH;
- }
- return location.folderName;
- }
- }
-
- protected JobFile(File jobFile) {
- this.jobFile = jobFile;
- }
-
- public abstract String getInfo(E key);
-
- public abstract boolean hasNoInfo();
-
- protected File jobFile;
-
- public File getFile () {
- return jobFile;
- }
-
-
- public void markDoing() throws JobFileNotMovedException {
- if (jobFile.getAbsolutePath().contains(PATH_TODO.getFolderName())) {
- jobFile = shiftFileFolder(jobFile, PATH_TODO, PATH_DOING);
- }
- }
-
- public void markDone() throws JobFileNotMovedException {
- jobFile = shiftFileFolder(jobFile, PATH_DOING, PATH_DONE);
- }
-
- public void forceMarkDone() throws JobFileNotMovedException {
- if (jobFile.getAbsolutePath().contains(PATH_DOING.getFolderName())) {
- jobFile = shiftFileFolder(jobFile, PATH_DOING, PATH_DONE);
- } else if (jobFile.getAbsolutePath().contains(PATH_TODO.getFolderName())) {
- jobFile = shiftFileFolder(jobFile, PATH_TODO, PATH_DONE);
- }
- }
-
- public void driveBack() throws JobFileNotMovedException {
- if (jobFile.getAbsolutePath().contains(PATH_DOING.getFolderName())) {
- jobFile = shiftFileFolder(jobFile, PATH_DOING, PATH_TODO);
- }
- }
-
-}
diff --git a/src/main/java/tv/mangrana/jobs/JobFileManager.java b/src/main/java/tv/mangrana/jobs/JobFileManager.java
deleted file mode 100644
index ae05bac..0000000
--- a/src/main/java/tv/mangrana/jobs/JobFileManager.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package tv.mangrana.jobs;
-
-import tv.mangrana.config.LocalEnvironmentManager;
-import tv.mangrana.exception.JobFileNotMovedException;
-import tv.mangrana.utils.PathUtils;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static tv.mangrana.config.LocalEnvironmentManager.LocalMode.CONTABO;
-import static tv.mangrana.config.LocalEnvironmentManager.getLocalMode;
-import static tv.mangrana.jobs.JobFile.JobLocation;
-import static tv.mangrana.jobs.JobFile.JobLocation.PATH_DOING;
-import static tv.mangrana.jobs.JobFile.JobLocation.PATH_TODO;
-import static tv.mangrana.utils.PathUtils.addSubElement;
-import static tv.mangrana.utils.PathUtils.rootFolder;
-
-public class JobFileManager {
-
- private JobFileManager(){}
-
- static final String JOBS_FOLDER = "jobs";
- static final String CONTABO_JOBS_FOLDER = "contabo_jobs";
-
- static final String RESUME_FILE = "jobs.txt";
-
- public enum JobFileType {
- SONARR_JOBS("sonarr"),
- RADARR_JOBS("radarr"),
- TRANSMISSION_JOBS("transm");
-
- private final String folderName;
- JobFileType(String folderName) {
- this.folderName=folderName;
- }
- public String getFolderName(){
- return folderName;
- }
- }
- public static void moveUncompletedJobsToRetry(JobFileType appType) {
- File jobsDir = new File(getAbsolutePath(PATH_DOING, appType));
- File[] files = jobsDir.listFiles();
- List uncompleted = files!=null
- ? Arrays.asList(files)
- : Collections.emptyList();
- uncompleted.forEach(file -> {
- try {
- PathUtils.shiftFileFolder(file, PATH_DOING, PATH_TODO);
- } catch (JobFileNotMovedException e) {
- e.printStackTrace();
- }
- });
- }
-
- public static List retrieveJobFiles(String fileIdentifierRegex, JobFileType appType) {
- File jobsDir = new File(getAbsolutePath(PATH_TODO, appType));
- File[] files = jobsDir.listFiles();
- return files==null
- ? Collections.emptyList()
- : Arrays.stream(files)
- .filter(file -> file.getName().matches(fileIdentifierRegex))
- .sorted(PathUtils::compareFileCreationDate)
- .collect(Collectors.toList());
- }
-
- public static String getAbsolutePath(JobLocation location, JobFileType appType) {
- String jobsFolder = getJobsFolder();
- String appFolderPath = addSubElement(jobsFolder, appType.getFolderName());
- return addSubElement(appFolderPath, location.getFolderName());
- }
-
- public static String getResumeFile() {
- String jobsFolder = getJobsFolder();
- return addSubElement(jobsFolder, RESUME_FILE);
- }
-
- public static String getJobsFolder() {
- return LocalEnvironmentManager.isLocal()
- ? addSubElement(rootFolder(LocalEnvironmentManager.getLocalRootPath()), getLocalJobsFolderName())
- : rootFolder(JOBS_FOLDER);
- }
-
- static String getLocalJobsFolderName() {
- return CONTABO.equals(getLocalMode())
- ? CONTABO_JOBS_FOLDER
- : JOBS_FOLDER;
- }
-}
diff --git a/src/main/java/tv/mangrana/jobs/JobsFileStorage.java b/src/main/java/tv/mangrana/jobs/JobsFileStorage.java
deleted file mode 100644
index 579b4c2..0000000
--- a/src/main/java/tv/mangrana/jobs/JobsFileStorage.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package tv.mangrana.jobs;
-
-import org.apache.commons.lang.StringUtils;
-import tv.mangrana.exception.IncorrectWorkingReferencesException;
-
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.text.MessageFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static tv.mangrana.utils.Output.DATE_TIME_FORMAT;
-
-public class JobsFileStorage {
-
- static final String COMPLETED_DATE = "done";
- static final String JOB_TYPE = "type";
- static final String HASH = "hash";
- static final String ARR_ID = "arrId";
- static final String INTERNET_DB_ID = "iId";
- static final String ELEMENT_NAME = "element";
-
- public final String JOB_LINE_FORMAT;
- private static final String RESUME_FILE = JobFileManager.getResumeFile();
-
- private final List