Foppe Hemminga 6 лет назад
Родитель
Сommit
322e047d38
1 измененных файлов с 8 добавлено и 5 удалено
  1. 8 5
      _bs.py

+ 8 - 5
_bs.py

@@ -240,8 +240,8 @@ def get_racenet_races(html):
     date_parsed = arrow.get('Wednesday 14 August 2019', 'dddd DD MMMM YYYY')
     venue_name = ''
     print('{} tables found'.format(len(tables)))
-    regex_time = re.compile('([0-9]{2}:[0-9]{2})')
-    regex_venue_state = re.compile('([ a-zA-Z0-9]+) [(]([A-Z]{2,3})[)]$')
+    regex_time = re.compile('([\d]{2}:[\d]{2})')
+    regex_venue_state = re.compile('([ \w]+) \(([A-Z]{2,3})\)$')
     if tables:
         for table in tables:
             body = None
@@ -301,14 +301,17 @@ def get_racenet_races(html):
                                 time_string = time_match.group(1)
                             if time_string == 'TBA':
                                 continue
-                            if race_number:
+                            race_number_padded = td.get('data-race-number')
+                            if race_number_padded:
                                 race_number = td.get('data-race-number')[1:]
                             else:
+                                print("td.get('data-race-number'): {}".format(race_number_padded))
                                 continue
                             start_time = td.get('data-start-time')
-                            time_string_with_date = date_parsed.format('YYYY-MM-DD')+' '+time_string, 'YYYY-MM-DD HH:mm'
-                            local_time = arrow.get(time_string_with_date).time()
                             print(start_time)
+                            time_string_with_date = date_parsed.format('YYYY-MM-DD')+' '+time_string
+                            print(time_string_with_date)
+                            local_time = arrow.get(time_string_with_date, 'YYYY-MM-DD HH:mm').time()
                             utc_time = arrow.get(int(start_time)/1000).datetime
                             # print("td.get('data-race-number'): {}". format(race_number))
                             # print("td.get('data-start-time'): {}".format(start_time))