github-backup 0.65.0__py3-none-any.whl → 0.66.0__py3-none-any.whl

github_backup/__init__.py

@@ -1 +1 @@
-__version__ = "0.65.0"
+__version__ = "0.66.0"

github_backup/github_backup.py

@@ -1838,6 +1838,11 @@ def retrieve_repositories(args, authenticated_user):
     if args.user == authenticated_user["login"]:
         # we must use the /user/repos API to be able to access private repos
         template = "https://{0}/user/repos".format(get_github_api_host(args))
+    elif args.as_app and not args.organization:
+        # /users/{user}/repos is public-only; the installation sees private repos too
+        template = "https://{0}/installation/repositories".format(
+            get_github_api_host(args)
+        )
     else:
         if args.private and not args.organization:
             logger.warning(
@@ -1868,6 +1873,10 @@ def retrieve_repositories(args, authenticated_user):
             logger.warning(f"Legal notice: {e.legal_url}")
         return []
 
+    if template.endswith("/installation/repositories"):
+        # Each page is {"total_count": ..., "repositories": [...]}
+        repos = [repo for page in repos for repo in page["repositories"]]
+
     return retrieve_additional_repositories(args, authenticated_user, repos)
 
 
@@ -2757,19 +2766,24 @@ def backup_issues(args, repo_cwd, repository, repos_template):
         stale_timelines = find_stale_timeline_issues(
             args, issue_cwd, repository, include_pulls=not should_include_pulls
         )
-        for number in sorted(stale_timelines - set(issues)):
-            try:
-                issues[number] = retrieve_data(
-                    args, "{0}/{1}".format(_issue_template, number), paginated=False
-                )[0]
-            except (HTTPError, RepositoryUnavailableError, IndexError) as e:
-                # Deleted or transferred between the sweep and this fetch. The
-                # refresh is opportunistic, so skip rather than fail the run.
-                logger.warning(
-                    "Unable to refresh cross-references for issue {0}: {1}".format(
-                        number, e
-                    )
-                )
+
+    # Issues selected only by the cross-reference sweep have not otherwise
+    # changed. Reuse their complete stored payload and refresh only timeline_data.
+    # Fetching the issue, comments, events and attachments again turns the first
+    # --issue-timeline run into a near-full backup and can discard optional data
+    # when the corresponding flags are absent.
+    timeline_only_issues = stale_timelines - set(issues)
+    for number in sorted(timeline_only_issues):
+        existing = read_json_file_if_exists(
+            "{0}/{1}.json".format(issue_cwd, number)
+        )
+        if existing is None:
+            logger.warning(
+                "Unable to refresh cross-references for issue {0}: "
+                "stored issue data is unreadable".format(number)
+            )
+            continue
+        issues[number] = existing
 
     if issues_skipped:
         issues_skipped_message = " (skipped {0} pull requests)".format(issues_skipped)
@@ -2784,6 +2798,7 @@ def backup_issues(args, repo_cwd, repository, repos_template):
     timeline_template = _issue_template + "/{0}/timeline"
     for number, issue in list(issues.items()):
         issue_file = "{0}/{1}.json".format(issue_cwd, number)
+        timeline_only_refresh = number in timeline_only_issues
         if (
             args.incremental_by_files
             and os.path.isfile(issue_file)
@@ -2799,10 +2814,14 @@ def backup_issues(args, repo_cwd, repository, repos_template):
                 )
                 continue
 
-        if args.include_issue_comments or args.include_everything:
+        if not timeline_only_refresh and (
+            args.include_issue_comments or args.include_everything
+        ):
             template = comments_template.format(number)
             issues[number]["comment_data"] = retrieve_data(args, template)
-        if args.include_issue_events or args.include_everything:
+        if not timeline_only_refresh and (
+            args.include_issue_events or args.include_everything
+        ):
             template = events_template.format(number)
             issues[number]["event_data"] = retrieve_data(args, template)
         if include_timeline:
@@ -2815,7 +2834,7 @@ def backup_issues(args, repo_cwd, repository, repos_template):
                 for item in retrieve_data(args, template)
                 if item.get("event") != "commented"
             ]
-        if args.include_attachments:
+        if args.include_attachments and not timeline_only_refresh:
             download_attachments(
                 args, issue_cwd, issues[number], number, repository, item_type="issue"
             )

