Skip to content

Commit

Permalink
refactor: filename changes
Browse files Browse the repository at this point in the history
  • Loading branch information
201st-Luka committed Aug 22, 2023
1 parent 5b35619 commit fe76974
Show file tree
Hide file tree
Showing 120 changed files with 218 additions and 218 deletions.
2 changes: 1 addition & 1 deletion pyclasher/api/bulk_requests/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from .BulkPlayer import PlayerBulkRequest
from .b_player import PlayerBulkRequest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from asyncio import get_running_loop, run

from .BulkRequestModel import BulkRequestModel
from .b_request_model import BulkRequestModel
from ..models import BaseClan
from ..models import Clan
from ..requests import PlayerRequest, ClanMembersRequest
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterable, Coroutine, Any, Iterator

from .BulkRequestModel import BulkRequestModel
from .b_request_model import BulkRequestModel
from ..models import BaseClan, ClanMemberList, ClanWarMemberList, ClanWarLeagueClanMemberList, \
ClanCapitalRaidSeasonMemberList
from ..requests import PlayerRequest, ClanMembersRequest
Expand Down
48 changes: 24 additions & 24 deletions pyclasher/api/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,44 @@
"""

# base models, miscellaneous models and enums
from .BaseModels import BaseModel, IterBaseModel, ImageUrl, IconUrl, IconUrls, After, Before, \
from .base_models import BaseModel, IterBaseModel, ImageUrl, IconUrl, IconUrls, After, Before, \
Cursor, Paging, BadgeUrl, BadgeUrls, Time, BaseClanMember, BaseClan, BaseLeague
# clan models
from .Clan import ClanDistrictData, ClanDistrictDataList, ClanCapital, Clan
from .ClanBuilderBaseRankingList import ClanBuilderBaseRanking, ClanBuilderBaseRankingList
from .ClanCapitalRaidSeasons import ClanCapitalRaidSeasonClanInfo, ClanCapitalRaidSeasonAttacker, \
from .clan import ClanDistrictData, ClanDistrictDataList, ClanCapital, Clan
from .clan_builder_base_ranking_list import ClanBuilderBaseRanking, ClanBuilderBaseRankingList
from .clan_capital_raid_seasons import ClanCapitalRaidSeasonClanInfo, ClanCapitalRaidSeasonAttacker, \
ClanCapitalRaidSeasonAttack, ClanCapitalRaidSeasonAttackList, ClanCapitalRaidSeasonDistrict, \
ClanCapitalRaidSeasonDistrictList, ClanCapitalRaidSeasonDefenseLogEntry, ClanCapitalRaidSeasonAttackLogEntry, \
ClanCapitalRaidSeasonDefenseLogList, ClanCapitalRaidSeasonAttackLogList, ClanCapitalRaidSeasonMember, \
ClanCapitalRaidSeasonMemberList, ClanCapitalRaidSeason, ClanCapitalRaidSeasons
from .ClanCapitalRankingList import ClanCapitalRanking, ClanCapitalRankingList
from .ClanList import ClanList
from .ClanMember import ClanMember
from .ClanMemberList import ClanMemberList
from .ClanRankingList import ClanRanking, ClanRankingList
from .ClanWar import ClanWar
from .ClanWarLeagueGroup import ClanWarLeagueRound, ClanWarLeagueRoundList, ClanWarLeagueClanMember, \
from .clan_capital_ranking_list import ClanCapitalRanking, ClanCapitalRankingList
from .clan_list import ClanList
from .clan_member import ClanMember
from .clan_member_list import ClanMemberList
from .clan_ranking_list import ClanRanking, ClanRankingList
from .clan_war import ClanWar
from .clan_war_league_group import ClanWarLeagueRound, ClanWarLeagueRoundList, ClanWarLeagueClanMember, \
ClanWarLeagueClanMemberList, ClanWarLeagueClan, ClanWarLeagueClanList, ClanWarLeagueGroup
from .ClanWarLog import ClanWarLogEntry, ClanWarLog
from .Enums import ApiCodes, ClanType, WarFrequency, Locations, Leagues, CapitalLeagues, \
from .clan_war_log import ClanWarLogEntry, ClanWarLog
from .enums import ApiCodes, ClanType, WarFrequency, Locations, Leagues, CapitalLeagues, \
BuilderBaseLeagues, WarLeagues, Labels, Languages, ClanWarState, ClanWarLeagueGroupState, \
ClanWarResult, WarPreference, PlayerHouseElementType, Village, TokenStatus, ClanRole
# gold pass season
from .GoldPassSeason import GoldPassSeason
from .gold_pass_season import GoldPassSeason
# labels
from .Labels import Label, LabelList
from .labels import Label, LabelList
# league models
from .Leagues import League, BuilderBaseLeague, CapitalLeague, WarLeague, LeagueList, \
from .leagues import League, BuilderBaseLeague, CapitalLeague, WarLeague, LeagueList, \
BuilderBaseLeagueList, CapitalLeagueList, WarLeagueList, LeagueSeason, LeagueSeasonList
# locations
from .Location import Location, LocationList
from .location import Location, LocationList
# player models
from .Player import PlayerClan, LegendLeagueTournamentSeasonResult, PlayerLegendStatistics, \
from .player import PlayerClan, LegendLeagueTournamentSeasonResult, PlayerLegendStatistics, \
PlayerItemLevel, PlayerItemLevelList, PlayerAchievementProgress, PlayerAchievementProgressList, Player
from .PlayerBuilderBaseRankingList import PlayerBuilderBaseRanking, PlayerBuilderBaseRankingList
from .PlayerHouse import PlayerHouseElement, PlayerHouseElementList, PlayerHouse
from .PlayerRankingClan import PlayerRankingClan
from .PlayerRankingList import PlayerRanking, PlayerRankingList
from .Season import Season
from .WarClan import ClanWarAttack, ClanWarAttackList, ClanWarMember, ClanWarMemberList, WarClan
from .player_builder_base_ranking_list import PlayerBuilderBaseRanking, PlayerBuilderBaseRankingList
from .player_house import PlayerHouseElement, PlayerHouseElementList, PlayerHouse
from .player_ranking_clan import PlayerRankingClan
from .player_ranking_list import PlayerRanking, PlayerRankingList
from .season import Season
from .war_clan import ClanWarAttack, ClanWarAttackList, ClanWarMember, ClanWarMemberList, WarClan
from .misc import *
File renamed without changes.
File renamed without changes.
12 changes: 6 additions & 6 deletions pyclasher/api/models/Clan.py → pyclasher/api/models/clan.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from .BaseModels import BaseModel, IterBaseModel, BaseClan
from .ClanMemberList import ClanMemberList
from .Enums import WarFrequency, ClanType
from .Labels import LabelList
from .Leagues import WarLeague, CapitalLeague
from .Location import Location
from .base_models import BaseModel, IterBaseModel, BaseClan
from .clan_member_list import ClanMemberList
from .enums import WarFrequency, ClanType
from .labels import LabelList
from .leagues import WarLeague, CapitalLeague
from .location import Location
from .misc import Language


Expand Down
12 changes: 6 additions & 6 deletions pyclasher/api/models/Clan.pyi → pyclasher/api/models/clan.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ clan models and sub models
"""
from typing import Iterator

from .BaseModels import BaseModel, IterBaseModel, BaseClan
from .ClanMemberList import ClanMemberList
from .Enums import WarFrequency, ClanType
from .Labels import LabelList
from .Leagues import WarLeague, CapitalLeague
from .Location import Location
from .base_models import BaseModel, IterBaseModel, BaseClan
from .clan_member_list import ClanMemberList
from .enums import WarFrequency, ClanType
from .labels import LabelList
from .leagues import WarLeague, CapitalLeague
from .location import Location
from .misc import Language
from ...exceptions import Missing

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .BaseModels import BaseModel, IterBaseModel
from .base_models import BaseModel, IterBaseModel


class ClanBuilderBaseRanking(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .BaseModels import BaseModel, IterBaseModel
from .base_models import BaseModel, IterBaseModel


class ClanBuilderBaseRanking(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .BaseModels import BaseModel, BadgeUrls, IterBaseModel, BaseClanMember, Time
from .base_models import BaseModel, BadgeUrls, IterBaseModel, BaseClanMember, Time


class ClanCapitalRaidSeasonClanInfo(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .BaseModels import BaseModel, IterBaseModel, BaseClanMember, BaseClan, Time
from .base_models import BaseModel, IterBaseModel, BaseClanMember, BaseClan, Time
from ...exceptions import Missing


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .BaseModels import BaseModel, IterBaseModel
from .base_models import BaseModel, IterBaseModel


class ClanCapitalRanking(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .BaseModels import BaseModel, IterBaseModel
from .base_models import BaseModel, IterBaseModel


class ClanCapitalRanking(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .BaseModels import IterBaseModel
from .Clan import Clan
from .base_models import IterBaseModel
from .clan import Clan


class ClanList(IterBaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Iterator

from .BaseModels import IterBaseModel
from .Clan import Clan
from .base_models import IterBaseModel
from .clan import Clan


class ClanList(IterBaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from .BaseModels import BaseClanMember
from .Enums import ClanRole
from .Leagues import League, BuilderBaseLeague
from .PlayerHouse import PlayerHouse
from .base_models import BaseClanMember
from .enums import ClanRole
from .leagues import League, BuilderBaseLeague
from .player_house import PlayerHouse


class ClanMember(BaseClanMember):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from .BaseModels import BaseClanMember
from .Enums import ClanRole
from .Leagues import League, BuilderBaseLeague
from .PlayerHouse import PlayerHouse
from .base_models import BaseClanMember
from .enums import ClanRole
from .leagues import League, BuilderBaseLeague
from .player_house import PlayerHouse
from ...exceptions import Missing


Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .BaseModels import IterBaseModel
from .ClanMember import ClanMember
from .base_models import IterBaseModel
from .clan_member import ClanMember


class ClanMemberList(IterBaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Iterator

from .BaseModels import IterBaseModel
from .ClanMember import ClanMember
from .base_models import IterBaseModel
from .clan_member import ClanMember


class ClanMemberList(IterBaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .BaseModels import BaseModel, IterBaseModel, BadgeUrls
from .Location import Location
from .base_models import BaseModel, IterBaseModel, BadgeUrls
from .location import Location


class ClanRanking(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Iterator

from .BaseModels import BaseModel, IterBaseModel, BadgeUrls
from .Location import Location
from .base_models import BaseModel, IterBaseModel, BadgeUrls
from .location import Location


class ClanRanking(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .BaseModels import BaseModel, Time
from .Enums import ClanWarState
from .WarClan import WarClan
from .base_models import BaseModel, Time
from .enums import ClanWarState
from .war_clan import WarClan


class ClanWar(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .BaseModels import BaseModel, Time
from .Enums import ClanWarState
from .WarClan import WarClan
from .base_models import BaseModel, Time
from .enums import ClanWarState
from .war_clan import WarClan


class ClanWar(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .BaseModels import BaseModel, IterBaseModel, BaseClanMember, BaseClan
from .Enums import ClanWarLeagueGroupState
from .base_models import BaseModel, IterBaseModel, BaseClanMember, BaseClan
from .enums import ClanWarLeagueGroupState


class ClanWarLeagueRound(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Iterator

from .BaseModels import BaseModel, IterBaseModel, BaseClanMember, BaseClan
from .Enums import ClanWarLeagueGroupState
from .base_models import BaseModel, IterBaseModel, BaseClanMember, BaseClan
from .enums import ClanWarLeagueGroupState


class ClanWarLeagueRound(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .BaseModels import IterBaseModel, BaseModel, Time
from .Enums import ClanWarResult
from .WarClan import WarClan
from .base_models import IterBaseModel, BaseModel, Time
from .enums import ClanWarResult
from .war_clan import WarClan


class ClanWarLogEntry(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Iterator

from .BaseModels import IterBaseModel, BaseModel, Time
from .Enums import ClanWarResult
from .WarClan import WarClan
from .base_models import IterBaseModel, BaseModel, Time
from .enums import ClanWarResult
from .war_clan import WarClan


class ClanWarLogEntry(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from enum import Enum

from .Labels import Label
from .Leagues import League, CapitalLeague, BuilderBaseLeague, WarLeague
from .Location import Location
from .labels import Label
from .leagues import League, CapitalLeague, BuilderBaseLeague, WarLeague
from .location import Location
from ...exceptions import ApiCode


Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from enum import Enum

from .Labels import Label
from .Leagues import League, CapitalLeague, BuilderBaseLeague, WarLeague
from .Location import Location
from .labels import Label
from .leagues import League, CapitalLeague, BuilderBaseLeague, WarLeague
from .location import Location
from ...exceptions import ApiCode


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .BaseModels import Time, BaseModel
from .base_models import Time, BaseModel


class GoldPassSeason(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .BaseModels import Time, BaseModel
from .base_models import Time, BaseModel


class GoldPassSeason(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .BaseModels import BaseModel, IterBaseModel, IconUrls
from .base_models import BaseModel, IterBaseModel, IconUrls


class Label(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .BaseModels import BaseModel, IterBaseModel, IconUrls
from .base_models import BaseModel, IterBaseModel, IconUrls


class Label(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .BaseModels import BaseModel, IconUrls, IterBaseModel, BaseLeague
from .base_models import BaseModel, IconUrls, IterBaseModel, BaseLeague


class League(BaseLeague):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ models concerning the leagues
"""
from typing import Iterator

from .BaseModels import BaseModel, IconUrls, IterBaseModel, BaseLeague
from .base_models import BaseModel, IconUrls, IterBaseModel, BaseLeague


class League(BaseLeague):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .BaseModels import IterBaseModel, BaseModel
from .base_models import IterBaseModel, BaseModel


class Location(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ models concerning the location
"""
from typing import Iterator

from .BaseModels import IterBaseModel, BaseModel
from .base_models import IterBaseModel, BaseModel
from ...exceptions import Missing


Expand Down
10 changes: 5 additions & 5 deletions pyclasher/api/models/misc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
ClashOfClans API miscellaneous models
"""

from .Api import ClientError, Replay, ServiceVersion
from .Language import Language
from .Posts import VerifyTokenRequest, DeepLinkCreationRequest
from .Responses import VerifyTokenResponse, DeepLinkCreationResponse
from .WarStatus import WarStatus, WarStatusList
from .api import ClientError, Replay, ServiceVersion
from .language import Language
from .posts import VerifyTokenRequest, DeepLinkCreationRequest
from .responses import VerifyTokenResponse, DeepLinkCreationResponse
from .war_status import WarStatus, WarStatusList
Loading

0 comments on commit fe76974

Please sign in to comment.