fix for #86: unknown time zone Argentina/Buenos_Aires

simulot · simulot · commit 8a988beadc21 · 2023-11-28T18:23:09.000+01:00
diff --git a/docs/releases.md b/docs/releases.md
@@ -1,5 +1,15 @@
 # Release notes 
 
+## Release 0.8.8
+
+### fix for #86: unknown time zone Argentina/Buenos_Aires
+
+On some systems, the time zone name is not well recognized.
+
+The new command line option set the time zone used by the program.
+`-time-zone=time_zone_name`
+
+
 ## Release 0.8.7
 
 ### fix for #82: PM files causing server's bad request 
diff --git a/helpers/tzone/timezone.go b/helpers/tzone/timezone.go
@@ -19,15 +19,21 @@ var (
 //
 //	to determine the local even on Windows
 //	check the env variable TZ
-func Local() (*time.Location, error) {
+
+func SetLocal(tz string) (*time.Location, error) {
 	onceSetLocal.Do(func() {
-		var tz string
-		tz, _err = tzlocal.RuntimeTZ()
-		if _err != nil {
-			return
+		if len(tz) == 0 {
+			tz, _err = tzlocal.RuntimeTZ()
+			if _err != nil {
+				return
+			}
 		}
-
 		_local, _err = time.LoadLocation(strings.TrimSuffix(tz, "\n"))
 	})
 	return _local, _err
+
+}
+
+func Local() (*time.Location, error) {
+	return SetLocal("")
 }
diff --git a/main.go b/main.go
@@ -64,6 +64,7 @@ type Application struct {
 	NoLogColors bool   // Disable log colors
 	LogLevel    string // Idicate the log level
 	Debug       bool   // Enable the debug mode
+	TimeZone    string // Override default TZ
 
 	Immich  *immich.ImmichClient // Immich client
 	Logger  *logger.Log          // Program's logger
@@ -78,10 +79,6 @@ func Run(ctx context.Context, log *logger.Log) (*logger.Log, error) {
 	if err != nil {
 		return log, err
 	}
-	_, err = tzone.Local()
-	if err != nil {
-		return log, err
-	}
 
 	app := Application{}
 	flag.StringVar(&app.Server, "server", "", "Immich server address (http://<your-ip>:2283 or https://<your-domain>)")
@@ -93,8 +90,14 @@ func Run(ctx context.Context, log *logger.Log) (*logger.Log, error) {
 	flag.StringVar(&app.LogFile, "log-file", "", "Write log messages into the file")
 	flag.BoolVar(&app.ApiTrace, "api-trace", false, "enable api call traces")
 	flag.BoolVar(&app.Debug, "debug", false, "enable debug messages")
+	flag.StringVar(&app.TimeZone, "time-zone", "", "Override the system time zone")
 	flag.Parse()
 
+	_, err = tzone.SetLocal(app.TimeZone)
+	if err != nil {
+		return log, err
+	}
+
 	if len(app.LogFile) > 0 {
 		flog, err := os.Create(app.LogFile)
 		if err != nil {
diff --git a/readme.md b/readme.md
@@ -51,9 +51,9 @@ immich-go -server URL -key KEY -general_options COMMAND -command_options... {fil
 - `WARNING`: Same as previous one plus non blocking error
 - `OK`: Same as previous plus actions
 - `INFO`: Same as previous one plus progressions
-
+<br>
 `-log-file=file` Write all messages to the file<br>
-
+`-time-zone=time_zone_name` Set the time zone<br>
 
 ## Command `upload`
 
