QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-20 06:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

better handling of some - ranges; upper-case input string to match month/day names; handle '*' day of week; day-names in , case; hour w/ AM/PM in , case; join with commas and and.

Browse Source
This commit is contained in:
darin.kelkhoff
2025-02-28 19:45:01 -06:00
parent 4b0d093a4a
commit 4cbcd0a149
2 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/scheduler/CronDescriber.java
View File

@ -27,6 +27,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.kingsrook.qqq.backend.core.utils.StringUtils;
/*******************************************************************************
@ -94,7 +95,7 @@ public class CronDescriber
***************************************************************************/
public static String getDescription(String cronExpression) throws ParseException
{
String[] parts = cronExpression.split("\\s+");
String[] parts = cronExpression.trim().toUpperCase().split("\\s+");
if(parts.length < 6 || parts.length > 7)
{
throw new ParseException("Invalid cron expression: " + cronExpression, 0);
@ -173,15 +174,16 @@ public class CronDescriber
{
return "every month";
}
else if(month.contains("-"))
{
String[] parts = month.split("-");
return String.format("%s to %s", MONTH_MAP.getOrDefault(parts[0], parts[0]), MONTH_MAP.getOrDefault(parts[1], parts[1]));
}
else
{
String[] months = month.split(",");
StringBuilder result = new StringBuilder();
for(String m : months)
{
result.append(MONTH_MAP.getOrDefault(m, m)).append(", ");
}
return result.substring(0, result.length() - 2);
String[] months = month.split(",");
List<String> monthNames = Arrays.stream(months).map(m -> MONTH_MAP.getOrDefault(m, m)).toList();
return StringUtils.joinWithCommasAndAnd(monthNames);
}
}
@ -192,7 +194,7 @@ public class CronDescriber
***************************************************************************/
private static String describeDayOfWeek(String dayOfWeek)
{
if(dayOfWeek.equals("?"))
if(dayOfWeek.equals("?") || dayOfWeek.equals("*"))
{
return "every day of the week";
}
@ -212,13 +214,9 @@ public class CronDescriber
}
else
{
String[] days = dayOfWeek.split(",");
StringBuilder result = new StringBuilder();
for(String d : days)
{
result.append(DAY_OF_WEEK_MAP.getOrDefault(d, d)).append(", ");
}
return result.substring(0, result.length() - 2);
String[] days = dayOfWeek.split(",");
List<String> dayNames = Arrays.stream(days).map(d -> DAY_OF_WEEK_MAP.getOrDefault(d, d)).toList();
return StringUtils.joinWithCommasAndAnd(dayNames);
}
}
@ -244,21 +242,22 @@ public class CronDescriber
}
else if(part.contains(","))
{
List<String> partsList = Arrays.stream(part.split(",")).toList();
if(label.equals("hour"))
{
String[] parts = part.split(",");
List<String> partList = Arrays.stream(parts).map(p -> hourToAmPm(p)).toList();
return String.join(", ", partList);
List<String> hourNames = partsList.stream().map(p -> hourToAmPm(p)).toList();
return StringUtils.joinWithCommasAndAnd(hourNames);
}
else
{
if(label.equals("day"))
{
return "days " + part.replace(",", ", ");
return "days " + StringUtils.joinWithCommasAndAnd(partsList);
}
else
{
return part.replace(",", ", ") + " " + label + "s";
return StringUtils.joinWithCommasAndAnd(partsList) + " " + label + "s";
}
}
}