Merge pull request #223 from mathsman5133/fix/3.2.1

Fix/3.2.1

Author: lukasthaler

coc/__init__.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = "3.2.0"
+__version__ = "3.2.1"
 
 from .abc import BasePlayer, BaseClan
 from .clans import RankedClan, Clan

coc/client.py

@@ -2413,7 +2413,7 @@ def get_spell(self, name: str, level: int = None, townhall: int = None) -> Optio
         if not self._spell_holder.loaded:
             raise RuntimeError("Spell metadata must be loaded to use this feature.")
 
-        spell = self._spell_holder.get(name)
+        spell = self._spell_holder.get((name, True))
         if spell is None:
             return None
         elif level is not None:

coc/spell.py

@@ -158,3 +158,14 @@ def _load_json(self, english_aliases, lab_to_townhall):
             self.item_lookup[(new_spell.name, new_spell._is_home_village)] = new_spell
 
         self.loaded = True
+
+    def load(self, data, townhall: int, default: "Spell" = Spell, load_game_data: bool = None) -> Spell:
+        if load_game_data is True:
+            try:
+                spell = self.item_lookup[(data["name"], True)]
+            except KeyError:
+                spell = default
+        else:
+            spell = default
+
+        return spell(data=data, townhall=townhall)

coc/utils.py

@@ -390,10 +390,14 @@ def get_clan_games_start(time: Optional[datetime] = None) -> datetime:
     if time is None:
         time = datetime.utcnow()
     month = time.month
+    year = time.year
     this_months_cg_end = datetime(year=time.year, month=time.month, day=28, hour=8, minute=0, second=0)
-    if time > this_months_cg_end:
+    if time > this_months_cg_end and month < 12:
         month += 1
-    return datetime(year=time.year, month=month, day=22, hour=8, minute=0, second=0)
+    elif time > this_months_cg_end:  # we're at the end of December
+        month = 1
+        year += 1
+    return datetime(year=year, month=month, day=22, hour=8, minute=0, second=0)
 
 
 def get_clan_games_end(time: Optional[datetime] = None) -> datetime:
@@ -419,10 +423,14 @@ def get_clan_games_end(time: Optional[datetime] = None) -> datetime:
     if time is None:
         time = datetime.utcnow()
     month = time.month
+    year = time.year
     this_months_cg_end = datetime(year=time.year, month=time.month, day=28, hour=8, minute=0, second=0)
-    if time > this_months_cg_end:
+    if time > this_months_cg_end and month < 12:
         month += 1
-    return datetime(year=time.year, month=month, day=28, hour=8, minute=0, second=0)
+    elif time > this_months_cg_end:  # we're in December
+        month = 1
+        year += 1
+    return datetime(year=year, month=month, day=28, hour=8, minute=0, second=0)
 
 
 def get_raid_weekend_start(time: Optional[datetime] = None) -> datetime:

docs/conf.py

@@ -15,7 +15,7 @@
 project = 'coc'
 copyright = '2022, mathsman5133'
 author = 'mathsman5133'
-release = '3.2.0'
+release = '3.2.1'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

docs/miscellaneous/changelog.rst

@@ -7,6 +7,15 @@ Changelog
 This page keeps a fairly detailed, human readable version
 of what has changed, and whats new for each version of the lib.
 
+v3.2.1
+------
+
+Bugs Fixed:
+~~~~~~~~~~~
+- Fixed an issue that would cause spells to not be properly looked up, breaking :func:`coc.Client.get_spell` and
+  :attr:`Player.spells`
+- Fixed a month overflow issue with clan game start/end events that would occur from Dec 28th to Dec 31st
+
 v3.2.0
 ------
 

pyproject.toml

@@ -7,7 +7,7 @@ name = "coc.py"
 authors = [{ name = "mathsman5133" }]
 maintainers = [{ name = "majordoobie" }, { name = "MagicTheDev" }, { name = "Kuchenmampfer" },
     { name = "lukasthaler"}, { name = "doluk"}]
-version = "3.2.0"
+version = "3.2.1"
 description = "A python wrapper for the Clash of Clans API"
 requires-python = ">=3.7.3"
 readme = "README.rst"