github-heatmap 1.1.5__tar.gz → 1.1.7__tar.gz

{github_heatmap-1.1.5 → github_heatmap-1.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: github_heatmap
-Version: 1.1.5
+Version: 1.1.7
 Summary: Make everything a GitHub svg poster and Skyline!
 Home-page: https://github.com/malinkang/GitHubPoster
 Author: malinkang

{github_heatmap-1.1.5 → github_heatmap-1.1.7}/README.md

@@ -738,6 +738,4 @@ python3 -m github_heatmap neodb --neodb_token <token> --mark_type <complete, wis
 
 谢谢就够了
 
-Just enjoy it
-
-python3 -m github_heatmap notion  --notion_token "secret_xvMkQzLkCRtZL478L8MhvLdIDOxicjjSUm9U9voAwbb" --database_id "cf6359306f94456da01908af73191a61" --date_prop_name "时间" --value_prop_name "金币" --unit "金币" --year 2024 --me "哈哈哈" --without-type-name --with-animation --background-color=#FFFFFF --track-color=#f44336 --special-color1=#ffd966 --special-color2=#549F57 --dom-color=#EBEDF0 --text-color=#000000
+Just enjoy it

{github_heatmap-1.1.5 → github_heatmap-1.1.7}/github_heatmap/cli.py

@@ -99,11 +99,11 @@ def run():
 
     if args.type not in ["multiple", "summary"]:
         tracks, years = loader.get_all_track_data()
-        years = reduce_year_list(years, tracks)
-        if not years:  # check to handle empty year lists
-            raise ValueError(
-                "No data available for the specified years or type. Please check your user name!"
-            )
+        # years = reduce_year_list(years, tracks)
+        # if not years:  # check to handle empty year lists
+        #     raise ValueError(
+        #         "No data available for the specified years or type. Please check your user name!"
+        #     )
         if args.unit:
             p.units = args.unit
         else:
@@ -142,8 +142,6 @@ def run():
         + poster_length
         * (YEAR_FONT_SIZE + MONTH_FONT_SIZE+DOM_BOX_PADING*3 + (DOM_BOX_PADING + DOM_BOX_TUPLE[0]) * 7)
     )
-    print(f"高度 = {p.height}")
-    print(f"宽度 = {p.width}")
     if not os.path.exists(OUT_FOLDER):
         os.mkdir(OUT_FOLDER)
     # support different issues, maybe better way

{github_heatmap-1.1.5 → github_heatmap-1.1.7}/github_heatmap/drawer.py

@@ -186,8 +186,6 @@ class Drawer:
         offset.y += MONTH_FONT_SIZE
         size = DOM_BOX_PADING + DOM_BOX_TUPLE[1]
         # 绘制月份
-        # for num, name in enumerate(MONTH_NAMES):
-
         rect_x = offset.x
         animate_index = 1
         year_count, key_times = 0, ""

{github_heatmap-1.1.5 → github_heatmap-1.1.7}/github_heatmap/loader/notion_loader.py

@@ -1,3 +1,4 @@
+from datetime import datetime, timedelta
 import time
 from collections import defaultdict
 
@@ -14,11 +15,12 @@ class NotionLoader(BaseLoader):
 
     def __init__(self, from_year, to_year, _type, **kwargs):
         super().__init__(from_year, to_year, _type)
-        self.number_by_date_dict = defaultdict(int)
+        self.number_by_date_dict = self.generate_date_dict(from_year, to_year)
         self.notion_token = kwargs.get("notion_token", "")
         self.database_id = kwargs.get("database_id", "")
         self.date_prop_name = kwargs.get("date_prop_name", "")
         self.value_prop_name = kwargs.get("value_prop_name", "")
+
     @classmethod
     def add_loader_arguments(cls, parser, optional):
         parser.add_argument(
@@ -51,7 +53,21 @@ class NotionLoader(BaseLoader):
         )
 
     def get_api_data(self, start_cursor="", page_size=100, data_list=[]):
-        payload = {"page_size": page_size}
+        payload = {
+            "page_size": page_size,
+            "filter": {
+                "and": [
+                    {
+                        "property": self.date_prop_name,
+                        "date": {"on_or_after": f"{self.from_year}-01-01"},
+                    },
+                    {
+                        "property": self.date_prop_name,
+                        "date": {"on_or_before": f"{self.to_year}-12-31"},
+                    },
+                ]
+            },
+        }
         if start_cursor:
             payload.update({"start_cursor": start_cursor})
 
@@ -85,20 +101,32 @@ class NotionLoader(BaseLoader):
             start_cursor=next_cursor, page_size=page_size, data_list=data_list
         )
 
+    def generate_date_dict(self, start_year, end_year):
+        start_date = datetime(start_year, 1, 1)
+        end_date = datetime(end_year, 12, 31)
+
+        # 使用字典推导式生成日期字典
+        return {
+            (start_date + timedelta(days=i)).strftime("%Y-%m-%d"): 0
+            for i in range((end_date - start_date).days + 1)
+        }
+
     def make_track_dict(self):
         data_list = self.get_api_data()
-        # print(data_list)
         for result in data_list:
             date = result["properties"][self.date_prop_name]["date"]
             value = result["properties"][self.value_prop_name]
             if date and value:
                 dt = date.get("start")
                 type = value.get("type")
-                if(type == "formula" and value.get(type).get("type") == "number"):
+                if type == "formula" and value.get(type).get("type") == "number":
+                    value = int(value.get(type).get("number"))
+                elif type == "rollup" and value.get(type).get("type") == "number":
                     value = int(value.get(type).get("number"))
-                
                 date_str = pendulum.parse(dt).to_date_string()
-                self.number_by_date_dict[date_str] = self.number_by_date_dict.get(date_str,0) + value
+                self.number_by_date_dict[date_str] = (
+                    self.number_by_date_dict.get(date_str, 0) + value
+                )
         for _, v in self.number_by_date_dict.items():
             self.number_list.append(v)
 

{github_heatmap-1.1.5 → github_heatmap-1.1.7}/github_heatmap.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: github-heatmap
-Version: 1.1.5
+Name: github_heatmap
+Version: 1.1.7
 Summary: Make everything a GitHub svg poster and Skyline!
 Home-page: https://github.com/malinkang/GitHubPoster
 Author: malinkang

{github_heatmap-1.1.5 → github_heatmap-1.1.7}/setup.py

@@ -6,7 +6,7 @@ setup(
     author_email="linkang.ma@gmail.com",
     url="https://github.com/malinkang/GitHubPoster",
     license="MIT",
-    version="1.1.5",
+    version="1.1.7",
     description="Make everything a GitHub svg poster and Skyline!",
     packages=find_packages(),
     include_package_data=True,