github-monitor 2.2__tar.gz → 2.2.1__tar.gz

{github_monitor-2.2 → github_monitor-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github_monitor
-Version: 2.2
+Version: 2.2.1
 Summary: Tool implementing real-time tracking of Github users activities including profile and repositories changes
 Author-email: Michal Szymanski <misiektoja-pypi@rm-rf.ninja>
 License-Expression: GPL-3.0-or-later

{github_monitor-2.2 → github_monitor-2.2.1}/github_monitor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github_monitor
-Version: 2.2
+Version: 2.2.1
 Summary: Tool implementing real-time tracking of Github users activities including profile and repositories changes
 Author-email: Michal Szymanski <misiektoja-pypi@rm-rf.ninja>
 License-Expression: GPL-3.0-or-later

{github_monitor-2.2 → github_monitor-2.2.1}/github_monitor.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """
 Author: Michal Szymanski <misiektoja-github@rm-rf.ninja>
-v2.2
+v2.2.1
 
 OSINT tool implementing real-time tracking of GitHub users activities including profile and repositories changes:
 https://github.com/misiektoja/github_monitor/
@@ -16,7 +16,7 @@ tzlocal (optional)
 python-dotenv (optional)
 """
 
-VERSION = "2.2"
+VERSION = "2.2.1"
 
 # ---------------------------
 # CONFIGURATION SECTION START
@@ -1198,6 +1198,13 @@ def format_body_block(content, indent="    "):
     return f"\n{indented}"
 
 
+# Returns the base web URL for GitHub or GHE (e.g. https://github.com or https://ghe.example.com)
+def github_web_base() -> str:
+    if "api.github.com" in GITHUB_API_URL:
+        return "https://github.com"
+    return GITHUB_API_URL.replace("/api/v3", "").rstrip("/")
+
+
 # Prints details about passed GitHub event
 def github_print_event(event, g, time_passed=False, ts: datetime | None = None):
 
@@ -1232,7 +1239,9 @@ def github_print_event(event, g, time_passed=False, ts: datetime | None = None):
                     pass
 
             repo_name = getattr(repo, "full_name", event.repo.name)
-            repo_url = getattr(repo, "html_url", event.repo.url.replace("https://api.github.com/repos/", "https://github.com/"))
+
+            api_prefix = GITHUB_API_URL.rstrip("/") + "/repos/"
+            repo_url = getattr(repo, "html_url", event.repo.url.replace(api_prefix, github_web_base() + "/"))
 
             st += print_v(f"\nRepo name:\t\t\t{repo_name}")
             st += print_v(f"Repo URL:\t\t\t{repo_url}")
@@ -1327,8 +1336,8 @@ def github_print_event(event, g, time_passed=False, ts: datetime | None = None):
         # st += print_v("\n[debug] PushEvent payload has no 'commits' array; using compare API")
         # st += print_v(f"[debug] before:\t\t\t{before_sha}")
         # st += print_v(f"[debug] head/after:\t\t{head_sha}")
-        if size_hint is not None:
-            st += print_v(f"[debug] size (hint):\t\t{size_hint}")
+        # if size_hint is not None:
+        #     st += print_v(f"[debug] size (hint):\t\t{size_hint}")
 
         if before_sha and head_sha and before_sha != head_sha:
             try:
@@ -1341,7 +1350,7 @@ def github_print_event(event, g, time_passed=False, ts: datetime | None = None):
                 commits = list(compare.commits)
                 commits_total = len(commits)
                 short_repo = getattr(repo, "full_name", repo_name)
-                compare_url = f"https://github.com/{short_repo}/compare/{before_sha[:12]}...{head_sha[:12]}"
+                compare_url = f"{github_web_base()}/{short_repo}/compare/{before_sha[:12]}...{head_sha[:12]}"
                 st += print_v(f"\nNumber of commits:\t\t{commits_total}")
                 st += print_v(f"Compare URL:\t\t\t{compare_url}")
 
@@ -1848,9 +1857,11 @@ def handle_profile_change(label, count_old, count_new, list_old, raw_list, user,
     if removed_items:
         print(f"Removed {label.lower()}:\n")
         removed_mbody = f"\nRemoved {label.lower()}:\n\n"
+        web_base = github_web_base()
         for item in removed_items:
-            item_url = (f"https://github.com/{item}/" if label.lower() in ["followers", "followings", "starred repos"]
-                        else f"https://github.com/{user}/{item}/")
+            item_url = (f"{web_base}/{item}/" if label.lower() in ["followers", "followings", "starred repos"]
+                        else f"{web_base}/{user}/{item}/")
+
             print(f"- {item} [ {item_url} ]")
             removed_list_str += f"- {item} [ {item_url} ]\n"
             try:
@@ -1863,9 +1874,10 @@ def handle_profile_change(label, count_old, count_new, list_old, raw_list, user,
     if added_items:
         print(f"Added {label.lower()}:\n")
         added_mbody = f"\nAdded {label.lower()}:\n\n"
+        web_base = github_web_base()
         for item in added_items:
-            item_url = (f"https://github.com/{item}/" if label.lower() in ["followers", "followings", "starred repos"]
-                        else f"https://github.com/{user}/{item}/")
+            item_url = (f"{web_base}/{item}/" if label.lower() in ["followers", "followings", "starred repos"]
+                        else f"{web_base}/{user}/{item}/")
             print(f"- {item} [ {item_url} ]")
             added_list_str += f"- {item} [ {item_url} ]\n"
             try:
@@ -1937,7 +1949,7 @@ def check_repo_list_changes(count_old, count_new, list_old, list_new, label, rep
             print(f"{removal_text} {label.lower()}:\n")
             removed_mbody = f"\n{removal_text} {label.lower()}:\n\n"
             for item in removed_items:
-                item_line = f"- {item} [ https://github.com/{item}/ ]" if label.lower() in ["stargazers", "watchers", "forks"] else f"- {item}"
+                item_line = f"- {item} [ {github_web_base()}/{item}/ ]" if label.lower() in ["stargazers", "watchers", "forks"] else f"- {item}"
                 print(item_line)
                 removed_list_str += item_line + "\n"
                 try:
@@ -1952,7 +1964,7 @@ def check_repo_list_changes(count_old, count_new, list_old, list_new, label, rep
             print(f"Added {label.lower()}:\n")
             added_mbody = f"\nAdded {label.lower()}:\n\n"
             for item in added_items:
-                item_line = f"- {item} [ https://github.com/{item}/ ]" if label.lower() in ["stargazers", "watchers", "forks"] else f"- {item}"
+                item_line = f"- {item} [ {github_web_base()}/{item}/ ]" if label.lower() in ["stargazers", "watchers", "forks"] else f"- {item}"
                 print(item_line)
                 added_list_str += item_line + "\n"
                 try:

{github_monitor-2.2 → github_monitor-2.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "github_monitor"
-version = "2.2"
+version = "2.2.1"
 description = "Tool implementing real-time tracking of Github users activities including profile and repositories changes"
 readme = "README.md"
 license = "GPL-3.0-or-later"