rmm commited on
Commit
09e4c7c
·
1 Parent(s): 756c23e

fix: use string form of timezone not tzinfo object

Browse files
Files changed (1) hide show
  1. src/input/input_handling.py +2 -2
src/input/input_handling.py CHANGED
@@ -236,7 +236,6 @@ def metadata_inputs_one_file(file:UploadedFile, image_hash:str, dbg_ix:int=0) ->
236
  dt = datetime.datetime.strptime(image_datetime_raw, time_fmt)
237
  date_value = dt.date()
238
  time_value = dt.time()
239
- tz_value = dt.tzinfo # could be None...
240
 
241
  #time_value = datetime.datetime.strptime(image_datetime_raw, '%Y:%m:%d %H:%M:%S').time()
242
  #date_value = datetime.datetime.strptime(image_datetime_raw, '%Y:%m:%d %H:%M:%S').date()
@@ -245,7 +244,6 @@ def metadata_inputs_one_file(file:UploadedFile, image_hash:str, dbg_ix:int=0) ->
245
  dt = datetime.datetime.now().astimezone().replace(microsecond=0)
246
  time_value = dt.time()
247
  date_value = dt.date()
248
- tz_value = dt.tzinfo
249
 
250
  #time_value = datetime.datetime.now().time() # Default to current time
251
  #date_value = datetime.datetime.now().date()
@@ -255,6 +253,8 @@ def metadata_inputs_one_file(file:UploadedFile, image_hash:str, dbg_ix:int=0) ->
255
  date = viewcontainer.date_input("Date for "+filename, value=date_value, key=f"input_date_{image_hash}")
256
  time = viewcontainer.time_input("Time for "+filename, time_value, key=f"input_time_{image_hash}")
257
 
 
 
258
  observation = InputObservation(image=image, latitude=latitude, longitude=longitude,
259
  author_email=author_email, image_datetime_raw=image_datetime_raw,
260
  date=date, time=time, timezone=tz_str,
 
236
  dt = datetime.datetime.strptime(image_datetime_raw, time_fmt)
237
  date_value = dt.date()
238
  time_value = dt.time()
 
239
 
240
  #time_value = datetime.datetime.strptime(image_datetime_raw, '%Y:%m:%d %H:%M:%S').time()
241
  #date_value = datetime.datetime.strptime(image_datetime_raw, '%Y:%m:%d %H:%M:%S').date()
 
244
  dt = datetime.datetime.now().astimezone().replace(microsecond=0)
245
  time_value = dt.time()
246
  date_value = dt.date()
 
247
 
248
  #time_value = datetime.datetime.now().time() # Default to current time
249
  #date_value = datetime.datetime.now().date()
 
253
  date = viewcontainer.date_input("Date for "+filename, value=date_value, key=f"input_date_{image_hash}")
254
  time = viewcontainer.time_input("Time for "+filename, time_value, key=f"input_time_{image_hash}")
255
 
256
+ tz_str = dt.strftime('%z') # this is numeric, otherwise the info isn't consistent.
257
+
258
  observation = InputObservation(image=image, latitude=latitude, longitude=longitude,
259
  author_email=author_email, image_datetime_raw=image_datetime_raw,
260
  date=date, time=time, timezone=tz_str,