Fix bug where large year being entered may cause a crash.

CrossMgrVideo/MainWin.py

@@ -22,6 +22,8 @@
 from time import sleep
 from queue import Queue
 
+from DatePicker import SafeDatePickerCtrl
+
 from datetime import datetime, timedelta, time
 
 now = datetime.now
@@ -580,7 +582,7 @@ def __init__( self, parent, id = wx.ID_ANY, title='', size=(1000,800) ):
 		hsDate = wx.BoxSizer( wx.HORIZONTAL )
 		hsDate.Add( wx.StaticText(self, label='Show Triggers for'), flag=wx.ALIGN_CENTER_VERTICAL )
 		tQuery = now()
-		self.date = wx.adv.DatePickerCtrl(
+		self.date = SafeDatePickerCtrl(
 			self,
 			dt=wx.DateTime.FromDMY( tQuery.day, tQuery.month-1, tQuery.year ),
 			style=wx.adv.DP_DROPDOWN|wx.adv.DP_SHOWCENTURY

CrossMgrVideo/ManageDatabase.py

@@ -3,7 +3,7 @@
 import os
 import datetime
 
-DatePickerCtrl = wx.adv.DatePickerCtrl
+from DatePicker import SafeDatePickerCtrl
 
 class ManageDatabase( wx.Dialog ):
 	def __init__( self, parent, dbSize, dbName, trigFirst, trigLast, id=wx.ID_ANY, title='', size=wx.DefaultSize, style=wx.DEFAULT_DIALOG_STYLE ):
@@ -40,7 +40,7 @@ def __init__( self, parent, dbSize, dbName, trigFirst, trigLast, id=wx.ID_ANY, t
 		hs = wx.BoxSizer( wx.HORIZONTAL )
 		hs.Add( wx.StaticText(self, label='Delete all data (inclusive) from'), flag=wx.ALIGN_CENTER_VERTICAL )
 		tQuery = datetime.datetime.now() - datetime.timedelta(days=7)
-		self.dateFrom = DatePickerCtrl(
+		self.dateFrom = SafeDatePickerCtrl(
 			self,
 			dt=wx.DateTime.FromDMY( tQuery.day, tQuery.month-1, tQuery.year ),
 			style=wx.adv.DP_DROPDOWN|wx.adv.DP_SHOWCENTURY|wx.adv.DP_ALLOWNONE
@@ -49,7 +49,7 @@ def __init__( self, parent, dbSize, dbName, trigFirst, trigLast, id=wx.ID_ANY, t
 
 		hs.Add( wx.StaticText(self, label='to'), flag=wx.ALIGN_CENTER_VERTICAL|wx.LEFT, border=4 )
 		tQuery = datetime.datetime.now() - datetime.timedelta(days=1)
-		self.dateTo = DatePickerCtrl(
+		self.dateTo = SafeDatePickerCtrl(
 			self,
 			dt=wx.DateTime.FromDMY( tQuery.day, tQuery.month-1, tQuery.year ),
 			style=wx.adv.DP_DROPDOWN|wx.adv.DP_SHOWCENTURY|wx.adv.DP_ALLOWNONE

DatePicker.py

@@ -0,0 +1,31 @@
+from typing import Any
+
+import wx, wx.adv
+from wx.adv import DatePickerCtrl
+
+import Utils
+
+class SafeDatePickerCtrl(DatePickerCtrl):
+	def __init__(self,
+             *args: Any,
+             **kw: Any) -> None:
+		style = kw.pop('style', wx.adv.DP_DROPDOWN)
+		dt = kw.pop('dt', Utils.GetDateTimeToday())
+		super().__init__(style=style, dt=dt, *args, **kw)
+
+		currentRange = self.GetRange()
+		if not currentRange or not len(currentRange) == 2:
+			minRange = wx.DateTime.FromDMY(1, 0, 1900)
+			maxRange = wx.DateTime.FromDMY(1, 0, 2200)
+		else:
+			minRange = currentRange[1].Value
+			maxRange = currentRange[2].Value
+
+		if currentRange[2].Inv_Year < 1601:
+			maxRange = wx.DateTime.FromDMY(1, 0, 2200)
+
+		super().SetRange(
+			dt1=minRange,
+			dt2=maxRange
+		)
+

PointsRaceMgr/Configure.py

@@ -4,6 +4,8 @@
 
 import wx
 import wx.adv
+
+from DatePicker import SafeDatePickerCtrl
 from NumCtrl import PosNumCtrl
 import wx.lib.intctrl as IC
 
@@ -36,7 +38,7 @@ def __init__( self, parent, id=wx.ID_ANY, size=(200,200) ):
 		hs = wx.BoxSizer( wx.HORIZONTAL )
 		label = wx.StaticText( self, label='Date:' )
 		hs.Add( label, flag=wx.ALIGN_CENTER_VERTICAL|wx.LEFT, border=16 )
-		ctrl = wx.adv.DatePickerCtrl( self, style = wx.adv.DP_DROPDOWN | wx.adv.DP_SHOWCENTURY, size=(132,-1) )
+		ctrl = SafeDatePickerCtrl( self, style = wx.adv.DP_DROPDOWN | wx.adv.DP_SHOWCENTURY, size=(132,-1) )
 		ctrl.Bind( wx.adv.EVT_DATE_CHANGED, self.onChange )
 		hs.Add( ctrl, flag=wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.LEFT, border=4 )
 		self.dateLabel = label

Properties.py

@@ -1,4 +1,7 @@
+import sys
+
 import wx
+import wx.adv
 import re
 import os
 import wx.lib.intctrl as intctrl
@@ -8,6 +11,10 @@
 import threading
 import subprocess
 import platform
+
+from wx import CommandEvent
+
+from DatePicker import SafeDatePickerCtrl
 from RaceInputState import RaceInputState
 import Utils
 import Model
@@ -73,7 +80,7 @@ def __init__( self, parent, id = wx.ID_ANY ):
 		self.locationSizer.Add( self.raceCountry, 2, flag=wx.EXPAND|wx.LEFT, border=3 )
 
 		self.dateLabel = wx.StaticText( self, label = _('Date') )
-		self.date = wx.adv.DatePickerCtrl(
+		self.date = SafeDatePickerCtrl(
 			self,
 			dt = Utils.GetDateTimeToday(),
 			style = wx.adv.DP_DROPDOWN,
@@ -152,8 +159,12 @@ def refresh( self ):
 		self.raceCountry.SetValue( race.country )
 		self.raceDiscipline.SetValue( getattr(race, 'discipline', 'Cyclo-cross') )
 		d = wx.DateTime()
-		d.ParseDate(race.date)
-		self.date.SetValue( d )
+		try:
+			d.ParseDate(race.date)
+			self.date.SetValue( d )
+		except ValueError as e:
+			print('Bad date {}, Parse Error:'.format(race.date), e, file=sys.stderr)
+
 		self.raceNum.SetValue( race.raceNum )
 		self.scheduledStart.SetValue( race.scheduledStart )
 		self.minutes.SetValue( race.minutes )
@@ -169,16 +180,19 @@ def commit( self ):
 		race.stateProv = self.raceStateProv.GetValue().strip()
 		race.country = self.raceCountry.GetValue().strip()
 		race.discipline = self.raceDiscipline.GetValue().strip()
-		race.date = self.date.GetValue().Format(Properties.dateFormat)
+		try:
+			race.date = self.date.GetValue().Format(Properties.dateFormat)
+		except ValueError as e:
+			print('Bad date {}, Format Error:'.format(self.date.GetValue()), e, file=sys.stderr)
+
 		race.raceNum = self.raceNum.GetValue()
 		race.scheduledStart = self.scheduledStart.GetValue()
 		race.minutes = self.minutes.GetValue()
 		race.organizer = self.organizer.GetValue().strip()
 		race.commissaire = self.commissaire.GetValue().strip()
 		race.memo = self.memo.GetValue().strip()
 
-	def onChanged( self, event ):
-		#self.updateFileName()
+	def onChanged( self, event: CommandEvent ):
 		pass
 
 #------------------------------------------------------------------------------------------------

RaceDB.py

@@ -1,6 +1,6 @@
 import re
 import os
-import wx
+import wx, wx.adv
 import wx.dataview as dataview
 import requests
 import datetime
@@ -11,6 +11,8 @@
 import Utils
 import Model
 from AddExcelInfo		import getInfo
+from DatePicker import SafeDatePickerCtrl
+
 
 def GetRaceDBConfigFile():
 	return os.path.join( os.path.expanduser('~'), 'CrossMgrRaceDB.ini' )
@@ -223,7 +225,7 @@ def __init__( self, parent, id=wx.ID_ANY, size=(1100,600) ):
 		self.raceDBUrl.Bind( wx.EVT_TEXT_ENTER, self.onChange )
 		self.raceDBUrl.SetDropTarget(URLDropTarget(self.raceDBUrl, self.refresh))
 		raceDBLogo.SetDropTarget(URLDropTarget(self.raceDBUrl, self.refresh))
-		self.datePicker = wx.adv.DatePickerCtrl(
+		self.datePicker = SafeDatePickerCtrl(
 			self,
 			size=(120,-1),
 			dt=Utils.GetDateTimeToday(),

SprintMgr/FieldDef.py

@@ -2,7 +2,7 @@
 import datetime
 
 import wx
-from wx.adv import DatePickerCtrl
+from DatePicker import SafeDatePickerCtrl
 from wx.lib.intctrl import IntCtrl
 from wx.lib.masked.numctrl import NumCtrl
 from wx.lib.masked import TimeCtrl, EVT_TIMEUPDATE
@@ -74,7 +74,7 @@ def makeCtrls( self, parent ):
 			self.editCtrl.Bind( wx.EVT_TEXT, self.onChanged )
 
 		elif self.type == FieldDef.DateType:
-			self.editCtrl = DatePickerCtrl( parent, style = wx.adv.DP_DROPDOWN | wx.adv.DP_SHOWCENTURY, size=(120,-1))
+			self.editCtrl = SafeDatePickerCtrl( parent, style = wx.adv.DP_DROPDOWN | wx.adv.DP_SHOWCENTURY, size=(120,-1))
 			self.editCtrl.Bind( wx.adv.EVT_DATE_CHANGED, self.onChanged )
 
 		elif self.type == FieldDef.TimeType: