codestyle applying done

2023-02-17 17:25:32 +01:00
parent 8e675eaafd
commit c378e689d0
6 changed files with 112 additions and 158 deletions
--- a/sources/graphics_list_formatter.py
+++ b/sources/graphics_list_formatter.py
@@ -1,4 +1,5 @@
-from typing import Dict
+from enum import Enum
+from typing import Dict, Tuple, List
 from datetime import datetime

 from pytz import timezone, utc
@@ -9,50 +10,46 @@ from manager_github import GitHubManager as GHM
 from manager_localization import LocalizationManager as LM


+DAY_TIME_EMOJI = ["🌞", "🌆", "🌃", "🌙"]
+DAY_TIME_NAMES = ["Morning", "Daytime", "Evening", "Night"]
+WEEK_DAY_NAMES = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
+
+
+class Symbol(Enum):
+    VERSION_1 = "█", "░"
+    VERSION_2 = "⣿", "⣀"
+    VERSION_3 = "⬛", "⬜"
+
+    @staticmethod
+    def get_symbols(version: int) -> Tuple[str, str]:
+        return Symbol[f"VERSION_{version}"].value
+
+
 def make_graph(percent: float):
-    '''Make progress graph from API graph'''
-    if EM.SYMBOL_VERSION == 1:  # version 1
-        done_block = '█'
-        empty_block = '░'
-    elif EM.SYMBOL_VERSION == 2:  # version 2
-        done_block = '⣿'
-        empty_block = '⣀'
-    elif EM.SYMBOL_VERSION == 3:  # version 3
-        done_block = '⬛'
-        empty_block = '⬜'
-    else:
-        done_block = '█'  # default is version 1
-        empty_block = '░'
-
-    pc_rnd = round(percent)
-    return f"{done_block * int(pc_rnd / 4)}{empty_block * int(25 - int(pc_rnd / 4))}"
+    """
+    Make progress graph from API graph
+    """
+    done_block, empty_block = Symbol.get_symbols(EM.SYMBOL_VERSION)
+    percent_quart = round(percent / 4)
+    return f"{done_block * percent_quart}{empty_block * (25 - percent_quart)}"


-def make_list(data: list):  # TODO: add arg: sorted
-    '''Make List'''
-    data_list = []
-    for l in data[:5]:
-        ln = len(l['name'])
-        ln_text = len(l['text'])
-        percent = "{:05.2f}".format(float(l['percent']))
-        op = f"{l['name'][:25]}{' ' * (25 - ln)}{l['text']}{' ' * (20 - ln_text)}{make_graph(l['percent'])}   {percent} % "
-        data_list.append(op)
+def make_list(data: Dict = None, names: List[str] = None, texts: List[str] = None, percents: List[float] = None, top_num: int = 5, sort: bool = True) -> str:
+    """
+    Make List
+    """
+    if data is not None:
+        names = [value for key, value in data if key == "name"] if names is None else names
+        texts = [value for key, value in data if key == "text"] if texts is None else texts
+        percents = [value for key, value in data if key == "percent"] if percents is None else percents
+
+    data = list(zip(names, texts, percents))
+    top_data = sorted(data[:top_num], key=lambda _, __, p: p) 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)


-def make_commit_list(data: list):
-    '''Make List'''
-    data_list = []
-    for l in data[:7]:
-        ln = len(l['name'])
-        ln_text = len(l['text'])
-        percent = "{:05.2f}".format(float(l['percent']))
-        op = f"{l['name']}{' ' * ((15 - ln) + (11 - ln_text))}{l['text']}{' ' * (7)}{make_graph(l['percent'])}   {percent} % "
-        data_list.append(op)
-    return '\n'.join(data_list)
-
-
-async def generate_commit_list(time_zone: str) -> str:
+async def make_commit_day_time_list(time_zone: str) -> str:
    stats = str()

    result = await DM.get_remote_graphql("repos_contributed_to", username=GHM.USER.login)
@@ -75,28 +72,19 @@ async def generate_commit_list(time_zone: str) -> str:
    sum_day = sum(day_times)
    sum_week = sum(week_days)
    day_times = day_times[1:] + day_times[:1]
-    time_of_day_data = [
-        {"name": f"🌞 {LM.t('Morning')}", "text": f"{day_times[0]} commits", "percent": round((day_times[0] / sum_day) * 100, 2)},
-        {"name": f"🌆 {LM.t('Daytime')}", "text": f"{day_times[1]} commits", "percent": round((day_times[1] / sum_day) * 100, 2)},
-        {"name": f"🌃 {LM.t('Evening')}", "text": f"{day_times[2]} commits", "percent": round((day_times[2] / sum_day) * 100, 2)},
-        {"name": f"🌙 {LM.t('Night')}", "text": f"{day_times[3]} commits", "percent": round((day_times[3] / sum_day) * 100, 2)},
-    ]
-    day_of_week_data = [
-        {"name": LM.t("Monday"), "text": f"{week_days[0]} commits", "percent": round((week_days[0] / sum_week) * 100, 2)},
-        {"name": LM.t("Tuesday"), "text": f"{week_days[1]} commits", "percent": round((week_days[1] / sum_week) * 100, 2)},
-        {"name": LM.t("Wednesday"), "text": f"{week_days[2]} commits", "percent": round((week_days[2] / sum_week) * 100, 2)},
-        {"name": LM.t("Thursday"), "text": f"{week_days[3]} commits", "percent": round((week_days[3] / sum_week) * 100, 2)},
-        {"name": LM.t("Friday"), "text": f"{week_days[4]} commits", "percent": round((week_days[4] / sum_week) * 100, 2)},
-        {"name": LM.t("Saturday"), "text": f"{week_days[5]} commits", "percent": round((week_days[5] / sum_week) * 100, 2)},
-        {"name": LM.t("Sunday"), "text": f"{week_days[6]} commits", "percent": round((week_days[6] / sum_week) * 100, 2)},
-    ]

+    day_time_names = [f"{DAY_TIME_EMOJI[i]} {LM.t(DAY_TIME_NAMES[i])}" for i in range(len(day_times))]
+    day_time_texts = [f'{day_time} commits' for day_time in day_times]
+    day_time_percents = [round((day_time / sum_day) * 100, 2) for day_time in day_times]
    title = LM.t("I am an Early") if sum(day_times[0:2]) >= sum(day_times[2:4]) else LM.t("I am a Night")
-    stats += f"**{title}** \n\n```text\n{make_commit_list(time_of_day_data)}\n\n```\n"
+    stats += f"**{title}** \n\n```text\n{make_list(names=day_time_names, texts=day_time_texts, percents=day_time_percents, top_num=7)}\n\n```\n"

    if EM.SHOW_DAYS_OF_WEEK:
-        most_productive = max(day_of_week_data, key=lambda d: d["percent"])
-        stats += f"📅 **{LM.t('I am Most Productive on') % most_productive['name']}** \n\n```text\n{make_commit_list(day_of_week_data)}\n\n```\n"
+        week_day_names = [LM.t(week_day) for week_day in WEEK_DAY_NAMES]
+        week_day_texts = [f'{week_day} commits' for week_day in week_days]
+        week_day_percents = [round((week_day / sum_week) * 100, 2) for week_day in week_days]
+        title = LM.t("I am Most Productive on") % week_day_names[week_day_percents.index(max(week_day_percents))]
+        stats += f"📅 **{title}** \n\n```text\n{make_list(names=week_day_names, texts=week_day_texts, percents=week_day_percents, top_num=7)}\n\n```\n"

    return stats

@@ -109,14 +97,10 @@ def make_language_per_repo_list(result: Dict) -> str:
        language_count[language] = language_count.get(language, {"count": 0})
        language_count[language]["count"] += 1

-    data = list()
-    for language in language_count.keys():
-        data.append({
-            "name": language,
-            "text": f"{language_count[language]['count']} {'repo' if language_count[language]['count'] == 1 else 'repos'}",
-            "percent": round(language_count[language]["count"] / len(repos_with_language) * 100, 2)
-        })
+    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"**{LM.t('I Mostly Code in') % top_language}** \n\n" if len(repos_with_language) > 0 else ""
-    return f"{title}```text\n{make_list(data)}\n```\n\n"
+    return f"{title}```text\n{make_list(names=names, texts=texts, percents=percents)}\n```\n\n"