|
1 | 1 | class utils { |
2 | 2 | double(cronExpression) { |
3 | 3 | const interval = cronExpression.split(' '); |
4 | | - |
| 4 | + |
5 | 5 | const expression = [] |
6 | | - expression["seconds"] = interval[0]; |
7 | | - expression["minutes"] = interval[1]; |
8 | | - expression["hours"] = interval[2]; |
9 | | - expression["daysOfMonth"] = interval[3]; |
10 | | - expression["months"] = interval[4]; |
11 | | - expression["daysOfWeek"] = interval[5]; |
12 | | - |
13 | 6 | let new_expression = [] |
14 | | - new_expression["seconds"] = interval[0]; |
15 | | - new_expression["minutes"] = interval[1]; |
16 | | - new_expression["hours"] = interval[2]; |
17 | | - new_expression["daysOfMonth"] = interval[3]; |
18 | | - new_expression["months"] = interval[4]; |
19 | | - new_expression["daysOfWeek"] = interval[5]; |
| 7 | + if(interval.length < 6){ |
| 8 | + expression["seconds"] = "*"; |
| 9 | + expression["minutes"] = interval[0]; |
| 10 | + expression["hours"] = interval[1]; |
| 11 | + expression["daysOfMonth"] = interval[2]; |
| 12 | + expression["months"] = interval[3]; |
| 13 | + expression["daysOfWeek"] = interval[4]; |
| 14 | + |
| 15 | + new_expression["seconds"] = expression["seconds"] |
| 16 | + new_expression["minutes"] = expression["minutes"] |
| 17 | + new_expression["hours"] = expression["hours"] |
| 18 | + new_expression["daysOfMonth"] = expression["daysOfMonth"] |
| 19 | + new_expression["months"] = expression["months"] |
| 20 | + new_expression["daysOfWeek"] = expression["daysOfWeek"] |
| 21 | + } |
| 22 | + else{ |
| 23 | + expression["seconds"] = interval[0]; |
| 24 | + expression["minutes"] = interval[1]; |
| 25 | + expression["hours"] = interval[2]; |
| 26 | + expression["daysOfMonth"] = interval[3]; |
| 27 | + expression["months"] = interval[4]; |
| 28 | + expression["daysOfWeek"] = interval[5]; |
| 29 | + |
| 30 | + new_expression["seconds"] = expression["seconds"]; |
| 31 | + new_expression["minutes"] = expression["minutes"]; |
| 32 | + new_expression["hours"] = expression["hours"]; |
| 33 | + new_expression["daysOfMonth"] = expression["daysOfMonth"]; |
| 34 | + new_expression["months"] = expression["months"]; |
| 35 | + new_expression["daysOfWeek"] = expression["daysOfWeek"]; |
| 36 | + } |
| 37 | + |
20 | 38 |
|
21 | 39 |
|
22 | 40 | let add_to_minutes = false; |
@@ -69,9 +87,12 @@ class utils { |
69 | 87 | if(add_to_minutes != false){ |
70 | 88 | new_expression["minutes"] = `*/${add_to_minutes}`; |
71 | 89 | } |
| 90 | + else{ |
| 91 | + new_expression["minutes"] = new_expression["minutes"] |
| 92 | + } |
72 | 93 | } |
73 | 94 | else{ // 5 |
74 | | - |
| 95 | + new_expression["minutes"] = new_expression["minutes"] |
75 | 96 | } |
76 | 97 |
|
77 | 98 | return `${new_expression["seconds"]} ${new_expression["minutes"]} ${new_expression["hours"]} ${new_expression["daysOfMonth"]} ${new_expression["months"]} ${new_expression["daysOfWeek"]}`; |
|
0 commit comments