Skip to content

Commit 35c2b14

Browse files
authored
Merge pull request #178 from StillGreen-san/daylight-savings
support daylight saving time
2 parents 3084f0e + 20fa624 commit 35c2b14

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

DriveBackup/src/main/java/ratismal/drivebackup/config/configSections/Advanced.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ratismal.drivebackup.config.configSections;
22

33
import java.time.DateTimeException;
4+
import java.time.ZoneId;
45
import java.time.ZoneOffset;
56
import java.util.Locale;
67

@@ -18,16 +19,16 @@ public class Advanced {
1819
public final boolean suppressErrors;
1920
public final boolean debugEnabled;
2021
public final Locale dateLanguage;
21-
public final ZoneOffset dateTimezone;
22+
public final ZoneId dateTimezone;
2223
public final String fileSeparator;
2324

2425
public Advanced(
25-
boolean metricsEnabled,
26-
boolean updateCheckEnabled,
26+
boolean metricsEnabled,
27+
boolean updateCheckEnabled,
2728
boolean suppressErrors,
2829
boolean debugEnabled,
29-
Locale dateLanguage,
30-
ZoneOffset dateTimezone,
30+
Locale dateLanguage,
31+
ZoneId dateTimezone,
3132
String fileSeparator
3233
) {
3334

@@ -48,9 +49,9 @@ public static Advanced parse(@NotNull FileConfiguration config, Logger logger) {
4849
boolean suppressErrors = config.getBoolean("advanced.suppress-errors");
4950
boolean debugEnabled = config.getBoolean("advanced.debug");
5051
Locale dateLanguage = new Locale(config.getString("advanced.date-language"));
51-
ZoneOffset dateTimezone;
52+
ZoneId dateTimezone;
5253
try {
53-
dateTimezone = ZoneOffset.of(config.getString("advanced.date-timezone"));
54+
dateTimezone = ZoneId.of(config.getString("advanced.date-timezone"));
5455
} catch(DateTimeException e) {
5556
logger.log(intl("date-format-invalid"));
5657
//Fallback to UTC

DriveBackup/src/main/java/ratismal/drivebackup/handler/DebugCollector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ratismal.drivebackup.handler;
22

33
import java.net.UnknownHostException;
4-
import java.time.ZoneOffset;
4+
import java.time.ZoneId;
55
import java.util.ArrayList;
66
import java.util.List;
77

@@ -93,7 +93,7 @@ private static class ConfigInfo {
9393
private final boolean ftpEnabled;
9494
private final String ftpType;
9595

96-
private final ZoneOffset timezone;
96+
private final ZoneId timezone;
9797

9898
private ConfigInfo() {
9999
Config config = ConfigParser.getConfig();

DriveBackup/src/main/java/ratismal/drivebackup/plugin/Scheduler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ratismal.drivebackup.plugin;
22

33
import java.time.DayOfWeek;
4-
import java.time.ZoneOffset;
4+
import java.time.ZoneId;
55
import java.time.ZonedDateTime;
66
import java.time.format.DateTimeFormatter;
77
import java.time.format.TextStyle;
@@ -54,7 +54,7 @@ public static void startBackupThread() {
5454
SchedulerUtil.cancelTasks(backupTasks);
5555
backupDatesList.clear();
5656
for (BackupScheduleEntry entry : config.backupScheduling.schedule) {
57-
ZoneOffset timezone = config.advanced.dateTimezone;
57+
ZoneId timezone = config.advanced.dateTimezone;
5858
for (DayOfWeek day : entry.days) {
5959
ZonedDateTime previousOccurrence = ZonedDateTime.now(timezone)
6060
.with(TemporalAdjusters.previous(day))

0 commit comments

Comments
 (0)