From 21daae0340466e8f2fdab98df8126344093c09e6 Mon Sep 17 00:00:00 2001 From: xeviff Date: Fri, 21 Apr 2023 17:25:15 +0200 Subject: [PATCH] added job resume file for completes added contabo env place formatting only to output --- pom.xml | 2 +- .../config/LocalEnvironmentManager.java | 4 ++-- .../java/tv/mangrana/jobs/JobFileManager.java | 21 ++++++++++++++----- src/main/java/tv/mangrana/utils/Output.java | 7 +++++++ .../java/tv/mangrana/utils/PathUtils.java | 4 ++-- 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index e012908..96d0b2a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ tv.mangrana mangrana-commons - 3.0 + 3.1.1 8 diff --git a/src/main/java/tv/mangrana/config/LocalEnvironmentManager.java b/src/main/java/tv/mangrana/config/LocalEnvironmentManager.java index 4733369..986164e 100644 --- a/src/main/java/tv/mangrana/config/LocalEnvironmentManager.java +++ b/src/main/java/tv/mangrana/config/LocalEnvironmentManager.java @@ -16,9 +16,9 @@ public class LocalEnvironmentManager { public static final String REMOTE_ACCESS_FOLDER_FROM_MAC = "Volumes"; - public static void setLocalMode(String mode) { + public static void setLocalMode(LocalMode mode) { try { - LocalEnvironmentManager.mode = LocalMode.valueOf(mode); + LocalEnvironmentManager.mode = mode; } catch (IllegalArgumentException ignored) { } } diff --git a/src/main/java/tv/mangrana/jobs/JobFileManager.java b/src/main/java/tv/mangrana/jobs/JobFileManager.java index 816c80d..336aa54 100644 --- a/src/main/java/tv/mangrana/jobs/JobFileManager.java +++ b/src/main/java/tv/mangrana/jobs/JobFileManager.java @@ -15,7 +15,7 @@ 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.addSubFolder; +import static tv.mangrana.utils.PathUtils.addSubElement; import static tv.mangrana.utils.PathUtils.rootFolder; public class JobFileManager { @@ -25,6 +25,8 @@ public class 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"), @@ -65,11 +67,20 @@ public class JobFileManager { } public static String getAbsolutePath(JobLocation location, JobFileType appType) { - String jobsFolder = LocalEnvironmentManager.isLocal() - ? addSubFolder(rootFolder(LocalEnvironmentManager.getRootPath()), getLocalJobsFolder()) + 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); + } + + private static String getJobsFolder() { + return LocalEnvironmentManager.isLocal() + ? addSubElement(rootFolder(LocalEnvironmentManager.getRootPath()), getLocalJobsFolder()) : rootFolder(JOBS_FOLDER); - String appFolderPath = addSubFolder(jobsFolder, appType.getFolderName()); - return addSubFolder(appFolderPath, location.getFolderName()); } diff --git a/src/main/java/tv/mangrana/utils/Output.java b/src/main/java/tv/mangrana/utils/Output.java index e175ee0..a27fa78 100644 --- a/src/main/java/tv/mangrana/utils/Output.java +++ b/src/main/java/tv/mangrana/utils/Output.java @@ -1,5 +1,7 @@ package tv.mangrana.utils; +import org.apache.commons.lang.StringUtils; + import java.text.DateFormat; import java.text.MessageFormat; import java.text.SimpleDateFormat; @@ -38,4 +40,9 @@ public class Output { return MessageFormat.format(msg, params); } + public static String formatTitle(String title, int length) { + return title.length() > length ? title.substring(0,length-3)+"..." + : StringUtils.rightPad(title.concat(" "), length, '.'); + } + } diff --git a/src/main/java/tv/mangrana/utils/PathUtils.java b/src/main/java/tv/mangrana/utils/PathUtils.java index a7816f1..b754c3f 100644 --- a/src/main/java/tv/mangrana/utils/PathUtils.java +++ b/src/main/java/tv/mangrana/utils/PathUtils.java @@ -19,11 +19,11 @@ public class PathUtils { private PathUtils(){} - public static String addSubFolder(String parentFolder, String childFolder) { + public static String addSubElement(String parentFolder, String childFolder) { return parentFolder+ SEPARATOR +childFolder; } public static String rootFolder(String rootFolderName){ - return addSubFolder("",rootFolderName); + return addSubElement("",rootFolderName); } public static String getParentFromFullPath(String absolutePath){