{github_backup-0.65.0.dist-info → github_backup-0.66.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github-backup
-Version: 0.65.0
+Version: 0.66.0
 Summary: backup a github user or organization
 Home-page: http://github.com/josegonzalez/python-github-backup
 Author: Jose Diaz-Gonzalez
@@ -229,6 +229,8 @@ GitHub Apps
 
 GitHub Apps are ideal for organization backups in CI/CD. Tokens are scoped to specific repositories and expire after 1 hour.
 
+For a user account (no ``--organization``), ``--as-app`` lists the repositories the installation can access, so private repositories are included.
+
 **One-time setup:**
 
 1. Create a GitHub App at *Settings -> Developer Settings -> GitHub Apps -> New GitHub App*

github_backup-0.66.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+github_backup/__init__.py,sha256=rdBd9Kj9DDCtQNzVZEbaE1YatB7HZXL9qX4Ge-gXzaM,23
+github_backup/__main__.py,sha256=3yorCiC63maaxbjdtaeAs-G-yAAxKSO3mprhGfa1Fho,271
+github_backup/cli.py,sha256=JTiXPOvB8id8LopREOEd1W_FLvuf9SOZU5buMRPFd9U,2922
+github_backup/github_backup.py,sha256=zvWTp4_02ep-O7lE0fNuIBdMpN7wHKanboC4hydLXhA,127118
+github_backup/graphql_queries.py,sha256=XcAQyp9nF7Ip9UzxsrXMkl2pO-W7SK8hhO2oE9HVcmA,6658
+github_backup-0.66.0.dist-info/licenses/LICENSE.txt,sha256=ML-pLyn1qtAKo_DHMcQ8-p7k3f8cp-IR-mf5B49R2rk,1085
+github_backup-0.66.0.dist-info/METADATA,sha256=x9vCzseh_H9lmtHA3Wb1O0iS1rlvAfrONsLMuco26eM,36196
+github_backup-0.66.0.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+github_backup-0.66.0.dist-info/entry_points.txt,sha256=cLPKK7MqC77QVb6HnT2mnyL_f-ciavJG_Y9vVHlCF68,57
+github_backup-0.66.0.dist-info/top_level.txt,sha256=Za6fKRAlxZ0b3ZBH_osPqklLe14LetdNAkvAQANT2AA,14
+github_backup-0.66.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+github_backup-0.66.0.dist-info/RECORD,,

{github_backup-0.65.0.dist-info → github_backup-0.66.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (83.0.0)
+Generator: setuptools (84.2.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

github_backup-0.65.0.dist-info/RECORD

@@ -1,12 +0,0 @@
-github_backup/__init__.py,sha256=eauVKKmGRrPjcW6OLz78zXL8jRoYaQPOL0tbet7E8Vo,23
-github_backup/__main__.py,sha256=3yorCiC63maaxbjdtaeAs-G-yAAxKSO3mprhGfa1Fho,271
-github_backup/cli.py,sha256=JTiXPOvB8id8LopREOEd1W_FLvuf9SOZU5buMRPFd9U,2922
-github_backup/github_backup.py,sha256=jDGgAnhT_vn7QUmEJ95hwe8jfuVc3dETyLblGSQTZ0k,126285
-github_backup/graphql_queries.py,sha256=XcAQyp9nF7Ip9UzxsrXMkl2pO-W7SK8hhO2oE9HVcmA,6658
-github_backup-0.65.0.dist-info/licenses/LICENSE.txt,sha256=ML-pLyn1qtAKo_DHMcQ8-p7k3f8cp-IR-mf5B49R2rk,1085
-github_backup-0.65.0.dist-info/METADATA,sha256=lWXqgFoH_QhZEHy0fsp8cs_Iu8McBJZ4bUDrOL2VDp8,36048
-github_backup-0.65.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-github_backup-0.65.0.dist-info/entry_points.txt,sha256=cLPKK7MqC77QVb6HnT2mnyL_f-ciavJG_Y9vVHlCF68,57
-github_backup-0.65.0.dist-info/top_level.txt,sha256=Za6fKRAlxZ0b3ZBH_osPqklLe14LetdNAkvAQANT2AA,14
-github_backup-0.65.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-github_backup-0.65.0.dist-info/RECORD,,