Merge pull request #38 from OSLL/31_branch_param

added -b mode - for branch specification

Author: zmm

README.md

@@ -12,7 +12,7 @@ pip install -r requirements.txt
 ## Запуск приложения:
 1. Логирование commits
 ```commandline
-python3 main.py [-t, --token] token (github токен вместо token) [-l, --list]  list (list - строка пути к txt файлу со списком репозиториев) [-o, --out] out (out - название csv файла, в который будут помещены все логи)
+python3 main.py [-t, --token] token (github токен вместо token) [-l, --list]  list (list - строка пути к txt файлу со списком репозиториев) [-o, --out] out (out - название csv файла, в который будут помещены все логи) [-b, --branch] branch (branch - название конкретной ветки, откуда брать коммиты или all - логгировать все коммиты изо всех веток)
 ```
 2. Логирование issues
 ```commandline

git_logger.py

@@ -58,8 +58,8 @@ def get_assignee_story(github_object):
 
 
 def log_commit_to_csv(info, csv_name):
-    fieldnames = ['repository name', 'commit id', 'author name', 'author login', 'author email', 'date and time',
-                  'changed files']
+    fieldnames = ['repository name', 'author name', 'author login', 'author email', 'date and time',
+                  'changed files', 'commit id', 'branch' ]
     with open(csv_name, 'a', newline='') as file:
         writer = csv.DictWriter(file, fieldnames=fieldnames)
         writer.writerow(info)
@@ -69,30 +69,44 @@ def log_commit_to_stdout(info):
     print(info)
 
 
-def log_repository_commits(repository: Repository, csv_name, start, finish):
-    for commit in repository.get_commits():
-        if commit.commit.author.date.astimezone(
-                pytz.timezone(timezone)) < start or commit.commit.author.date.astimezone(
-                pytz.timezone(timezone)) > finish:
-            continue
-        if commit.commit is not None:
-            info = {'repository name': repository.full_name,
-                    'author name': commit.commit.author.name,
-                    'author login': EMPTY_FIELD,
-                    'author email': EMPTY_FIELD,
-                    'date and time': commit.commit.author.date,
-                    'changed files': '; '.join([file.filename for file in commit.files]),
-                    'commit id': commit.commit.sha}
-
-            if commit.author is not None:
-                info['author login'] = commit.author.login
-
-            if commit.commit.author is not None:
-                info['author email'] = commit.commit.author.email
-
-            log_commit_to_csv(info, csv_name)
-            log_commit_to_stdout(info)
-            sleep(timedelta)
+def log_repository_commits(repository: Repository, csv_name, start, finish, branch):
+
+
+    branches = []
+    if branch == 'all':
+        for branch in repository.get_branches():
+            branches.append(branch.name)
+    else:
+        branches.append(branch)
+    
+    #print(branches)
+
+    for branch in branches:
+        print(f'Processing branch {branch}')
+        for commit in repository.get_commits():
+            if commit.commit.author.date.astimezone(
+                    pytz.timezone(timezone)) < start or commit.commit.author.date.astimezone(
+                    pytz.timezone(timezone)) > finish:
+                continue
+            if commit.commit is not None:
+                info = {'repository name': repository.full_name,
+                        'author name': commit.commit.author.name,
+                        'author login': EMPTY_FIELD,
+                        'author email': EMPTY_FIELD,
+                        'date and time': commit.commit.author.date,
+                        'changed files': '; '.join([file.filename for file in commit.files]),
+                        'commit id': commit.commit.sha,
+                        'branch': branch}
+
+                if commit.author is not None:
+                    info['author login'] = commit.author.login
+
+                if commit.commit.author is not None:
+                    info['author email'] = commit.commit.author.email
+
+                log_commit_to_csv(info, csv_name)
+                log_commit_to_stdout(info)
+                sleep(timedelta)
 
 
 def log_issue_to_csv(info, csv_name):
@@ -444,25 +458,26 @@ def log_invitations(client: Github, repositories, csv_name):
                 except Exception as e:
                     print(e)
 
-def log_commits(client: Github, repositories, csv_name, start, finish):
+def log_commits(client: Github, repositories, csv_name, start, finish, branch):
     with open(csv_name, 'w', newline='') as file:
         writer = csv.writer(file)
         writer.writerow(
             (
                 'repository name',
-                'commit id',
                 'author name',
                 'author login',
                 'author email',
                 'date and time',
-                'changed files'
+                'changed files',
+                'commit id',
+                'branch'
             )
         )
 
     for repo in get_next_repo(client, repositories):
 
         try:
-            log_repository_commits(repo, csv_name, start, finish)
+            log_repository_commits(repo, csv_name, start, finish, branch)
             sleep(timedelta)
         except Exception as e:
             print(e)

main.py

@@ -16,6 +16,7 @@ def parse_args():
     parser.add_argument('-o', '--out', type=str, required=True, help='output filename')
     parser.add_argument('-s', '--start', type=str, required=False, help='start time', default='2000/01/01-00:00:00')
     parser.add_argument('-f', '--finish', type=str, required=False, help='finish time', default='2400/01/01-00:00:00')
+    parser.add_argument('-b', '--branch', type=str, required=False, help='branch to select commits, default "main", use "all" to get all commits from all branches', default='main')
     parser.add_argument('--google_token', type=str, required=False, help='Specify path to google token file')
     parser.add_argument('--table_id', type=str, required=False,
                         help='Specify Google sheet document id (can find in url)')
@@ -59,7 +60,7 @@ def main():
         if args.finish:
             finish = parse_time(args.finish.split('-'))
         if not args.p and not args.i and not args.invites:
-            git_logger.log_commits(client, repositories, csv_name, start, finish)
+            git_logger.log_commits(client, repositories, csv_name, start, finish, args.branch)
             if (args.e):
                 export_sheets.write_data_to_table(csv_name, args.google_token, args.table_id, args.sheet_id)
         if args.p: