added editorconfig, fix None objects (#142)

thehighestmath · web-flow · commit 0c344e13c14e · 2025-06-02T14:50:30.000+03:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,33 @@
+# EditorConfig is awesome: https://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,py}]
+charset = utf-8
+
+# 4 space indentation
+[*.py]
+indent_style = space
+indent_size = 4
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+# Indentation override for all JS under lib directory
+[lib/**.js]
+indent_style = space
+indent_size = 2
+
+# Matches the exact files either package.json or .travis.yml
+[{package.json,.travis.yml}]
+indent_style = space
+indent_size = 2
diff --git a/src/ForgejoRepoAPI.py b/src/ForgejoRepoAPI.py
@@ -74,7 +74,7 @@ def get_commits(self, repo: Repository, files: bool = True) -> list[Commit]:
             Commit(
                 _id=c.sha,
                 message=c.commit.message,
-                author=self.get_user_data(c.author),
+                author=self.get_user_data(c.author) if c.author else None,
                 date=isodate.parse_datetime(c.commit.author.date),
                 files=(
                     [f.filename for f in getattr(c, "files", [])] if files else None
diff --git a/src/GitHubRepoAPI.py b/src/GitHubRepoAPI.py
@@ -24,7 +24,11 @@ def __init__(self, client: Github):
         self.client = self._client_validation(client)
 
     @staticmethod
-    @log_exceptions(default_return=None, message="Github: Connect: user could not be authenticated. Please try again.")
+    @log_exceptions(
+        default_return=None,
+        message="Github: Connect: user could not be authenticated. Please try again.",
+        print_stacktrace=False,
+    )
     def _client_validation(client: Github) -> Github | None:
         client.get_user().login
         return client
diff --git a/src/commits_parser.py b/src/commits_parser.py
@@ -33,7 +33,7 @@ def log_repository_commits(
             for branch in client.get_branches(repository):
                 branches.append(branch.name)
         case None:
-            branches.append(repository.default_branch)
+            branches.append(repository.default_branch.name)
         case _:
             branches.append(branch)
 
@@ -51,9 +51,9 @@ def log_repository_commits(
             changed_files = changed_files[:GOOGLE_MAX_CELL_LEN]
             commit_data = CommitData(
                 repository_name=repository.name,
-                author_name=commit.author.username,
-                author_login=commit.author.login or EMPTY_FIELD,
-                author_email=commit.author.email or EMPTY_FIELD,
+                author_name=commit.author.username if commit.author else EMPTY_FIELD,
+                author_login=commit.author.login if commit.author else EMPTY_FIELD,
+                author_email=commit.author.email if commit.author else EMPTY_FIELD,
                 date_and_time=commit.date.astimezone(pytz.timezone(TIMEZONE)).isoformat(),
                 changed_files=changed_files,
                 commit_id=commit._id,
diff --git a/src/git_logger.py b/src/git_logger.py
@@ -1,124 +1,126 @@
-from time import sleep
-import logging
-import traceback
-
-import requests
-
-from src.GitHubRepoAPI import GitHubRepoAPI
-from src.interface_wrapper import (
-    RepositoryFactory,
-    IRepositoryAPI
-)
-from src.constants import (
-    TIMEDELTA,
-)
-
-
-def login(token, base_url):
-    try:
-        client = RepositoryFactory.create_api(token, base_url)
-        return client
-    except Exception as e:
-        logging.error(e)
-        logging.error(traceback.format_exc())
-        return None
-
-
-def get_tokens_from_file(tokens_path: str) -> list[str]:
-    with open(tokens_path, 'r') as file:
-        tokens = [token for token in file.read().split('\n') if token]
-
-    return tokens
-
-
-def get_repos_from_file(repos_path: str) -> list[str]:
-    with open(repos_path, 'r') as file:
-        list_repos = [x for x in file.read().split('\n') if x]
-
-    return list_repos
-
-
-class Clients:
-    def __init__(self, tokens: list[str], base_url: str | None = None):
-        self.clients = []
-        self.token_map = {}
-
-        for token in tokens:
-            client = login(token, base_url)
-            if client:
-                self.clients.append(client)
-                self.token_map[client] = token
-
-        if not self.clients:
-            raise Exception("No valid tokens for either GitHub or Forgejo")
-
-    def _get_next_client(self) -> tuple[IRepositoryAPI, str]:
-        client = None
-        max_remaining_limit = -1
-
-        for c in self.clients:
-            remaining, _ = c.get_rate_limiting()
-            if remaining > max_remaining_limit:
-                client = c
-                max_remaining_limit = remaining
-            sleep(TIMEDELTA)
-
-        if client is None:
-            raise Exception("No git clients available")
-        return client, self.token_map[client]
-
-    def get_next_client(self) -> tuple[IRepositoryAPI, str]:
-        return self._get_next_client()
-
-
-def get_next_binded_repo(clients: Clients, repositories: list[str]):
-    for repo_name in repositories:
-        try:
-            client, token = clients.get_next_client()
-            repo = client.get_repository(repo_name)
-        except Exception as err:
-            print(f'git_logger.get_next_binded_repo(): error {err}')
-            print(f'git_logger.get_next_binded_repo(): failed to load repository "{repo_name}"')
-        else:
-            yield client, repo, token
-
-
-def get_assignee_story(git_object, client, token, repository):
-    assignee_result = ""
-
-    try:
-        repo_owner = repository.owner.login
-        repo_name = repository.name
-        issue_index = git_object._id  # Для pull request и issue одинаково
-
-        base_url = client.get_base_url().rstrip('/')
-
-        url = f"{base_url}/repos/{repo_owner}/{repo_name}/issues/{issue_index}/timeline"
-        headers = {
-            "Authorization": f"Bearer {token}" if client is GitHubRepoAPI else f"token {token}",
-            "Accept": "application/json"
-        }
-
-        response = requests.get(url, headers=headers)
-        if response.status_code != 200:
-            raise Exception(f"Failed to fetch issue timeline: {response.status_code}, {response.text}")
-
-        events = response.json()
-
-        for event in events:
-            if event.get('event') in ["assigned", "unassigned"]:
-                date = event.get('created_at')
-                assigner = event.get('actor', {}).get('login', 'unknown')
-                assignee = event.get('assignee', {}).get('login', 'unknown')
-
-                assignee_result += f"{date}: {assigner} -"
-                if event['event'] == "unassigned":
-                    assignee_result += "/"
-                assignee_result += f"> {assignee}; "
-
-                sleep(TIMEDELTA)
-
-    except Exception as e:
-        print(f"get_assignee_story(): error {e}")
-
-    return assignee_result
+from time import sleep
+import logging
+import traceback
+
+import requests
+
+from src.GitHubRepoAPI import GitHubRepoAPI
+from src.interface_wrapper import (
+    RepositoryFactory,
+    IRepositoryAPI
+)
+from src.constants import (
+    TIMEDELTA,
+)
+
+
+def login(token, base_url):
+    try:
+        client = RepositoryFactory.create_api(token, base_url)
+        return client
+    except Exception as e:
+        logging.error(e)
+        logging.error(traceback.format_exc())
+        return None
+
+
+def get_tokens_from_file(tokens_path: str) -> list[str]:
+    with open(tokens_path, 'r') as file:
+        tokens = [token for token in file.read().split('\n') if token]
+
+    return tokens
+
+
+def get_repos_from_file(repos_path: str) -> list[str]:
+    with open(repos_path, 'r') as file:
+        list_repos = [x for x in file.read().split('\n') if x]
+
+    return list_repos
+
+
+class Clients:
+    def __init__(self, tokens: list[str], base_url: str | None = None):
+        self.clients = []
+        self.token_map = {}
+
+        for token in tokens:
+            client = login(token, base_url)
+            if client:
+                self.clients.append(client)
+                self.token_map[client] = token
+
+        if not self.clients:
+            if base_url:
+                raise Exception("No valid tokens for either GitHub or Forgejo")
+            raise Exception("Make sure that base_url is provided")
+
+    def _get_next_client(self) -> tuple[IRepositoryAPI, str]:
+        client = None
+        max_remaining_limit = -1
+
+        for c in self.clients:
+            remaining, _ = c.get_rate_limiting()
+            if remaining > max_remaining_limit:
+                client = c
+                max_remaining_limit = remaining
+            sleep(TIMEDELTA)
+
+        if client is None:
+            raise Exception("No git clients available")
+        return client, self.token_map[client]
+
+    def get_next_client(self) -> tuple[IRepositoryAPI, str]:
+        return self._get_next_client()
+
+
+def get_next_binded_repo(clients: Clients, repositories: list[str]):
+    for repo_name in repositories:
+        try:
+            client, token = clients.get_next_client()
+            repo = client.get_repository(repo_name)
+        except Exception as err:
+            print(f'git_logger.get_next_binded_repo(): error {err}')
+            print(f'git_logger.get_next_binded_repo(): failed to load repository "{repo_name}"')
+        else:
+            yield client, repo, token
+
+
+def get_assignee_story(git_object, client, token, repository):
+    assignee_result = ""
+
+    try:
+        repo_owner = repository.owner.login
+        repo_name = repository.name
+        issue_index = git_object._id  # Для pull request и issue одинаково
+
+        base_url = client.get_base_url().rstrip('/')
+
+        url = f"{base_url}/repos/{repo_owner}/{repo_name}/issues/{issue_index}/timeline"
+        headers = {
+            "Authorization": f"Bearer {token}" if client is GitHubRepoAPI else f"token {token}",
+            "Accept": "application/json"
+        }
+
+        response = requests.get(url, headers=headers)
+        if response.status_code != 200:
+            raise Exception(f"Failed to fetch issue timeline: {response.status_code}, {response.text}")
+
+        events = response.json()
+
+        for event in events:
+            if event.get('event') in ["assigned", "unassigned"]:
+                date = event.get('created_at')
+                assigner = event.get('actor', {}).get('login', 'unknown')
+                assignee = event.get('assignee', {}).get('login', 'unknown')
+
+                assignee_result += f"{date}: {assigner} -"
+                if event['event'] == "unassigned":
+                    assignee_result += "/"
+                assignee_result += f"> {assignee}; "
+
+                sleep(TIMEDELTA)
+
+    except Exception as e:
+        print(f"get_assignee_story(): error {e}")
+
+    return assignee_result
diff --git a/src/utils.py b/src/utils.py
@@ -77,7 +77,7 @@ def parse_time(datetime_str) -> datetime:
     return start_datetime.astimezone(pytz.timezone(TIMEZONE))
 
 
-def log_exceptions(default_return=None, message=""):
+def log_exceptions(default_return=None, message="", print_stacktrace=True):
     """
     Декоратор обработки ошибок для методов класса.
     Логирует ошибки и возвращает default_return при исключении.
@@ -91,7 +91,8 @@ def wrapper(*args, **kwargs):
                 class_name = args[0].__class__.__name__ if args else ""
                 logging.error(f"{class_name=}")
                 logging.error(f"{message} {func.__name__}: {e}")
-                logging.error(traceback.format_exc())
+                if print_stacktrace:
+                    logging.error(traceback.format_exc())
                 return default_return
         return wrapper
     return decorator
