From f5c57d8e73f33ca1d7374a2662fbc7a4592eb7cd Mon Sep 17 00:00:00 2001 From: Dmitrii Morozov Date: Tue, 7 May 2024 16:34:14 +0200 Subject: Python code style --- Formatter.py | 66 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'Formatter.py') diff --git a/Formatter.py b/Formatter.py index fc8b8ad..fa7a316 100644 --- a/Formatter.py +++ b/Formatter.py @@ -3,84 +3,84 @@ import typing from Types import * # Status -def formatFortniteStatus(fortniteStatus): - statuses = [__formatFortniteServiceStatus(serviceStatus) for serviceStatus in fortniteStatus.serviceStatuses] +def format_fortnite_status(fortnite_status): + statuses = [__format_fortnite_service_status(service_status) for service_status in fortnite_status.serviceStatuses] return formatting.format_text( formatting.mbold("Fortnite status"), "", '\n'.join(statuses), separator='\n') -def __formatStatus(status): +def __format_status(status): if (status == True): return u'\u2705' else: return u'\u274c' -def __formatFortniteServiceStatus(fortniteServiceStatus): +def __format_fortnite_service_status(fortnite_service_status): return formatting.format_text( - formatting.mbold(fortniteServiceStatus.serviceName), - __formatStatus(fortniteServiceStatus.status), + formatting.mbold(fortnite_service_status.serviceName), + __format_status(fortnite_service_status.status), separator=': ') # User -def formatUsers(users: typing.List[User]): - users_formatted = [formatUser(user) for user in users] +def format_users(users: typing.List[User]): + users_formatted = [format_user(user) for user in users] return formatting.format_text( '\n\n'.join(users_formatted), separator='\n') -def formatUser(user: User): +def format_user(user: User): return formatting.format_text( formatting.mbold("User: ") + user.display_name, formatting.mbold("ID: ") + user.id, separator='\n') # Stats -def formatUserStatsList(stats: typing.List[UserStats]): - stats_formatted = [__formatStats(singleStats) for singleStats in stats] +def format_user_stats_list(stats: typing.List[UserStats]): + stats_formatted = [__format_stats(single_stats) for single_stats in stats] return formatting.format_text( '\n\n'.join(stats_formatted), separator='\n') -def formatUserStatsDifference(oldUserStats: typing.List[UserStats], newUserStats: typing.List[UserStats]): +def format_user_stats_difference(old_user_stats: typing.List[UserStats], new_user_stats: typing.List[UserStats]): stats_formatted = [] - for stats in oldUserStats: - matched = [x for x in newUserStats if x.user_id == stats.user_id][0] - stats_formatted.append(__formatStatsDifference(stats, matched)) + for stats in old_user_stats: + matched = [x for x in new_user_stats if x.user_id == stats.user_id][0] + stats_formatted.append(__format_stats_difference(stats, matched)) return formatting.format_text( '\n\n'.join(stats_formatted), separator='\n') -def __formatStatsDifference(oldUserStats: UserStats, newUserStats: UserStats): +def __format_stats_difference(old_user_stats: UserStats, new_user_stats: UserStats): return formatting.format_text( - formatting.mbold("User: ") + newUserStats.user_display_name, - formatting.mbold("ID: ") + newUserStats.user_id, - formatting.mbold("Level: ") + "{}{}".format(str(newUserStats.level), __formatStatDifference(oldUserStats.level, newUserStats.level)), - formatting.mbold("Matches played: ") + "{}{}".format(str(newUserStats.matches_played), __formatStatDifference(oldUserStats.matches_played, newUserStats.matches_played)), - formatting.mbold("Total kills: ") + "{}{}".format(str(newUserStats.kills), __formatStatDifference(oldUserStats.kills, newUserStats.kills)), - formatting.mbold("Wins: ") + "{}{}".format(str(newUserStats.wins), __formatStatDifference(oldUserStats.wins, newUserStats.wins)), + formatting.mbold("User: ") + new_user_stats.user_display_name, + formatting.mbold("ID: ") + new_user_stats.user_id, + formatting.mbold("Level: ") + "{}{}".format(str(new_user_stats.level), __format_stat_difference(old_user_stats.level, new_user_stats.level)), + formatting.mbold("Matches played: ") + "{}{}".format(str(new_user_stats.matches_played), __format_stat_difference(old_user_stats.matches_played, new_user_stats.matches_played)), + formatting.mbold("Total kills: ") + "{}{}".format(str(new_user_stats.kills), __format_stat_difference(old_user_stats.kills, new_user_stats.kills)), + formatting.mbold("Wins: ") + "{}{}".format(str(new_user_stats.wins), __format_stat_difference(old_user_stats.wins, new_user_stats.wins)), separator='\n') -def __formatStatDifference(oldStatValue: int, newStatValue: int): - if oldStatValue != newStatValue: - return " \(\+ {}\)".format(str(newStatValue - oldStatValue)) +def __format_stat_difference(old_stat_value: int, new_stat_value: int): + if old_stat_value != new_stat_value: + return " \(\+ {}\)".format(str(new_stat_value - old_stat_value)) else: return "" -def __formatStats(userStats: UserStats): +def __format_stats(user_stats: UserStats): return formatting.format_text( - formatting.mbold("User: ") + userStats.user_display_name, - formatting.mbold("ID: ") + userStats.user_id, - formatting.mbold("Level: ") + str(userStats.level), - formatting.mbold("Matches played: ") + str(userStats.matches_played), - formatting.mbold("Total kills: ") + str(userStats.kills), - formatting.mbold("Wins: ") + str(userStats.wins), + formatting.mbold("User: ") + user_stats.user_display_name, + formatting.mbold("ID: ") + user_stats.user_id, + formatting.mbold("Level: ") + str(user_stats.level), + formatting.mbold("Matches played: ") + str(user_stats.matches_played), + formatting.mbold("Total kills: ") + str(user_stats.kills), + formatting.mbold("Wins: ") + str(user_stats.wins), separator='\n') -def formatFriendOnline(display_name: str, party_size: int): +def format_friend_online(display_name: str, party_size: int): if party_size == 1: text = 'is playing Fortnite\!' elif party_size == 2: -- cgit v1.2.3