refactor: simplify code formatting and improve readability in multiple files

Author: ImBIOS

.pre-commit-config.yaml

@@ -13,15 +13,19 @@ repos:
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+  - repo: local
     hooks:
       - id: flake8
-        args: [--max-line-length=160]
-        exclude: venv|assets
-  - repo: https://github.com/psf/black
-    rev: 25.1.0
+        name: flake8
+        entry: pipenv run flake8 --max-line-length=160 --exclude venv,assets .
+        language: system
+        pass_filenames: false
+        always_run: true
+  - repo: local
     hooks:
       - id: black
-        args: [--line-length=160, --diff]
-        exclude: "/venv/|/assets/"
+        name: black
+        entry: pipenv run black --line-length=160 --exclude='/venv/|/assets/' .
+        language: system
+        pass_filenames: false
+        always_run: true

sources/graphics_chart_drawer.py

@@ -45,9 +45,7 @@ async def create_loc_graph(yearly_data: Dict, save_path: str):
             for lang in langs:
                 if lang not in languages_all_loc:
                     languages_all_loc[lang] = zeros((years, 4, 2), dtype=int)
-                languages_all_loc[lang][i][q - 1] = array(
-                    [yearly_data[y][q][lang]["add"], yearly_data[y][q][lang]["del"]]
-                )
+                languages_all_loc[lang][i][q - 1] = array([yearly_data[y][q][lang]["add"], yearly_data[y][q][lang]["del"]])
 
     fig = plt.figure()
     ax = fig.add_axes([0, 0, 1.5, 1])

sources/graphics_chart_drawer_test.py

@@ -85,9 +85,7 @@ def sample_colors():
 async def test_create_loc_graph_success(sample_yearly_data, sample_colors, tmp_path):
     test_save_path = str(tmp_path / "test_graph.png")
 
-    with patch(
-        "manager_download.DownloadManager.get_remote_yaml", new_callable=AsyncMock
-    ) as mock_get_yaml:
+    with patch("manager_download.DownloadManager.get_remote_yaml", new_callable=AsyncMock) as mock_get_yaml:
         mock_get_yaml.return_value = sample_colors
 
         await create_loc_graph(sample_yearly_data, test_save_path)
@@ -100,9 +98,7 @@ async def test_create_loc_graph_success(sample_yearly_data, sample_colors, tmp_p
 async def test_create_loc_graph_no_colors(sample_yearly_data, tmp_path):
     test_save_path = str(tmp_path / "test_graph_no_colors.png")
 
-    with patch(
-        "manager_download.DownloadManager.get_remote_yaml", new_callable=AsyncMock
-    ) as mock_get_yaml:
+    with patch("manager_download.DownloadManager.get_remote_yaml", new_callable=AsyncMock) as mock_get_yaml:
         mock_get_yaml.return_value = None
 
         await create_loc_graph(sample_yearly_data, test_save_path)
@@ -116,9 +112,7 @@ async def test_create_loc_graph_empty_data(tmp_path):
     test_save_path = str(tmp_path / "test_graph_empty.png")
     empty_data = {}
 
-    with patch(
-        "manager_download.DownloadManager.get_remote_yaml", new_callable=AsyncMock
-    ) as mock_get_yaml:
+    with patch("manager_download.DownloadManager.get_remote_yaml", new_callable=AsyncMock) as mock_get_yaml:
         mock_get_yaml.return_value = {}
 
         await create_loc_graph(empty_data, test_save_path)
@@ -139,9 +133,7 @@ async def test_create_loc_graph_single_language(tmp_path):
         }
     }
 
-    with patch(
-        "manager_download.DownloadManager.get_remote_yaml", new_callable=AsyncMock
-    ) as mock_get_yaml:
+    with patch("manager_download.DownloadManager.get_remote_yaml", new_callable=AsyncMock) as mock_get_yaml:
         mock_get_yaml.return_value = {"Python": {"color": "blue"}}
 
         await create_loc_graph(single_lang_data, test_save_path)
@@ -151,9 +143,7 @@ async def test_create_loc_graph_single_language(tmp_path):
 
 
 @pytest.mark.asyncio
-async def test_create_loc_graph_max_languages(
-    sample_yearly_data, sample_colors, tmp_path
-):
+async def test_create_loc_graph_max_languages(sample_yearly_data, sample_colors, tmp_path):
     test_save_path = str(tmp_path / "test_graph_max.png")
 
     # Add more than MAX_LANGUAGES languages to test the limit
@@ -165,9 +155,7 @@ async def test_create_loc_graph_max_languages(
         }
     )
 
-    with patch(
-        "manager_download.DownloadManager.get_remote_yaml", new_callable=AsyncMock
-    ) as mock_get_yaml:
+    with patch("manager_download.DownloadManager.get_remote_yaml", new_callable=AsyncMock) as mock_get_yaml:
         mock_get_yaml.return_value = sample_colors
 
         await create_loc_graph(sample_yearly_data, test_save_path)

sources/graphics_list_formatter.py

@@ -90,38 +90,17 @@ def make_list(
     :returns: The string representation of the list.
     """
     if data is not None:
-        names = (
-            [value for item in data for key, value in item.items() if key == "name"]
-            if names is None
-            else names
-        )
-        texts = (
-            [value for item in data for key, value in item.items() if key == "text"]
-            if texts is None
-            else texts
-        )
-        percents = (
-            [value for item in data for key, value in item.items() if key == "percent"]
-            if percents is None
-            else percents
-        )
+        names = [value for item in data for key, value in item.items() if key == "name"] if names is None else names
+        texts = [value for item in data for key, value in item.items() if key == "text"] if texts is None else texts
+        percents = [value for item in data for key, value in item.items() if key == "percent"] if percents is None else percents
 
     data = list(zip(names, texts, percents))
-    top_data = (
-        sorted(data[:top_num], key=lambda record: record[2], reverse=True)
-        if sort
-        else data[:top_num]
-    )
-    data_list = [
-        f"{n[:25]}{' ' * (25 - len(n))}{t}{' ' * (20 - len(t))}{make_graph(p)}   {p:05.2f} % "
-        for n, t, p in top_data
-    ]
+    top_data = sorted(data[:top_num], key=lambda record: record[2], reverse=True) if sort else data[:top_num]
+    data_list = [f"{n[:25]}{' ' * (25 - len(n))}{t}{' ' * (20 - len(t))}{make_graph(p)}   {p:05.2f} % " for n, t, p in top_data]
     return "\n".join(data_list)
 
 
-async def make_commit_day_time_list(
-    time_zone: str, repositories: Dict, commit_dates: Dict
-) -> str:
+async def make_commit_day_time_list(time_zone: str, repositories: Dict, commit_dates: Dict) -> str:
     """
     Calculate commit-related info, how many commits were made, and at what time of day and day of week.
 
@@ -132,19 +111,13 @@ async def make_commit_day_time_list(
     """
     stats = str()
     day_times = [0] * 4  # 0 - 6, 6 - 12, 12 - 18, 18 - 24
-    week_days = [
-        0
-    ] * 7  # Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday
+    week_days = [0] * 7  # Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday
 
     for repository in repositories:
         if repository["name"] not in commit_dates.keys():
             continue
 
-        for committed_date in [
-            commit_date
-            for branch in commit_dates[repository["name"]].values()
-            for commit_date in branch.values()
-        ]:
+        for committed_date in [commit_date for branch in commit_dates[repository["name"]].values() for commit_date in branch.values()]:
             local_date = datetime.strptime(committed_date, "%Y-%m-%dT%H:%M:%SZ")
             date = local_date.replace(tzinfo=utc).astimezone(timezone(time_zone))
 
@@ -156,33 +129,17 @@ async def make_commit_day_time_list(
     day_times = day_times[1:] + day_times[:1]
 
     if EM.SHOW_COMMIT:
-        dt_names = [
-            f"{DAY_TIME_EMOJI[i]} {FM.t(DAY_TIME_NAMES[i])}"
-            for i in range(len(day_times))
-        ]
+        dt_names = [f"{DAY_TIME_EMOJI[i]} {FM.t(DAY_TIME_NAMES[i])}" for i in range(len(day_times))]
         dt_texts = [f"{day_time} commits" for day_time in day_times]
-        dt_percents = [
-            0 if sum_day == 0 else round((day_time / sum_day) * 100, 2)
-            for day_time in day_times
-        ]
-        title = (
-            FM.t("I am an Early")
-            if sum(day_times[0:2]) >= sum(day_times[2:4])
-            else FM.t("I am a Night")
-        )
+        dt_percents = [0 if sum_day == 0 else round((day_time / sum_day) * 100, 2) for day_time in day_times]
+        title = FM.t("I am an Early") if sum(day_times[0:2]) >= sum(day_times[2:4]) else FM.t("I am a Night")
         stats += f"**{title}** \n\n```text\n{make_list(names=dt_names, texts=dt_texts, percents=dt_percents, top_num=7, sort=False)}\n```\n"
 
     if EM.SHOW_DAYS_OF_WEEK:
         wd_names = [FM.t(week_day) for week_day in WEEK_DAY_NAMES]
         wd_texts = [f"{week_day} commits" for week_day in week_days]
-        wd_percents = [
-            0 if sum_week == 0 else round((week_day / sum_week) * 100, 2)
-            for week_day in week_days
-        ]
-        title = (
-            FM.t("I am Most Productive on")
-            % wd_names[wd_percents.index(max(wd_percents))]
-        )
+        wd_percents = [0 if sum_week == 0 else round((week_day / sum_week) * 100, 2) for week_day in week_days]
+        title = FM.t("I am Most Productive on") % wd_names[wd_percents.index(max(wd_percents))]
         stats += f"📅 **{title}** \n\n```text\n{make_list(names=wd_names, texts=wd_texts, percents=wd_percents, top_num=7, sort=False)}\n```\n"
 
     return stats
@@ -196,30 +153,16 @@ def make_language_per_repo_list(repositories: Dict) -> str:
     :returns: string representation of statistics.
     """
     language_count = dict()
-    repos_with_language = [
-        repo for repo in repositories if repo["primaryLanguage"] is not None
-    ]
+    repos_with_language = [repo for repo in repositories if repo["primaryLanguage"] is not None]
     for repo in repos_with_language:
         language = repo["primaryLanguage"]["name"]
         language_count[language] = language_count.get(language, {"count": 0})
         language_count[language]["count"] += 1
 
     names = list(language_count.keys())
-    texts = [
-        f"{language_count[lang]['count']} {'repo' if language_count[lang]['count'] == 1 else 'repos'}"
-        for lang in names
-    ]
-    percents = [
-        round(language_count[lang]["count"] / len(repos_with_language) * 100, 2)
-        for lang in names
-    ]
-
-    top_language = max(
-        list(language_count.keys()), key=lambda x: language_count[x]["count"]
-    )
-    title = (
-        f"**{FM.t('I Mostly Code in') % top_language}** \n\n"
-        if len(repos_with_language) > 0
-        else ""
-    )
+    texts = [f"{language_count[lang]['count']} {'repo' if language_count[lang]['count'] == 1 else 'repos'}" for lang in names]
+    percents = [round(language_count[lang]["count"] / len(repos_with_language) * 100, 2) for lang in names]
+
+    top_language = max(list(language_count.keys()), key=lambda x: language_count[x]["count"])
+    title = f"**{FM.t('I Mostly Code in') % top_language}** \n\n" if len(repos_with_language) > 0 else ""
     return f"{title}```text\n{make_list(names=names, texts=texts, percents=percents)}\n```\n\n"

sources/main.py

@@ -42,19 +42,11 @@ async def get_waka_time_stats(repositories: Dict, commit_dates: Dict) -> str:
     if data is None:
         DBM.p("WakaTime data unavailable!")
         return stats
-    if (
-        EM.SHOW_COMMIT or EM.SHOW_DAYS_OF_WEEK
-    ):  # if any on flag is turned on then we need to calculate the data and print accordingly
+    if EM.SHOW_COMMIT or EM.SHOW_DAYS_OF_WEEK:  # if any on flag is turned on then we need to calculate the data and print accordingly
         DBM.i("Adding user commit day time info...")
         stats += f"{await make_commit_day_time_list(data['data']['timezone'], repositories, commit_dates)}\n\n"
 
-    if (
-        EM.SHOW_TIMEZONE
-        or EM.SHOW_LANGUAGE
-        or EM.SHOW_EDITORS
-        or EM.SHOW_PROJECTS
-        or EM.SHOW_OS
-    ):
+    if EM.SHOW_TIMEZONE or EM.SHOW_LANGUAGE or EM.SHOW_EDITORS or EM.SHOW_PROJECTS or EM.SHOW_OS:
         no_activity = FM.t("No Activity Tracked This Week")
         stats += f"📊 **{FM.t('This Week I Spend My Time On')}** \n\n```text\n"
 
@@ -65,38 +57,22 @@ async def get_waka_time_stats(repositories: Dict, commit_dates: Dict) -> str:
 
         if EM.SHOW_LANGUAGE:
             DBM.i("Adding user top languages info...")
-            lang_list = (
-                no_activity
-                if len(data["data"]["languages"]) == 0
-                else make_list(data["data"]["languages"])
-            )
+            lang_list = no_activity if len(data["data"]["languages"]) == 0 else make_list(data["data"]["languages"])
             stats += f"💬 {FM.t('Languages')}: \n{lang_list}\n\n"
 
         if EM.SHOW_EDITORS:
             DBM.i("Adding user editors info...")
-            edit_list = (
-                no_activity
-                if len(data["data"]["editors"]) == 0
-                else make_list(data["data"]["editors"])
-            )
+            edit_list = no_activity if len(data["data"]["editors"]) == 0 else make_list(data["data"]["editors"])
             stats += f"🔥 {FM.t('Editors')}: \n{edit_list}\n\n"
 
         if EM.SHOW_PROJECTS:
             DBM.i("Adding user projects info...")
-            project_list = (
-                no_activity
-                if len(data["data"]["projects"]) == 0
-                else make_list(data["data"]["projects"])
-            )
+            project_list = no_activity if len(data["data"]["projects"]) == 0 else make_list(data["data"]["projects"])
             stats += f"🐱‍💻 {FM.t('Projects')}: \n{project_list}\n\n"
 
         if EM.SHOW_OS:
             DBM.i("Adding user operating systems info...")
-            os_list = (
-                no_activity
-                if len(data["data"]["operating_systems"]) == 0
-                else make_list(data["data"]["operating_systems"])
-            )
+            os_list = no_activity if len(data["data"]["operating_systems"]) == 0 else make_list(data["data"]["operating_systems"])
             stats += f"💻 {FM.t('operating system')}: \n{os_list}\n\n"
 
         stats = f"{stats[:-1]}```\n\n"
@@ -152,9 +128,7 @@ async def get_short_github_info() -> str:
         stats += f"> 📜 {FM.t('public repository') % public_repo} \n > \n"
 
     DBM.i("Adding private repositories info...")
-    private_repo = (
-        GHM.USER.owned_private_repos if GHM.USER.owned_private_repos is not None else 0
-    )
+    private_repo = GHM.USER.owned_private_repos if GHM.USER.owned_private_repos is not None else 0
     if public_repo != 1:
         stats += f"> 🔑 {FM.t('private repositories') % private_repo} \n > \n"
     else:
@@ -171,21 +145,13 @@ async def collect_user_repositories() -> Dict:
     :returns: Complete list of user repositories.
     """
     DBM.i("Getting user repositories list...")
-    repositories = await DM.get_remote_graphql(
-        "user_repository_list", username=GHM.USER.login, id=GHM.USER.node_id
-    )
+    repositories = await DM.get_remote_graphql("user_repository_list", username=GHM.USER.login, id=GHM.USER.node_id)
     repo_names = [repo["name"] for repo in repositories]
     DBM.g("\tUser repository list collected!")
 
-    contributed = await DM.get_remote_graphql(
-        "repos_contributed_to", username=GHM.USER.login
-    )
+    contributed = await DM.get_remote_graphql("repos_contributed_to", username=GHM.USER.login)
 
-    contributed_nodes = [
-        repo
-        for repo in contributed
-        if repo is not None and repo["name"] not in repo_names and not repo["isFork"]
-    ]
+    contributed_nodes = [repo for repo in contributed if repo is not None and repo["name"] not in repo_names and not repo["isFork"]]
     DBM.g("\tUser contributed to repository list collected!")
 
     return repositories + contributed_nodes
@@ -203,12 +169,7 @@ async def get_stats() -> str:
     stats = str()
     repositories = await collect_user_repositories()
 
-    if (
-        EM.SHOW_LINES_OF_CODE
-        or EM.SHOW_LOC_CHART
-        or EM.SHOW_COMMIT
-        or EM.SHOW_DAYS_OF_WEEK
-    ):  # calculate commit data if any one of these is enabled
+    if EM.SHOW_LINES_OF_CODE or EM.SHOW_LOC_CHART or EM.SHOW_COMMIT or EM.SHOW_DAYS_OF_WEEK:  # calculate commit data if any one of these is enabled
         yearly_data, commit_data = await calculate_commit_data(repositories)
     else:
         yearly_data, commit_data = dict(), dict()
@@ -229,14 +190,7 @@ async def get_stats() -> str:
 
     if EM.SHOW_LINES_OF_CODE:
         DBM.i("Adding lines of code info...")
-        total_loc = sum(
-            [
-                yearly_data[y][q][d]["add"]
-                for y in yearly_data.keys()
-                for q in yearly_data[y].keys()
-                for d in yearly_data[y][q].keys()
-            ]
-        )
+        total_loc = sum([yearly_data[y][q][d]["add"] for y in yearly_data.keys() for q in yearly_data[y].keys() for d in yearly_data[y][q].keys()])
         data = f"{intword(total_loc)} {FM.t('Lines of code')}"
         stats += f"![Lines of code](https://img.shields.io/badge/{quote(FM.t('From Hello World I have written'))}-{quote(data)}-blue)\n\n"
 
@@ -251,15 +205,11 @@ async def get_stats() -> str:
 
     if EM.SHOW_LOC_CHART:
         await create_loc_graph(yearly_data, GRAPH_PATH)
-        stats += (
-            f"**{FM.t('Timeline')}**\n\n{GHM.update_chart('Lines of Code', GRAPH_PATH)}"
-        )
+        stats += f"**{FM.t('Timeline')}**\n\n{GHM.update_chart('Lines of Code', GRAPH_PATH)}"
 
     if EM.SHOW_UPDATED_DATE:
         DBM.i("Adding last updated time...")
-        stats += (
-            f"\n Last Updated on {datetime.now().strftime(EM.UPDATED_DATE_FORMAT)} UTC"
-        )
+        stats += f"\n Last Updated on {datetime.now().strftime(EM.UPDATED_DATE_FORMAT)} UTC"
 
     DBM.g("Stats for README collected!")
     return stats