From 352aeb9180932fb2ccb64f87a028a719fb489d31 Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Fri, 31 Jul 2020 21:20:05 +0200 Subject: [PATCH] changed init methods of response_objects to match __init__(self, data) except for chart_data.py --- .gitignore | 1 + pyracing/response_objects/career_stats.py | 152 +++--- pyracing/response_objects/historical_data.py | 546 +++++++++---------- pyracing/response_objects/iracing_data.py | 42 +- pyracing/response_objects/session_data.py | 514 ++++++++--------- pyracing/response_objects/upcoming_events.py | 284 +++++----- 6 files changed, 770 insertions(+), 769 deletions(-) diff --git a/.gitignore b/.gitignore index 3c71af4..fa74883 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ build dist *.egg-info ir_webstats_rc/NewClient/cookie +/.vs diff --git a/pyracing/response_objects/career_stats.py b/pyracing/response_objects/career_stats.py index 3f80141..7492753 100644 --- a/pyracing/response_objects/career_stats.py +++ b/pyracing/response_objects/career_stats.py @@ -2,91 +2,91 @@ class CareerStats: - def __init__(self, dict): - self.category = parse_encode(dict['category']) - self.incidents_avg = round(dict['avgIncPerRace'], 2) - self.laps = dict['totalLaps'] - self.laps_led = dict['lapsLed'] - self.laps_led_pcnt = round(dict['lapsLedPerc'], 2) - self.points_avg = round(dict['avgPtsPerRace'], 2) - self.points_club = dict['totalclubpoints'] - self.poles = dict['poles'] - self.pos_finish_avg = round(dict['avgFinish'], 2) - self.pos_start_avg = round(dict['avgStart'], 2) - self.starts = dict['starts'] - self.top_5_pcnt = round(dict['top5Perc'], 2) - self.top_5s = dict['top5'] - self.win_pcnt = round(dict['winPerc'], 2) - self.wins = dict['wins'] + def __init__(self, data): + self.category = parse_encode(data['category']) + self.incidents_avg = round(data['avgIncPerRace'], 2) + self.laps = data['totalLaps'] + self.laps_led = data['lapsLed'] + self.laps_led_pcnt = round(data['lapsLedPerc'], 2) + self.points_avg = round(data['avgPtsPerRace'], 2) + self.points_club = data['totalclubpoints'] + self.poles = data['poles'] + self.pos_finish_avg = round(data['avgFinish'], 2) + self.pos_start_avg = round(data['avgStart'], 2) + self.starts = data['starts'] + self.top_5_pcnt = round(data['top5Perc'], 2) + self.top_5s = data['top5'] + self.win_pcnt = round(data['winPerc'], 2) + self.wins = data['wins'] class YearlyStats: - def __init__(self, dict): - self.category = parse_encode(dict['category']) - self.incidents_avg = round(dict['avgIncPerRace'], 2) - self.laps = dict['totalLaps'] - self.laps_led = dict['lapsLed'] - self.laps_led_pcnt = round(dict['lapsLedPerc'], 2) - self.points_avg = round(dict['avgPtsPerRace'], 2) - self.points_club = dict['clubpoints'] - self.poles = dict['poles'] - self.pos_finish_avg = round(dict['avgFinish'], 2) - self.pos_start_avg = round(dict['avgStart'], 2) - self.starts = dict['starts'] - self.top_5_pcnt = round(dict['top5Perc'], 2) - self.top_5s = dict['top5'] - self.win_pcnt = round(dict['winPerc'], 2) - self.wins = dict['wins'] - self.year = dict['year'] + def __init__(self, data): + self.category = parse_encode(data['category']) + self.incidents_avg = round(data['avgIncPerRace'], 2) + self.laps = data['totalLaps'] + self.laps_led = data['lapsLed'] + self.laps_led_pcnt = round(data['lapsLedPerc'], 2) + self.points_avg = round(data['avgPtsPerRace'], 2) + self.points_club = data['clubpoints'] + self.poles = data['poles'] + self.pos_finish_avg = round(data['avgFinish'], 2) + self.pos_start_avg = round(data['avgStart'], 2) + self.starts = data['starts'] + self.top_5_pcnt = round(data['top5Perc'], 2) + self.top_5s = data['top5'] + self.win_pcnt = round(data['winPerc'], 2) + self.wins = data['wins'] + self.year = data['year'] class LastRacesStats: - def __init__(self, dict): - self.date = dict['date'] - self.incidents = dict['incidents'] - self.laps_led = dict['lapsLed'] - self.points_champ = dict['champPoints'] - self.points_club = dict['clubPoints'] - self.pos_finish = dict['finishPos'] - self.pos_start = dict['startPos'] - self.season_id = dict['seasonID'] - self.series_id = dict['seriesID'] - self.strength_of_field = dict['sof'] - self.subsession_id = dict['subsessionID'] - self.time = dict['time'] - self.track = parse_encode(dict['trackName']) - self.winner_cust_id = dict['winnerID'] - self.winner_laps_led = dict['winnerLL'] - self.winner_name = parse_encode(dict['winnerName']) + def __init__(self, data): + self.date = data['date'] + self.incidents = data['incidents'] + self.laps_led = data['lapsLed'] + self.points_champ = data['champPoints'] + self.points_club = data['clubPoints'] + self.pos_finish = data['finishPos'] + self.pos_start = data['startPos'] + self.season_id = data['seasonID'] + self.series_id = data['seriesID'] + self.strength_of_field = data['sof'] + self.subsession_id = data['subsessionID'] + self.time = data['time'] + self.track = parse_encode(data['trackName']) + self.winner_cust_id = data['winnerID'] + self.winner_laps_led = data['winnerLL'] + self.winner_name = parse_encode(data['winnerName']) class LastSeries: - def __init__(self, dict): - self.car_class_id = dict['carClass'] - self.division = dict['division'] - self.incidents = dict['incidents'] - self.laps = dict['laps'] - self.laps_led = dict['lapsLead'] - self.points_champ = dict['champPoints'] - self.points_club = dict['clubPoints'] - self.pos_finish_avg = dict['avgFinish'] - self.pos_start_avg = dict['avgStart'] - self.season_id = dict['seasonID'] - self.season_name = parse_encode(dict['seasonName']) - self.season_name_short = parse_encode(dict['seasonShortName']) - self.series = parse_encode(dict['series']) - self.series_id = dict['seriesID'] - self.series_name_short = parse_encode(dict['seriesShortName']) - self.series_rank = dict['position'] - self.starts = dict['starts'] - self.top_5s = dict['top5'] - self.weeks = dict['weeks'] + def __init__(self, data): + self.car_class_id = data['carClass'] + self.division = data['division'] + self.incidents = data['incidents'] + self.laps = data['laps'] + self.laps_led = data['lapsLead'] + self.points_champ = data['champPoints'] + self.points_club = data['clubPoints'] + self.pos_finish_avg = data['avgFinish'] + self.pos_start_avg = data['avgStart'] + self.season_id = data['seasonID'] + self.season_name = parse_encode(data['seasonName']) + self.season_name_short = parse_encode(data['seasonShortName']) + self.series = parse_encode(data['series']) + self.series_id = data['seriesID'] + self.series_name_short = parse_encode(data['seriesShortName']) + self.series_rank = data['position'] + self.starts = data['starts'] + self.top_5s = data['top5'] + self.weeks = data['weeks'] class PersonalBests: - def __init__(self, dict): - self.event_type = dict['eventtypename'] - self.lap_best = parse_encode(dict['bestlaptimeformatted']) - self.track_config = parse_encode(dict['trackconfigname']) - self.track_id = dict['trackid'] - self.track_name = parse_encode(dict['trackname']) + def __init__(self, data): + self.event_type = data['eventtypename'] + self.lap_best = parse_encode(data['bestlaptimeformatted']) + self.track_config = parse_encode(data['trackconfigname']) + self.track_id = data['trackid'] + self.track_name = parse_encode(data['trackname']) diff --git a/pyracing/response_objects/historical_data.py b/pyracing/response_objects/historical_data.py index d080192..0c6090e 100644 --- a/pyracing/response_objects/historical_data.py +++ b/pyracing/response_objects/historical_data.py @@ -2,90 +2,90 @@ class EventResults: - def __init__(self, dict): - self.car_class_id = dict['29'] - self.car_id = dict['32'] - self.category_id = dict['33'] - self.cust_id = dict['23'] - self.date_start = parse_encode(dict['44']) - self.display_name = parse_encode(dict['48']) - self.event_type = dict['37'] - self.group_name = parse_encode(dict['19']) - self.helm_color_1 = dict['1'] - self.helm_color_2 = dict['14'] - self.helm_color_3 = dict['13'] - self.helm_license_level = dict['24'] - self.helm_pattern = dict['46'] - self.incidents = dict['39'] - self.lap_best = parse_encode(dict['38']) - self.lap_best_subsession = parse_encode(dict['7']) - self.lap_qual_best = parse_encode(dict['6']) - self.license_group = dict['35'] - self.official_session = dict['18'] - self.points_champ = dict['40'] - self.points_champ_sort = dict['43'] - self.points_club = dict['16'] - self.points_club_sort = dict['47'] - self.points_drop_race = dict['17'] - self.pos_finish = dict['3'] - self.pos_start = dict['12'] - self.race_week = dict['8'] - self.rank_session = dict['28'] - self.row_number = dict['26'] - self.season_id = dict['22'] - self.season_quarter = dict['34'] - self.season_year = dict['42'] - self.series_id = dict['20'] - self.session_id = dict['9'] - self.strength_of_field = dict['45'] - self.subsession_id = dict['41'] - self.time_finished = dict['10'] - self.time_start = parse_encode(dict['21']) - self.time_start_raw = dict['11'] - self.track_id = dict['30'] - self.winner_display_name = parse_encode(dict['31']) - self.winner_helm_color_1 = dict['5'] - self.winner_helm_color_2 = dict['2'] - self.winner_helm_color_3 = dict['4'] - self.winner_helm_pattern = dict['36'] - self.winner_license_level = dict['25'] - self.winners_group_id = dict['27'] + def __init__(self, data): + self.car_class_id = data['29'] + self.car_id = data['32'] + self.category_id = data['33'] + self.cust_id = data['23'] + self.date_start = parse_encode(data['44']) + self.display_name = parse_encode(data['48']) + self.event_type = data['37'] + self.group_name = parse_encode(data['19']) + self.helm_color_1 = data['1'] + self.helm_color_2 = data['14'] + self.helm_color_3 = data['13'] + self.helm_license_level = data['24'] + self.helm_pattern = data['46'] + self.incidents = data['39'] + self.lap_best = parse_encode(data['38']) + self.lap_best_subsession = parse_encode(data['7']) + self.lap_qual_best = parse_encode(data['6']) + self.license_group = data['35'] + self.official_session = data['18'] + self.points_champ = data['40'] + self.points_champ_sort = data['43'] + self.points_club = data['16'] + self.points_club_sort = data['47'] + self.points_drop_race = data['17'] + self.pos_finish = data['3'] + self.pos_start = data['12'] + self.race_week = data['8'] + self.rank_session = data['28'] + self.row_number = data['26'] + self.season_id = data['22'] + self.season_quarter = data['34'] + self.season_year = data['42'] + self.series_id = data['20'] + self.session_id = data['9'] + self.strength_of_field = data['45'] + self.subsession_id = data['41'] + self.time_finished = data['10'] + self.time_start = parse_encode(data['21']) + self.time_start_raw = data['11'] + self.track_id = data['30'] + self.winner_display_name = parse_encode(data['31']) + self.winner_helm_color_1 = data['5'] + self.winner_helm_color_2 = data['2'] + self.winner_helm_color_3 = data['4'] + self.winner_helm_pattern = data['36'] + self.winner_license_level = data['25'] + self.winners_group_id = data['27'] # Another instance of not in dict # self.rowcount = dict['15'] class SeasonStandings: - def __init__(self, dict): - self.club_id = dict['6'] - self.club_name = parse_encode(dict['23']) - self.country = parse_encode(dict['1']) - self.country_code = dict['4'] - self.country_name = parse_encode(dict['32']) - self.cust_id = dict['28'] - self.display_name = parse_encode(dict['26']) - self.division = dict['11'] - self.dropped = dict['5'] - self.helm_color_1 = dict['25'] - self.helm_color_2 = dict['27'] - self.helm_color_3 = dict['22'] - self.helm_pattern = dict['20'] - self.incidents = dict['13'] - self.irating = dict['3'] - self.laps = dict['7'] - self.laps_led = dict['24'] - self.license_level_max = dict['21'] - self.points = dict['10'] - self.poles = dict['19'] - self.pos = dict['30'] - self.pos_finish_avg = dict['9'] - self.pos_start_avg = dict['8'] - self.rank = dict['14'] - self.row = dict['31'] - self.starts = dict['15'] - self.sub_level = parse_encode(dict['29']) - self.top_fives = dict['12'] - self.week = dict['2'] - self.wins = dict['17'] + def __init__(self, data): + self.club_id = data['6'] + self.club_name = parse_encode(data['23']) + self.country = parse_encode(data['1']) + self.country_code = data['4'] + self.country_name = parse_encode(data['32']) + self.cust_id = data['28'] + self.display_name = parse_encode(data['26']) + self.division = data['11'] + self.dropped = data['5'] + self.helm_color_1 = data['25'] + self.helm_color_2 = data['27'] + self.helm_color_3 = data['22'] + self.helm_pattern = data['20'] + self.incidents = data['13'] + self.irating = data['3'] + self.laps = data['7'] + self.laps_led = data['24'] + self.license_level_max = data['21'] + self.points = data['10'] + self.poles = data['19'] + self.pos = data['30'] + self.pos_finish_avg = data['9'] + self.pos_start_avg = data['8'] + self.rank = data['14'] + self.row = data['31'] + self.starts = data['15'] + self.sub_level = parse_encode(data['29']) + self.top_fives = data['12'] + self.week = data['2'] + self.wins = data['17'] # Used only on webpage to highlight the member in relaton to others # self.custrow = dict['16'] @@ -93,215 +93,215 @@ def __init__(self, dict): class DriverStats: - def __init__(self, dict): - self.club_id = dict['5'] - self.club_name = parse_encode(dict['29']) - self.club_points = dict['21'] - self.country_code = dict['4'] - self.cust_id = dict['34'] - self.display_name = parse_encode(dict['32']) - self.field_size_avg = dict['13'] - self.group_letter = dict['39'] - self.group_name = parse_encode(dict['24']) - self.helm_color_1 = dict['31'] - self.helm_color_2 = dict['33'] - self.helm_color_3 = dict['28'] - self.helm_face_type = dict['36'] - self.helm_helmet_type = dict['10'] - self.helm_pattern = dict['22'] - self.incidents_avg = dict['26'] - self.irating = dict['3'] - self.irating_rank = dict['2'] - self.laps = dict['7'] - self.laps_led = dict['30'] - self.license_class = parse_encode(dict['16']) - self.license_class_id = dict['12'] - self.license_class_rank = dict['19'] - self.license_level = dict['23'] - self.points = dict['11'] - self.points_avg = dict['27'] - self.pos_finish_avg = dict['9'] - self.pos_start_avg = dict['8'] - self.rank = dict['14'] - self.region = parse_encode(dict['38']) - self.row = dict['37'] - self.starts = dict['15'] - self.sub_level = dict['35'] - self.top_25_percent = dict['1'] - self.ttrating = dict['25'] - self.ttrating_rank = dict['6'] - self.wins = dict['18'] + def __init__(self, data): + self.club_id = data['5'] + self.club_name = parse_encode(data['29']) + self.club_points = data['21'] + self.country_code = data['4'] + self.cust_id = data['34'] + self.display_name = parse_encode(data['32']) + self.field_size_avg = data['13'] + self.group_letter = data['39'] + self.group_name = parse_encode(data['24']) + self.helm_color_1 = data['31'] + self.helm_color_2 = data['33'] + self.helm_color_3 = data['28'] + self.helm_face_type = data['36'] + self.helm_helmet_type = data['10'] + self.helm_pattern = data['22'] + self.incidents_avg = data['26'] + self.irating = data['3'] + self.irating_rank = data['2'] + self.laps = data['7'] + self.laps_led = data['30'] + self.license_class = parse_encode(data['16']) + self.license_class_id = data['12'] + self.license_class_rank = data['19'] + self.license_level = data['23'] + self.points = data['11'] + self.points_avg = data['27'] + self.pos_finish_avg = data['9'] + self.pos_start_avg = data['8'] + self.rank = data['14'] + self.region = parse_encode(data['38']) + self.row = data['37'] + self.starts = data['15'] + self.sub_level = data['35'] + self.top_25_percent = data['1'] + self.ttrating = data['25'] + self.ttrating_rank = data['6'] + self.wins = data['18'] # These are only used in front end webpage; Not in dict results # self.custrow = dict['17'] # self.rowcount = dict['20'] class WorldRecords: - def __init__(self, dict): - self.car_id = dict['9'] - self.cat_id = dict['10'] - self.category = parse_encode(dict['35']) - self.club_id = dict['7'] - self.club_name = parse_encode(dict['27']) - self.country_code = dict['6'] - self.cust_id = dict['31'] - self.display_name = parse_encode(dict['29']) - self.helm_color_1 = dict['28'] - self.helm_color_2 = dict['30'] - self.helm_color_3 = dict['26'] - self.helm_pattern = dict['22'] - self.irating = dict['4'] - self.license_class = parse_encode(dict['3']) - self.license_class_id = dict['14'] - self.license_level = dict['23'] - self.practice = parse_encode(dict['2']) - self.practice_start_time = dict['8'] - self.practice_subsession_id = dict['13'] - self.qualify = parse_encode(dict['15']) - self.qualify_subsession_id = dict['36'] - self.qualify_time_start = dict['21'] - self.race = parse_encode(dict['19']) - self.race_start_time = dict['18'] - self.race_subsession_id = dict['11'] - self.region = parse_encode(dict['34']) - self.row = dict['33'] - self.season_quarter = dict['12'] - self.season_year = dict['17'] - self.sub_level = dict['32'] - self.timetrial = parse_encode(dict['37']) - self.track_id = dict['5'] - self.tt_start_time = dict['25'] - self.tt_subsession_id = dict['1'] - self.ttrating = dict['24'] + def __init__(self, data): + self.car_id = data['9'] + self.cat_id = data['10'] + self.category = parse_encode(data['35']) + self.club_id = data['7'] + self.club_name = parse_encode(data['27']) + self.country_code = data['6'] + self.cust_id = data['31'] + self.display_name = parse_encode(data['29']) + self.helm_color_1 = data['28'] + self.helm_color_2 = data['30'] + self.helm_color_3 = data['26'] + self.helm_pattern = data['22'] + self.irating = data['4'] + self.license_class = parse_encode(data['3']) + self.license_class_id = data['14'] + self.license_level = data['23'] + self.practice = parse_encode(data['2']) + self.practice_start_time = data['8'] + self.practice_subsession_id = data['13'] + self.qualify = parse_encode(data['15']) + self.qualify_subsession_id = data['36'] + self.qualify_time_start = data['21'] + self.race = parse_encode(data['19']) + self.race_start_time = data['18'] + self.race_subsession_id = data['11'] + self.region = parse_encode(data['34']) + self.row = data['33'] + self.season_quarter = data['12'] + self.season_year = data['17'] + self.sub_level = data['32'] + self.timetrial = parse_encode(data['37']) + self.track_id = data['5'] + self.tt_start_time = data['25'] + self.tt_subsession_id = data['1'] + self.ttrating = data['24'] # Data not used in the 'r' dictionary. Only for webpage display. # self.custrow = dict['16'] # self.rowcount = dict['20'] class PrivateResults: - def __init__(self, dict): - self.car_class_id = dict['carclassid'] - self.car_ids = parse_encode(dict['carids']) - self.cat_id = dict['catid'] - self.created = dict['created'] - self.drivers_max = dict['maxdrivers'] - self.fast_tows_num = dict['numfasttows'] - self.fixed_setup = dict['fixed_setup'] - self.fog_density = dict['weather_fog_density'] - self.full_course_cautions = dict['fullcoursecautions'] - self.hardcore_level = dict['hardcorelevel'] - self.host_cust_id = dict['host_custid'] - self.host_display_name = parse_encode(dict['host_displayname']) - self.host_helmet_color_1 = dict['host_helmet_color1'] - self.host_helmet_color_2 = dict['host_helmet_color2'] - self.host_helmet_color_3 = dict['host_helmet_color3'] - self.host_helmet_face_type = dict['host_helmet_facetype'] - self.host_helmet_helmet_type = dict['host_helmet_helmettype'] - self.host_helmet_pattern = dict['host_helmet_pattern'] - self.host_license_level = dict['host_licenselevel'] - self.humidity = dict['weather_rh'] - self.incidents = dict['incidents'] - self.ir_max = dict['maxir'] - self.ir_min = dict['minir'] - self.lap_best = dict['bestlaptime'] - self.lic_level_max = dict['maxliclevel'] - self.lic_level_min = dict['minliclevel'] - self.lonequalify = dict['lonequalify'] - self.multiclass = dict['multiclass'] - self.pct_fuel_fills_max = parse_encode(dict['max_pct_fuel_fills']) - self.pos_finish = dict['finishingposition'] - self.pos_finish_class = dict['classfinishingposition'] - self.pos_start = dict['startingposition'] - self.pos_start_class = dict['classstartingposition'] - self.practice_length = dict['practicelength'] - self.private = dict['private'] - self.qual_laps = dict['qualifylaps'] - self.qual_length = dict['qualifylength'] - self.qual_setup_filenames = dict['qualsetupfilenames'] - self.qual_setup_ids = dict['qualsetupids'] - self.race_laps = dict['racelaps'] - self.race_length = dict['racelength'] - self.race_setup_filenames = dict['racesetupfilenames'] - self.race_setup_ids = dict['racesetupids'] - self.race_time_finished = dict['racefinishedat'] - self.restarts = dict['restarts'] - self.rolling_starts = dict['rollingstarts'] - self.row = dict['rn'] - self.session_fast_lap = dict['sessionfastlap'] - self.session_id = dict['sessionid'] - self.session_id_private = dict['privatesessionid'] - self.session_name = parse_encode(dict['sessionname']) - self.skies = dict['weather_skies'] - self.subsession_id = dict['subsessionid'] - self.subsession_time_finished = dict['subsessionfinishedat'] - self.temp_unit = dict['weather_temp_units'] - self.temp_value = dict['weather_temp_value'] - self.time_of_day = dict['timeofday'] - self.time_start = dict['start_time'] - self.track = parse_encode(dict['track_name']) - self.track_id = dict['trackid'] - self.weather_type = dict['weather_type'] - self.weight_penalties = dict['weight_penalties'] - self.wind_direction = dict['weather_wind_dir'] - self.wind_speed_unit = dict['weather_wind_speed_units'] - self.wind_speed_value = dict['weather_wind_speed_value'] - self.winner_display_name = parse_encode(dict['winner_displayname']) - self.winner_display_names = parse_encode(dict['winner_displaynames']) - self.winner_group_id = dict['winnersgroupid'] - self.winner_helmet_color_1 = dict['winner_helmet_color1'] - self.winner_helmet_color_2 = dict['winner_helmet_color2'] - self.winner_helmet_color_3 = dict['winner_helmet_color3'] - self.winner_helmet_pattern = dict['winner_helmet_pattern'] - self.winner_license_level = dict['winner_licenselevel'] + def __init__(self, data): + self.car_class_id = data['carclassid'] + self.car_ids = parse_encode(data['carids']) + self.cat_id = data['catid'] + self.created = data['created'] + self.drivers_max = data['maxdrivers'] + self.fast_tows_num = data['numfasttows'] + self.fixed_setup = data['fixed_setup'] + self.fog_density = data['weather_fog_density'] + self.full_course_cautions = data['fullcoursecautions'] + self.hardcore_level = data['hardcorelevel'] + self.host_cust_id = data['host_custid'] + self.host_display_name = parse_encode(data['host_displayname']) + self.host_helmet_color_1 = data['host_helmet_color1'] + self.host_helmet_color_2 = data['host_helmet_color2'] + self.host_helmet_color_3 = data['host_helmet_color3'] + self.host_helmet_face_type = data['host_helmet_facetype'] + self.host_helmet_helmet_type = data['host_helmet_helmettype'] + self.host_helmet_pattern = data['host_helmet_pattern'] + self.host_license_level = data['host_licenselevel'] + self.humidity = data['weather_rh'] + self.incidents = data['incidents'] + self.ir_max = data['maxir'] + self.ir_min = data['minir'] + self.lap_best = data['bestlaptime'] + self.lic_level_max = data['maxliclevel'] + self.lic_level_min = data['minliclevel'] + self.lonequalify = data['lonequalify'] + self.multiclass = data['multiclass'] + self.pct_fuel_fills_max = parse_encode(data['max_pct_fuel_fills']) + self.pos_finish = data['finishingposition'] + self.pos_finish_class = data['classfinishingposition'] + self.pos_start = data['startingposition'] + self.pos_start_class = data['classstartingposition'] + self.practice_length = data['practicelength'] + self.private = data['private'] + self.qual_laps = data['qualifylaps'] + self.qual_length = data['qualifylength'] + self.qual_setup_filenames = data['qualsetupfilenames'] + self.qual_setup_ids = data['qualsetupids'] + self.race_laps = data['racelaps'] + self.race_length = data['racelength'] + self.race_setup_filenames = data['racesetupfilenames'] + self.race_setup_ids = data['racesetupids'] + self.race_time_finished = data['racefinishedat'] + self.restarts = data['restarts'] + self.rolling_starts = data['rollingstarts'] + self.row = data['rn'] + self.session_fast_lap = data['sessionfastlap'] + self.session_id = data['sessionid'] + self.session_id_private = data['privatesessionid'] + self.session_name = parse_encode(data['sessionname']) + self.skies = data['weather_skies'] + self.subsession_id = data['subsessionid'] + self.subsession_time_finished = data['subsessionfinishedat'] + self.temp_unit = data['weather_temp_units'] + self.temp_value = data['weather_temp_value'] + self.time_of_day = data['timeofday'] + self.time_start = data['start_time'] + self.track = parse_encode(data['track_name']) + self.track_id = data['trackid'] + self.weather_type = data['weather_type'] + self.weight_penalties = data['weight_penalties'] + self.wind_direction = data['weather_wind_dir'] + self.wind_speed_unit = data['weather_wind_speed_units'] + self.wind_speed_value = data['weather_wind_speed_value'] + self.winner_display_name = parse_encode(data['winner_displayname']) + self.winner_display_names = parse_encode(data['winner_displaynames']) + self.winner_group_id = data['winnersgroupid'] + self.winner_helmet_color_1 = data['winner_helmet_color1'] + self.winner_helmet_color_2 = data['winner_helmet_color2'] + self.winner_helmet_color_3 = data['winner_helmet_color3'] + self.winner_helmet_pattern = data['winner_helmet_pattern'] + self.winner_license_level = data['winner_licenselevel'] class SeriesRaceResults: - def __init__(self, dict): - self.car_class_id = dict['2'] - self.official = dict['6'] - self.session_id = dict['4'] - self.size_of_field = dict['7'] - self.strength_of_field = dict['8'] - self.subsession_id = dict['5'] - self.time_start = dict['1'] - self.track_id = dict['3'] + def __init__(self, data): + self.car_class_id = data['2'] + self.official = data['6'] + self.session_id = data['4'] + self.size_of_field = data['7'] + self.strength_of_field = data['8'] + self.subsession_id = data['5'] + self.time_start = data['1'] + self.track_id = data['3'] class Team: - def __init__(self, dict): - self.cars = parse_encode(dict['cars']) - self.class_finish_pos_avg = dict['avgclassfinishingposition'] - self.class_poles = dict['classpoles'] - self.class_size_of_field_avg = dict['avgclasssizeoffield'] - self.class_start_pos_avg = dict['avgclassstartingposition'] - self.class_strength_of_field_avg = dict['avgclassstrengthoffield'] - self.class_top_10_pcnt = dict['classtop10pcnt'] - self.class_top_25_percent = dict['classtop25pcnt'] - self.class_top_five = dict['classtopfive'] - self.class_wins = dict['classwins'] - self.color_1 = dict['color1'] - self.color_2 = dict['color2'] - self.color_3 = dict['color3'] - self.cust_id = dict['custid'] - self.event_finish_pos_avg = dict['avgeventfinishingposition'] - self.event_poles = dict['eventpoles'] - self.event_pos_start_avg = dict['avgeventstartingposition'] - self.event_size_of_field_avg = dict['avgeventsizeoffield'] - self.event_strength_of_field_avg = dict['avgeventstrengthoffield'] - self.event_top_10_pcnt = dict['eventtop10pcnt'] - self.event_top_25_pcnt = dict['eventtop25pcnt'] - self.event_top_fives = dict['eventtopfive'] - self.event_wins = dict['eventwins'] - self.face_type = dict['facetype'] - self.helmet_type = dict['helmettype'] - self.incidents = dict['incidents'] - self.laps_comp = dict['lapscomplete'] - self.laps_led = dict['lapslead'] - self.license_level = dict['licenselevel'] - self.name = parse_encode(dict['name']) - self.pattern = dict['pattern'] - self.team_id = dict['teamid'] - self.team_ranking = dict['team_ranking'] - self.week_dropped = dict['weekdropped'] - self.week_points = dict['weekpoints'] - self.week_starts = dict['weekstarts'] + def __init__(self, data): + self.cars = parse_encode(data['cars']) + self.class_finish_pos_avg = data['avgclassfinishingposition'] + self.class_poles = data['classpoles'] + self.class_size_of_field_avg = data['avgclasssizeoffield'] + self.class_start_pos_avg = data['avgclassstartingposition'] + self.class_strength_of_field_avg = data['avgclassstrengthoffield'] + self.class_top_10_pcnt = data['classtop10pcnt'] + self.class_top_25_percent = data['classtop25pcnt'] + self.class_top_five = data['classtopfive'] + self.class_wins = data['classwins'] + self.color_1 = data['color1'] + self.color_2 = data['color2'] + self.color_3 = data['color3'] + self.cust_id = data['custid'] + self.event_finish_pos_avg = data['avgeventfinishingposition'] + self.event_poles = data['eventpoles'] + self.event_pos_start_avg = data['avgeventstartingposition'] + self.event_size_of_field_avg = data['avgeventsizeoffield'] + self.event_strength_of_field_avg = data['avgeventstrengthoffield'] + self.event_top_10_pcnt = data['eventtop10pcnt'] + self.event_top_25_pcnt = data['eventtop25pcnt'] + self.event_top_fives = data['eventtopfive'] + self.event_wins = data['eventwins'] + self.face_type = data['facetype'] + self.helmet_type = data['helmettype'] + self.incidents = data['incidents'] + self.laps_comp = data['lapscomplete'] + self.laps_led = data['lapslead'] + self.license_level = data['licenselevel'] + self.name = parse_encode(data['name']) + self.pattern = data['pattern'] + self.team_id = data['teamid'] + self.team_ranking = data['team_ranking'] + self.week_dropped = data['weekdropped'] + self.week_points = data['weekpoints'] + self.week_starts = data['weekstarts'] diff --git a/pyracing/response_objects/iracing_data.py b/pyracing/response_objects/iracing_data.py index 2386d97..1a74b7c 100644 --- a/pyracing/response_objects/iracing_data.py +++ b/pyracing/response_objects/iracing_data.py @@ -10,15 +10,15 @@ def __init__(self, data): # Common denominator for CarClass attributes across all data. class CarClass: - def __init__(self, dict): - self.cust_id = dict['custid'] - self.id = dict['id'] - self.name_lower = parse_encode(dict['lowername']) - self.name = parse_encode(dict['name']) - self.rel_speed = dict['relspeed'] # Speed ranking to other classes - self.name_short = parse_encode(dict['shortname']) + def __init__(self, data): + self.cust_id = data['custid'] + self.id = data['id'] + self.name_lower = parse_encode(data['lowername']) + self.name = parse_encode(data['name']) + self.rel_speed = data['relspeed'] # Speed ranking to other classes + self.name_short = parse_encode(data['shortname']) # Creating subclass from nested list - self.cars = [Car(x) for x in dict['carsinclass']] + self.cars = [Car(x) for x in data['carsinclass']] # I believe this maps what I would call a series, but @@ -72,25 +72,25 @@ def __init__(self, data): class MemberDivision: - def __init__(self, dict): - self.division = dict['division'] - self.division_projected = dict['isProjected'] + def __init__(self, data): + self.division = data['division'] + self.division_projected = data['isProjected'] class Helmet: - def __init__(self, dict): - self.c3 = dict.get('c3') - self.ll = dict.get('ll') - self.hp = dict.get('hp') - self.ht = dict.get('ht') - self.c1 = dict.get('c1') - self.ft = dict.get('ft') - self.c2 = dict.get('c2') + def __init__(self, data): + self.c3 = data.get('c3') + self.ll = data.get('ll') + self.hp = data.get('hp') + self.ht = data.get('ht') + self.c1 = data.get('c1') + self.ft = data.get('ft') + self.c2 = data.get('c2') class DriverStatus: - def __init__(self, dict): - status = dict['status'] + def __init__(self, data): + status = data['status'] self.name = parse_encode(status.get('name')) self.last_login = datetime_from_iracing_timestamp( diff --git a/pyracing/response_objects/session_data.py b/pyracing/response_objects/session_data.py index b43236d..34771e8 100644 --- a/pyracing/response_objects/session_data.py +++ b/pyracing/response_objects/session_data.py @@ -2,284 +2,284 @@ class SubSessionData: - def __init__(self, dict): - self.cat_id = dict['catid'] - self.caution_laps = dict['ncautionlaps'] - self.caution_type = dict['cautiontype'] - self.cautions = dict['ncautions'] - self.corners_total = dict['cornersperlap'] - self.driver_change_param_1 = dict['driver_change_param1'] - self.driver_change_param_2 = dict['driver_change_param2'] - self.driver_change_rule = dict['driver_change_rule'] - self.driver_changes = dict['driver_changes'] - self.event_type = dict['evttype'] - self.fog_density = dict['weather_fog_density'] - self.humidity = dict['weather_rh'] - self.lap_avg = dict['eventavglap'] - self.laps_completed = dict['eventlapscomplete'] - self.laps_for_qual_avg = dict['nlapsforqualavg'] - self.laps_for_solo_avg = dict['nlapsforsoloavg'] - self.lead_changes = dict['nleadchanges'] - self.league_id = dict['leagueid'] - self.league_season_id = dict['league_season_id'] - self.leave_marbles = dict['leavemarbles'] - self.max_weeks = dict['maxweeks'] - self.points_type = dict['pointstype'] - self.private_session_id = dict['privatesessionid'] - self.race_week = dict['race_week_num'] - self.reserve_status = dict['rserv_status'] - self.rubber_practice = dict['rubberlevel_practice'] - self.rubber_qualify = dict['rubberlevel_qualify'] - self.rubber_race = dict['rubberlevel_race'] - self.rubber_warmup = dict['rubberlevel_warmup'] - self.season_id = dict['seasonid'] - self.season_name = parse_encode(dict['season_name']) - self.season_name_short = parse_encode(dict['season_shortname']) - self.season_quarter = dict['season_quarter'] - self.season_year = dict['season_year'] - self.series_id = dict['seriesid'] - self.series_name = parse_encode(dict['series_name']) - self.series_name_short = parse_encode(dict['series_shortname']) - self.session_id = dict['sessionid'] - self.session_name = parse_encode(dict['sessionname']) - self.sim_ses_type = dict['simsestype'] - self.skies = dict['weather_skies'] - self.special_event_type = dict['specialeventtype'] - self.special_event_type_text = dict['specialeventtypetext'] - self.strength_of_field = dict['eventstrengthoffield'] - self.subsession_id = dict['subsessionid'] - self.team_drivers_max = dict['max_team_drivers'] - self.team_drivers_min = dict['min_team_drivers'] - self.temp_unit = dict['weather_temp_units'] - self.temp_value = dict['weather_temp_value'] - self.time_of_day = dict['timeofday'] - self.time_start = parse_encode(dict['start_time']) - self.time_start_sim = parse_encode(dict['simulatedstarttime']) - self.track = parse_encode(dict['track_name']) - self.track_config = parse_encode(dict['track_config_name']) - self.track_id = dict['trackid'] - self.weather_initial = dict['weather_var_initial'] - self.weather_ongoing = dict['weather_var_ongoing'] - self.weather_type = dict['weather_type'] - self.wind_direction = dict['weather_wind_dir'] - self.wind_speed_unit = dict['weather_wind_speed_units'] - self.wind_speed_value = dict['weather_wind_speed_value'] + def __init__(self, data): + self.cat_id = data['catid'] + self.caution_laps = data['ncautionlaps'] + self.caution_type = data['cautiontype'] + self.cautions = data['ncautions'] + self.corners_total = data['cornersperlap'] + self.driver_change_param_1 = data['driver_change_param1'] + self.driver_change_param_2 = data['driver_change_param2'] + self.driver_change_rule = data['driver_change_rule'] + self.driver_changes = data['driver_changes'] + self.event_type = data['evttype'] + self.fog_density = data['weather_fog_density'] + self.humidity = data['weather_rh'] + self.lap_avg = data['eventavglap'] + self.laps_completed = data['eventlapscomplete'] + self.laps_for_qual_avg = data['nlapsforqualavg'] + self.laps_for_solo_avg = data['nlapsforsoloavg'] + self.lead_changes = data['nleadchanges'] + self.league_id = data['leagueid'] + self.league_season_id = data['league_season_id'] + self.leave_marbles = data['leavemarbles'] + self.max_weeks = data['maxweeks'] + self.points_type = data['pointstype'] + self.private_session_id = data['privatesessionid'] + self.race_week = data['race_week_num'] + self.reserve_status = data['rserv_status'] + self.rubber_practice = data['rubberlevel_practice'] + self.rubber_qualify = data['rubberlevel_qualify'] + self.rubber_race = data['rubberlevel_race'] + self.rubber_warmup = data['rubberlevel_warmup'] + self.season_id = data['seasonid'] + self.season_name = parse_encode(data['season_name']) + self.season_name_short = parse_encode(data['season_shortname']) + self.season_quarter = data['season_quarter'] + self.season_year = data['season_year'] + self.series_id = data['seriesid'] + self.series_name = parse_encode(data['series_name']) + self.series_name_short = parse_encode(data['series_shortname']) + self.session_id = data['sessionid'] + self.session_name = parse_encode(data['sessionname']) + self.sim_ses_type = data['simsestype'] + self.skies = data['weather_skies'] + self.special_event_type = data['specialeventtype'] + self.special_event_type_text = data['specialeventtypetext'] + self.strength_of_field = data['eventstrengthoffield'] + self.subsession_id = data['subsessionid'] + self.team_drivers_max = data['max_team_drivers'] + self.team_drivers_min = data['min_team_drivers'] + self.temp_unit = data['weather_temp_units'] + self.temp_value = data['weather_temp_value'] + self.time_of_day = data['timeofday'] + self.time_start = parse_encode(data['start_time']) + self.time_start_sim = parse_encode(data['simulatedstarttime']) + self.track = parse_encode(data['track_name']) + self.track_config = parse_encode(data['track_config_name']) + self.track_id = data['trackid'] + self.weather_initial = data['weather_var_initial'] + self.weather_ongoing = data['weather_var_ongoing'] + self.weather_type = data['weather_type'] + self.wind_direction = data['weather_wind_dir'] + self.wind_speed_unit = data['weather_wind_speed_units'] + self.wind_speed_value = data['weather_wind_speed_value'] - self.drivers = [self.Driver(x) for x in dict['rows']] + self.drivers = [self.Driver(x) for x in data['rows']] class Driver: - def __init__(self, dict): - self.car_class_id = dict['carclassid'] - self.car_class_name = parse_encode(dict['ccName']) - self.car_class_name_short = parse_encode(dict['ccNameShort']) - self.car_color_1 = dict['car_color1'] - self.car_color_2 = dict['car_color2'] - self.car_color_3 = dict['car_color3'] - self.car_id = dict['carid'] - self.car_num = dict['carnum'] - self.car_num_font = dict['carnumberfont'] - self.car_num_slant = dict['carnumberslant'] - self.car_number_color_1 = dict['car_number_color1'] - self.car_number_color_2 = dict['car_number_color2'] - self.car_number_color_3 = dict['car_number_color3'] - self.car_pattern = dict['car_pattern'] - self.car_sponser_1 = dict['carsponsor1'] - self.car_sponser_2 = dict['carsponsor2'] - self.club_id = dict['clubid'] - self.club_name = parse_encode(dict['clubname']) - self.club_name_short = parse_encode(dict['clubshortname']) - self.club_points = dict['clubpoints'] - self.cpi_new = dict['newcpi'] - self.cpi_old = dict['oldcpi'] - self.cust_id = dict['custid'] - self.damage_model = dict['damage_model'] - self.display_name = parse_encode(dict['displayname']) - self.division = dict['division'] - self.division_name = parse_encode(dict['divisionname']) - self.drop_race = dict['dropracepoints'] - self.event_type_name = parse_encode(dict['evttypename']) - self.group_id = dict['groupid'] - self.heat_info_id = dict['heatinfoid'] - self.helm_color_1 = dict['helm_color1'] - self.helm_color_2 = dict['helm_color2'] - self.helm_color_3 = dict['helm_color3'] - self.helm_pattern = dict['helm_pattern'] - self.host_id = dict['hostid'] - self.incidents = dict['incidents'] - self.interval = dict['interval'] - self.interval_class = dict['classinterval'] - self.irating_new = dict['newirating'] - self.irating_old = dict['oldirating'] - self.lap_avg = dict['avglap'] - self.lap_best = dict['bestlaptime'] - self.lap_best_n = dict['bestlapnum'] - self.lap_qual_best = dict['bestquallaptime'] - self.lap_qual_best_at = dict['bestquallapat'] - self.lap_qual_best_n = dict['bestquallapnum'] - self.lap_qual_best_time = dict['quallaptime'] - self.laps_best_n_num = dict['bestnlapsnum'] - self.laps_best_n_time = dict['bestnlapstime'] - self.laps_comp = dict['lapscomplete'] - self.laps_led = dict['lapslead'] - self.laps_opt_comp = dict['optlapscomplete'] - self.league_points = dict['league_points'] - self.license_category = parse_encode(dict['licensecategory']) - self.license_change_oval = dict['license_change_oval'] - self.license_change_road = dict['license_change_road'] - self.license_class = dict['licensegroup'] - self.license_level_new = dict['newlicenselevel'] - self.license_level_old = dict['oldlicenselevel'] - self.multiplier = dict['multiplier'] - self.official = dict['officialsession'] - self.pct_fuel_fill_max = dict['max_pct_fuel_fill'] - self.points_champ = dict['champpoints'] - self.points_champ_agg = dict['aggchamppoints'] - self.pos = dict['pos'] - self.pos_finish = dict['finishpos'] - self.pos_finish_class = dict['finishposinclass'] - self.pos_start = dict['startpos'] - self.reason_out = parse_encode(dict['reasonout']) - self.reason_out_id = dict['reasonoutid'] - self.restrict_results = parse_encode(dict['restrictresults']) - self.sim_ses_name = parse_encode(dict['simsesname']) - self.sim_ses_num = dict['simsesnum'] - self.sim_ses_type_name = parse_encode(dict['simsestypename']) - self.sub_level_new = dict['newsublevel'] - self.sub_level_old = dict['oldsublevel'] - self.suit_color_1 = dict['suit_color1'] - self.suit_color_2 = dict['suit_color2'] - self.suit_color_3 = dict['suit_color3'] - self.suit_pattern = dict['suit_pattern'] - self.time_session_start = dict['sessionstarttime'] - self.track_cat_id = dict['track_catid'] - self.track_category = parse_encode(dict['track_category']) - self.ttrating_new = dict['newttrating'] - self.ttrating_old = dict['oldttrating'] - self.vehicle_key_id = dict['vehiclekeyid'] - self.weight_penalty_kg = dict['weight_penalty_kg'] - self.wheel_chrome = dict['wheel_chrome'] - self.wheel_color = parse_encode(dict['wheel_color']) + def __init__(self, data): + self.car_class_id = data['carclassid'] + self.car_class_name = parse_encode(data['ccName']) + self.car_class_name_short = parse_encode(data['ccNameShort']) + self.car_color_1 = data['car_color1'] + self.car_color_2 = data['car_color2'] + self.car_color_3 = data['car_color3'] + self.car_id = data['carid'] + self.car_num = data['carnum'] + self.car_num_font = data['carnumberfont'] + self.car_num_slant = data['carnumberslant'] + self.car_number_color_1 = data['car_number_color1'] + self.car_number_color_2 = data['car_number_color2'] + self.car_number_color_3 = data['car_number_color3'] + self.car_pattern = data['car_pattern'] + self.car_sponser_1 = data['carsponsor1'] + self.car_sponser_2 = data['carsponsor2'] + self.club_id = data['clubid'] + self.club_name = parse_encode(data['clubname']) + self.club_name_short = parse_encode(data['clubshortname']) + self.club_points = data['clubpoints'] + self.cpi_new = data['newcpi'] + self.cpi_old = data['oldcpi'] + self.cust_id = data['custid'] + self.damage_model = data['damage_model'] + self.display_name = parse_encode(data['displayname']) + self.division = data['division'] + self.division_name = parse_encode(data['divisionname']) + self.drop_race = data['dropracepoints'] + self.event_type_name = parse_encode(data['evttypename']) + self.group_id = data['groupid'] + self.heat_info_id = data['heatinfoid'] + self.helm_color_1 = data['helm_color1'] + self.helm_color_2 = data['helm_color2'] + self.helm_color_3 = data['helm_color3'] + self.helm_pattern = data['helm_pattern'] + self.host_id = data['hostid'] + self.incidents = data['incidents'] + self.interval = data['interval'] + self.interval_class = data['classinterval'] + self.irating_new = data['newirating'] + self.irating_old = data['oldirating'] + self.lap_avg = data['avglap'] + self.lap_best = data['bestlaptime'] + self.lap_best_n = data['bestlapnum'] + self.lap_qual_best = data['bestquallaptime'] + self.lap_qual_best_at = data['bestquallapat'] + self.lap_qual_best_n = data['bestquallapnum'] + self.lap_qual_best_time = data['quallaptime'] + self.laps_best_n_num = data['bestnlapsnum'] + self.laps_best_n_time = data['bestnlapstime'] + self.laps_comp = data['lapscomplete'] + self.laps_led = data['lapslead'] + self.laps_opt_comp = data['optlapscomplete'] + self.league_points = data['league_points'] + self.license_category = parse_encode(data['licensecategory']) + self.license_change_oval = data['license_change_oval'] + self.license_change_road = data['license_change_road'] + self.license_class = data['licensegroup'] + self.license_level_new = data['newlicenselevel'] + self.license_level_old = data['oldlicenselevel'] + self.multiplier = data['multiplier'] + self.official = data['officialsession'] + self.pct_fuel_fill_max = data['max_pct_fuel_fill'] + self.points_champ = data['champpoints'] + self.points_champ_agg = data['aggchamppoints'] + self.pos = data['pos'] + self.pos_finish = data['finishpos'] + self.pos_finish_class = data['finishposinclass'] + self.pos_start = data['startpos'] + self.reason_out = parse_encode(data['reasonout']) + self.reason_out_id = data['reasonoutid'] + self.restrict_results = parse_encode(data['restrictresults']) + self.sim_ses_name = parse_encode(data['simsesname']) + self.sim_ses_num = data['simsesnum'] + self.sim_ses_type_name = parse_encode(data['simsestypename']) + self.sub_level_new = data['newsublevel'] + self.sub_level_old = data['oldsublevel'] + self.suit_color_1 = data['suit_color1'] + self.suit_color_2 = data['suit_color2'] + self.suit_color_3 = data['suit_color3'] + self.suit_pattern = data['suit_pattern'] + self.time_session_start = data['sessionstarttime'] + self.track_cat_id = data['track_catid'] + self.track_category = parse_encode(data['track_category']) + self.ttrating_new = data['newttrating'] + self.ttrating_old = data['oldttrating'] + self.vehicle_key_id = data['vehiclekeyid'] + self.weight_penalty_kg = data['weight_penalty_kg'] + self.wheel_chrome = data['wheel_chrome'] + self.wheel_color = parse_encode(data['wheel_color']) # Race laps for all drivers of a session class RaceLapsAll: - def __init__(self, dict): - self.details = self.Details(dict['details']) - self.drivers = [self.Driver(x) for x in dict['startgrid']] - self.laps = [self.Lap(x) for x in dict['lapdata']] + def __init__(self, data): + self.details = self.Details(data['details']) + self.drivers = [self.Driver(x) for x in data['startgrid']] + self.laps = [self.Lap(x) for x in data['lapdata']] class Details: - def __init__(self, dict): - self.date = dict['eventDate'] - self.date_unix_utc_ms = dict['eventDateUTCMilliSecs'] - self.driver_changes = dict['driverChanges'] - self.event_type = dict['eventType'] - self.event_type_name = parse_encode(dict['eventTypeName']) - self.laps_for_qual_avg = dict['nLapsForQualAvg'] - self.laps_for_solo_avg = dict['nLapsForSoloAvg'] - self.official = dict['officialSession'] - self.private_session_id = dict['privateSessionID'] + def __init__(self, data): + self.date = data['eventDate'] + self.date_unix_utc_ms = data['eventDateUTCMilliSecs'] + self.driver_changes = data['driverChanges'] + self.event_type = data['eventType'] + self.event_type_name = parse_encode(data['eventTypeName']) + self.laps_for_qual_avg = data['nLapsForQualAvg'] + self.laps_for_solo_avg = data['nLapsForSoloAvg'] + self.official = data['officialSession'] + self.private_session_id = data['privateSessionID'] self.private_session_name = parse_encode( - dict['privateSessionName']) - self.race_panel_img = parse_encode(dict['race_panel_img']) - self.race_week = dict['raceWeek'] - self.season_id = dict['seasonID'] - self.season_name = parse_encode(dict['seasonName']) - self.season_name_short = parse_encode(dict['seasonShortName']) - self.series_name = parse_encode(dict['seriesName']) - self.series_name_short = parse_encode(dict['seriesShortName']) - self.session_id = dict['sessionId'] - self.subsession_id = dict['subSessionId'] - self.track = parse_encode(dict['trackName']) - self.track_config = parse_encode(dict['trackConfig']) - self.track_id = dict['trackid'] + data['privateSessionName']) + self.race_panel_img = parse_encode(data['race_panel_img']) + self.race_week = data['raceWeek'] + self.season_id = data['seasonID'] + self.season_name = parse_encode(data['seasonName']) + self.season_name_short = parse_encode(data['seasonShortName']) + self.series_name = parse_encode(data['seriesName']) + self.series_name_short = parse_encode(data['seriesShortName']) + self.session_id = data['sessionId'] + self.subsession_id = data['subSessionId'] + self.track = parse_encode(data['trackName']) + self.track_config = parse_encode(data['trackConfig']) + self.track_id = data['trackid'] class Driver: - def __init__(self, dict): - self.car_num = dict['carnum'] - self.cust_id = dict['custid'] - self.display_name = parse_encode(dict['displayName']) - self.friend = dict['friend'] - self.group_id = dict['groupid'] - self.helmet_color_1 = dict['helmetColor1'] - self.helmet_color_2 = dict['helmetColor2'] - self.helmet_color_3 = dict['helmetColor3'] - self.helmet_pattern = dict['helmetPattern'] - self.incidents = dict['numIncidents'] - self.lap_avg = dict['avgLapTime'] - self.lap_best_num = dict['fastestLapNum'] - self.lap_best_time = dict['fastestLapTime'] - self.license_color = dict['licenseColor'] - self.points_champ = dict['points'] - self.pos_finish = dict['finishPos'] - self.pos_start = dict['startPos'] - self.watch = dict['watch'] + def __init__(self, data): + self.car_num = data['carnum'] + self.cust_id = data['custid'] + self.display_name = parse_encode(data['displayName']) + self.friend = data['friend'] + self.group_id = data['groupid'] + self.helmet_color_1 = data['helmetColor1'] + self.helmet_color_2 = data['helmetColor2'] + self.helmet_color_3 = data['helmetColor3'] + self.helmet_pattern = data['helmetPattern'] + self.incidents = data['numIncidents'] + self.lap_avg = data['avgLapTime'] + self.lap_best_num = data['fastestLapNum'] + self.lap_best_time = data['fastestLapTime'] + self.license_color = data['licenseColor'] + self.points_champ = data['points'] + self.pos_finish = data['finishPos'] + self.pos_start = data['startPos'] + self.watch = data['watch'] class Lap: - def __init__(self, dict): - self.car_num = dict['carnum'] - self.cust_id = dict['custid'] - self.flags = dict['flags'] - self.lap_num = dict['lapnum'] - self.time_ses = dict['sesTime'] + def __init__(self, data): + self.car_num = data['carnum'] + self.cust_id = data['custid'] + self.flags = data['flags'] + self.lap_num = data['lapnum'] + self.time_ses = data['sesTime'] # Race laps for single driver of a session class RaceLapsDriver: - def __init__(self, dict): - self.drivers = [self.Driver(x) for x in dict['drivers']] - self.header = self.Header(dict['header']) - self.laps = [self.Lap(x) for x in dict['lapData']] + def __init__(self, data): + self.drivers = [self.Driver(x) for x in data['drivers']] + self.header = self.Header(data['header']) + self.laps = [self.Lap(x) for x in data['lapData']] class Lap: - def __init__(self, dict): - self.cust_id = dict['custid'] - self.flags = dict['flags'] - self.lap_num = dict['lap_num'] - self.time_ses = dict['ses_time'] + def __init__(self, data): + self.cust_id = data['custid'] + self.flags = data['flags'] + self.lap_num = data['lap_num'] + self.time_ses = data['ses_time'] class Header: - def __init__(self, dict): - self.car_color_1 = dict['carColor1'] - self.car_color_2 = dict['carColor2'] - self.car_color_3 = dict['carColor3'] - self.car_id = dict['carid'] - self.car_num = dict['carNum'] - self.car_pattern = dict['carPattern'] - self.date_unix_utc_ms = dict['eventDateUTCMilliSecs'] - self.event_date = dict['eventDate'] - self.event_type = dict['eventtype'] - self.event_type_name = parse_encode(dict['eventTypeName']) - self.laps_for_qual = dict['nlapsforqual'] - self.laps_for_solo = dict['nlapsforsolo'] - self.season_name = parse_encode(dict['seasonName']) - self.season_name_short = parse_encode(dict['seasonShortName']) - self.series_name = parse_encode(dict['seriesName']) - self.series_name_short = parse_encode(dict['seriesShortName']) - self.session_id = dict['sessionId'] - self.subsession_id = dict['subSessionId'] - self.suit_color_1 = dict['suitColor1'] - self.suit_color_2 = dict['suitColor2'] - self.suit_color_3 = dict['suitColor3'] - self.suit_pattern = dict['suitPattern'] - self.team_name = parse_encode(dict['teamName']) - self.track_config = parse_encode(dict['trackConfig']) - self.track_id = dict['trackID'] - self.track_name = parse_encode(dict['trackName']) + def __init__(self, data): + self.car_color_1 = data['carColor1'] + self.car_color_2 = data['carColor2'] + self.car_color_3 = data['carColor3'] + self.car_id = data['carid'] + self.car_num = data['carNum'] + self.car_pattern = data['carPattern'] + self.date_unix_utc_ms = data['eventDateUTCMilliSecs'] + self.event_date = data['eventDate'] + self.event_type = data['eventtype'] + self.event_type_name = parse_encode(data['eventTypeName']) + self.laps_for_qual = data['nlapsforqual'] + self.laps_for_solo = data['nlapsforsolo'] + self.season_name = parse_encode(data['seasonName']) + self.season_name_short = parse_encode(data['seasonShortName']) + self.series_name = parse_encode(data['seriesName']) + self.series_name_short = parse_encode(data['seriesShortName']) + self.session_id = data['sessionId'] + self.subsession_id = data['subSessionId'] + self.suit_color_1 = data['suitColor1'] + self.suit_color_2 = data['suitColor2'] + self.suit_color_3 = data['suitColor3'] + self.suit_pattern = data['suitPattern'] + self.team_name = parse_encode(data['teamName']) + self.track_config = parse_encode(data['trackConfig']) + self.track_id = data['trackID'] + self.track_name = parse_encode(data['trackName']) class Driver: - def __init__(self, dict): - self.cust_id = dict['custid'] - self.display_name = parse_encode(dict['displayname']) - self.helm_color_1 = dict['helm_color1'] - self.helm_color_2 = dict['helm_color2'] - self.helm_color_3 = dict['helm_color3'] - self.helm_pattern = dict['helm_pattern'] - self.lap_best = dict['bestlaptime'] - self.lap_best_n = dict['bestlapnum'] - self.lap_qual_best = dict['bestquallaptime'] - self.lap_qual_best_at = dict['bestquallapat'] - self.lap_qual_best_n = dict['bestquallapnum'] - self.laps_n_best_num = dict['bestnlapsnum'] - self.laps_n_best_time = dict['bestnlapstime'] - self.license_level = dict['licenselevel'] + def __init__(self, data): + self.cust_id = data['custid'] + self.display_name = parse_encode(data['displayname']) + self.helm_color_1 = data['helm_color1'] + self.helm_color_2 = data['helm_color2'] + self.helm_color_3 = data['helm_color3'] + self.helm_pattern = data['helm_pattern'] + self.lap_best = data['bestlaptime'] + self.lap_best_n = data['bestlapnum'] + self.lap_qual_best = data['bestquallaptime'] + self.lap_qual_best_at = data['bestquallapat'] + self.lap_qual_best_n = data['bestquallapnum'] + self.laps_n_best_num = data['bestnlapsnum'] + self.laps_n_best_time = data['bestnlapstime'] + self.license_level = data['licenselevel'] diff --git a/pyracing/response_objects/upcoming_events.py b/pyracing/response_objects/upcoming_events.py index ab997af..0a66409 100644 --- a/pyracing/response_objects/upcoming_events.py +++ b/pyracing/response_objects/upcoming_events.py @@ -2,175 +2,175 @@ class NextEvent: - def __init__(self, dict): - self.driver_count = dict['drivercount'] - self.season_id = dict['seasonid'] - self.session_id = dict['sessionid'] - self.time_start = datetime_from_iracing_timestamp(dict['start_time']) + def __init__(self, data): + self.driver_count = data['drivercount'] + self.season_id = data['seasonid'] + self.session_id = data['sessionid'] + self.time_start = datetime_from_iracing_timestamp(data['start_time']) # Needs to have fix applied to data before class TotalRegistered: - def __init__(self, dict): - self.registered = dict['registered'] - self.season_id = dict['seasonid'] + def __init__(self, data): + self.registered = data['registered'] + self.season_id = data['seasonid'] class OpenPractice: - def __init__(self, dict): - self.allow_entry = dict['10'] - self.cars_left = dict['23'] - self.cat_id = dict['27'] - self.count_group = dict['30'] - self.count_registered = parse_encode(dict['45']) - self.count_total = dict['36'] - self.driver_change_param_1 = dict['7'] - self.driver_change_param_2 = dict['8'] - self.driver_change_rule = dict['28'] - self.driver_changes = dict['47'] - self.drivers_connected = dict['42'] - self.drivers_registered = dict['9'] - self.earth_rotation_speedup = dict['32'] - self.farm_id = dict['25'] - self.fog_density = dict['13'] - self.humidity = dict['38'] - self.leave_marbles = dict['33'] - self.pits = parse_encode(dict['6']) - self.pits_in_use = dict['35'] - self.pits_total = dict['48'] - self.race_panel_img = parse_encode(dict['16']) - self.rubber_practice = dict['12'] - self.rubber_qualify = dict['39'] - self.rubber_race = dict['15'] - self.rubber_warmup = dict['14'] - self.season_id = dict['21'] - self.series_abbrv = parse_encode(dict['41']) - self.series_id = dict['17'] - self.series_name = parse_encode(dict['11']) - self.session_id = dict['5'] - self.skies = dict['26'] - self.subsession_id = dict['31'] - self.team_drivers_max = dict['43'] - self.team_drivers_min = dict['4'] - self.temp_unit = dict['1'] - self.temp_value = dict['3'] - self.time_of_day = dict['18'] - self.time_start = parse_encode(dict['46']) - self.time_start_sim = parse_encode(dict['19']) - self.total_groups = dict['20'] - self.track_config = parse_encode(dict['37']) - self.track_id = dict['22'] - self.track_name = parse_encode(dict['34']) - self.weather_initial = dict['40'] - self.weather_ongoing = dict['29'] - self.weather_type = dict['24'] - self.wind_direction = dict['2'] - self.wind_speed_unit = dict['49'] - self.wind_speed_value = dict['44'] + def __init__(self, data): + self.allow_entry = data['10'] + self.cars_left = data['23'] + self.cat_id = data['27'] + self.count_group = data['30'] + self.count_registered = parse_encode(data['45']) + self.count_total = data['36'] + self.driver_change_param_1 = data['7'] + self.driver_change_param_2 = data['8'] + self.driver_change_rule = data['28'] + self.driver_changes = data['47'] + self.drivers_connected = data['42'] + self.drivers_registered = data['9'] + self.earth_rotation_speedup = data['32'] + self.farm_id = data['25'] + self.fog_density = data['13'] + self.humidity = data['38'] + self.leave_marbles = data['33'] + self.pits = parse_encode(data['6']) + self.pits_in_use = data['35'] + self.pits_total = data['48'] + self.race_panel_img = parse_encode(data['16']) + self.rubber_practice = data['12'] + self.rubber_qualify = data['39'] + self.rubber_race = data['15'] + self.rubber_warmup = data['14'] + self.season_id = data['21'] + self.series_abbrv = parse_encode(data['41']) + self.series_id = data['17'] + self.series_name = parse_encode(data['11']) + self.session_id = data['5'] + self.skies = data['26'] + self.subsession_id = data['31'] + self.team_drivers_max = data['43'] + self.team_drivers_min = data['4'] + self.temp_unit = data['1'] + self.temp_value = data['3'] + self.time_of_day = data['18'] + self.time_start = parse_encode(data['46']) + self.time_start_sim = parse_encode(data['19']) + self.total_groups = data['20'] + self.track_config = parse_encode(data['37']) + self.track_id = data['22'] + self.track_name = parse_encode(data['34']) + self.weather_initial = data['40'] + self.weather_ongoing = data['29'] + self.weather_type = data['24'] + self.wind_direction = data['2'] + self.wind_speed_unit = data['49'] + self.wind_speed_value = data['44'] class RaceGuide: - def __init__(self, dict): - self.cat_id = dict['catID'] - self.eligible = dict['eligible'] - self.image = parse_encode(dict['image']) - self.meets_participation_req = dict['mpr'] + def __init__(self, data): + self.cat_id = data['catID'] + self.eligible = data['eligible'] + self.image = parse_encode(data['image']) + self.meets_participation_req = data['mpr'] self.season_schedule = [self.Schedule(x) for - x in dict['seasonSchedules']] - self.series_id = dict['seriesID'] - self.series_name = parse_encode(dict['seriesName']) + x in data['seasonSchedules']] + self.series_id = data['seriesID'] + self.series_name = parse_encode(data['seriesName']) class Schedule: - def __init__(self, dict): - self.car_class_ids = dict['carClasses'] - self.fixed_setup = dict['fixedSetup'] - self.license_class = dict['licenseGroup'] - self.multi_class = dict['multiClass'] - self.open_practice_drivers = dict['openPracticeDrivers'] - self.open_practice_sessions = dict['openPracticeSessions'] - self.race = [self.Race(x) for x in dict['races']] - self.season_id = dict['seasonID'] + def __init__(self, data): + self.car_class_ids = data['carClasses'] + self.fixed_setup = data['fixedSetup'] + self.license_class = data['licenseGroup'] + self.multi_class = data['multiClass'] + self.open_practice_drivers = data['openPracticeDrivers'] + self.open_practice_sessions = data['openPracticeSessions'] + self.race = [self.Race(x) for x in data['races']] + self.season_id = data['seasonID'] self.season_start_date = datetime_from_iracing_timestamp( - dict['seasonStartDate']) + data['seasonStartDate']) class Race: - def __init__(self, dict): - self.earth_rotation_speedup = dict['earth_rotation_speedup'] - self.event_type = dict['evttype'] - self.fog_density = dict['weatherFogDensity'] - self.humidity = dict['weatherRelativeHumidity'] - self.race_lap_limit = dict['raceLapLimit'] - self.race_time_limit_minutes = dict['raceTimeLimitMinutes'] - self.race_week = dict['raceWeekNum'] - self.reg_count = dict['regCount'] - self.reg_count_pre = dict['preRegCount'] - self.session_id = dict['sessionID'] - self.session_type_id = dict['sessionTypeID'] - self.skies = dict['weatherSkies'] - self.special_event_type = dict['specialeventtype'] - self.standing_start = dict['standingStart'] - self.temp_unit = dict['weatherTempUnits'] - self.temp_value = dict['weatherTempValue'] + def __init__(self, data): + self.earth_rotation_speedup = data['earth_rotation_speedup'] + self.event_type = data['evttype'] + self.fog_density = data['weatherFogDensity'] + self.humidity = data['weatherRelativeHumidity'] + self.race_lap_limit = data['raceLapLimit'] + self.race_time_limit_minutes = data['raceTimeLimitMinutes'] + self.race_week = data['raceWeekNum'] + self.reg_count = data['regCount'] + self.reg_count_pre = data['preRegCount'] + self.session_id = data['sessionID'] + self.session_type_id = data['sessionTypeID'] + self.skies = data['weatherSkies'] + self.special_event_type = data['specialeventtype'] + self.standing_start = data['standingStart'] + self.temp_unit = data['weatherTempUnits'] + self.temp_value = data['weatherTempValue'] self.time_end = datetime_from_iracing_timestamp( - dict['endTime']) - self.time_of_day = dict['timeOfDay'] + data['endTime']) + self.time_of_day = data['timeOfDay'] self.time_start = datetime_from_iracing_timestamp( - dict['startTime']) - self.time_start_sim = parse_encode(dict['simulatedstarttime']) - self.track = parse_encode(dict['trackName']) - self.track_config = parse_encode(dict['trackConfigName']) - self.track_id = dict['trackID'] + data['startTime']) + self.time_start_sim = parse_encode(data['simulatedstarttime']) + self.track = parse_encode(data['trackName']) + self.track_config = parse_encode(data['trackConfigName']) + self.track_id = data['trackID'] self.track_race_guide_img = parse_encode( - dict['trackRaceGuideImg']) - self.weather_initial = dict['weatherVarInitial'] - self.weather_ongoing = dict['weatherVarOngoing'] - self.weather_type = dict['weatherType'] - self.wind_direction = dict['weatherWindDir'] - self.wind_speed_unit = dict['weatherWindSpeedUnits'] - self.wind_speed_value = dict['weatherWindSpeedValue'] + data['trackRaceGuideImg']) + self.weather_initial = data['weatherVarInitial'] + self.weather_ongoing = data['weatherVarOngoing'] + self.weather_type = data['weatherType'] + self.wind_direction = data['weatherWindDir'] + self.wind_speed_unit = data['weatherWindSpeedUnits'] + self.wind_speed_value = data['weatherWindSpeedValue'] # raceWeekCars returns a dictionary of {weeks} > # each week has a dictionary of {car_id} > # each car has a dictionary of {car attributes} - self.race_week_cars = dict['raceWeekCars'] + self.race_week_cars = data['raceWeekCars'] # rubberSettings contains a dictionary of {rubber attributes} - self.rubber_settings = dict['rubberSettings'] + self.rubber_settings = data['rubberSettings'] class NextSessionTimes: - def __init__(self, dict): - self.earth_rotation_speedup = dict['14'] - self.event_type_id = dict['10'] - self.fog_density = dict['33'] - self.group_count = dict['12'] - self.humidity = dict['9'] - self.leave_marbles = dict['15'] - self.max_to_display = dict['1'] - self.race_week = dict['32'] - self.race_week_cars = dict['26'] - self.reg_count = dict['16'] - self.rubber_practice = dict['13'] - self.rubber_qualify = dict['24'] - self.rubber_race = dict['23'] - self.rubber_warmup = dict['20'] - self.season_id = dict['31'] - self.session_id = dict['7'] - self.skies = dict['5'] - self.special_event_type = dict['22'] - self.temp_unit = dict['19'] - self.temp_value = dict['21'] - self.time_of_day = dict['27'] - self.time_start = datetime_from_iracing_timestamp(dict['6']) - self.time_start_sim = parse_encode(dict['29']) - self.total_count = dict['17'] - self.total_groups = dict['30'] - self.track_id = dict['3'] - self.weather_initial = dict['8'] - self.weather_ongoing = dict['25'] - self.weather_type = dict['28'] - self.wind_direction = dict['11'] - self.wind_speed_unit = dict['2'] - self.wind_speed_value = dict['4'] + def __init__(self, data): + self.earth_rotation_speedup = data['14'] + self.event_type_id = data['10'] + self.fog_density = data['33'] + self.group_count = data['12'] + self.humidity = data['9'] + self.leave_marbles = data['15'] + self.max_to_display = data['1'] + self.race_week = data['32'] + self.race_week_cars = data['26'] + self.reg_count = data['16'] + self.rubber_practice = data['13'] + self.rubber_qualify = data['24'] + self.rubber_race = data['23'] + self.rubber_warmup = data['20'] + self.season_id = data['31'] + self.session_id = data['7'] + self.skies = data['5'] + self.special_event_type = data['22'] + self.temp_unit = data['19'] + self.temp_value = data['21'] + self.time_of_day = data['27'] + self.time_start = datetime_from_iracing_timestamp(data['6']) + self.time_start_sim = parse_encode(data['29']) + self.total_count = data['17'] + self.total_groups = data['30'] + self.track_id = data['3'] + self.weather_initial = data['8'] + self.weather_ongoing = data['25'] + self.weather_type = data['28'] + self.wind_direction = data['11'] + self.wind_speed_unit = data['2'] + self.wind_speed_value = data['4'] # Used outside of d dict; Holds refresh time of data # self.reloadtime = dict['18']