.gitignore

@@ -63,7 +63,7 @@ __pycache__/
 .Python
 env/
 develop-eggs/
-# dist/
+dist/
 downloads/
 eggs/
 lib/

.python-version

@@ -0,0 +1 @@
+3.9.1

README.md

@@ -2,12 +2,6 @@
 
 Use python version > 3.8
 
-## Build
-
-```bash
-pyinstaller -F github_mirror.py
-```
-
 
 ## Argumetns:
 
@@ -31,7 +25,7 @@ pyinstaller -F github_mirror.py
 - ```Please provide github token to get access to private repositories``` [github tokens](https://github.com/settings/tokens)
 
 
-- -l GITURL, --giturl GITURL ```Provide git url. Default link``` https://git.mywistr.ru
+- -l GITURL, --giturl GITURL ```Provide git url. Default link``` https://git.mywistr.com
 
 
 ## Usage 

core/argument_parser.py

@@ -1,6 +1,6 @@
 from argparse import ArgumentParser
 
-GIT_URL = 'https://git.mywistr.ru'
+GIT_URL = 'https://git.mywistr.com'
 
 USAGE = '''github_mirror [-h] [-g GROUP] (-u URLS [URLS ...] | -f FILE) -t TOKEN [-T GitHubTOKEN]
 --------------------------------------------------

core/repo_creator.py

@@ -1,6 +1,5 @@
 import random
 from typing import Union
-from http import HTTPStatus
 
 import requests
 from requests import Response
@@ -10,22 +9,13 @@ from core.utils import logger
 
 class RepositoryCreator:
 
-    def __init__(self, git_url: str, headers: dict) -> None:
+    def __init__(self, gitlab_url: str, headers: dict):
-        self.git_url = git_url
+        self.gitlab_url = gitlab_url
         self.headers = headers
+        self.HTTP_201_CREATED = 201
+        self.HTTP_200_OK = 200
 
-    def create_repository_mirror(self, github_url: str, group_id: str, auth_token: str) -> None:
+    def __gitlab_request(self, method: str, url: str, data: dict = None) -> Union[Response, None]:
-        """
-        Base action for one thread. Creates repository, add mirror url and triggers pull at te end
-
-        :param github_url: GitGub url which will be mirrored
-        :param group_id: Gitlab group id which contains created repository
-        :param auth_token: GitGub token to access private repositories
-        """
-
-        self.__create_new_project(github_url, group_id, auth_token)
-
-    def __git_request(self, method: str, url: str, data: dict = None) -> Union[Response, None]:
         """
         Create request to gitlab
 
@@ -61,16 +51,28 @@ class RepositoryCreator:
         if auth_token:
             git_data['auth_token'] = auth_token
 
-        request = self.__git_request('POST', f'{self.git_url}/api/v1/repos/migrate', git_data)
+        request = self.__gitlab_request('POST', f'{self.gitlab_url}/api/v1/repos/migrate', git_data)
         try:
-            if request.status_code == HTTPStatus.CREATED:
+            if request.status_code == self.HTTP_201_CREATED:
-                response = request.json()
+                repo_data = request.json()
-                name_with_namespace = response.get('full_name', None)
+                name_with_namespace = repo_data.get('full_name', None)
                 if name_with_namespace:
                     logger.info(f'Repository {name_with_namespace} has been created')
                 else:
-                    logger.info(f'Repository {response["name"]} has been created')
+                    logger.info(f'Repository {repo_data["name"]} has been created')
+                return repo_data['id']
             else:
                 logger.error(f'Cant create {name} project. Status code: {request.status_code}. Reason: {request.text}')
         except AttributeError:
             pass
+
+    def create_repository_mirror(self, github_url: str, group_id: str, auth_token: str):
+        """
+        Base action for one thread. Creates repository, add mirror url and triggers pull at te end
+
+        :param github_url: GitGub url which will be mirrored
+        :param group_id: Gitlab group id which contains created repository
+        :param auth_token: GitGub token to access private repositories
+        """
+
+        self.__create_new_project(github_url, group_id, auth_token)

core/utils.py

@@ -27,7 +27,7 @@ else:
     logger.addHandler(console_handler)
 
 
-def threads_ready_statistic(threads: List[Thread]) -> None:
+def threads_ready_statistic(threads: List[Thread]):
     """
     Getting information how many threads are running right now
 

github_mirror.py

@@ -6,7 +6,7 @@ from core.repo_creator import RepositoryCreator
 from core.utils import logger, threads_ready_statistic
 
 
-def main() -> None:
+def main():
 
     parser = create_parser()
     args = parser.parse_args(sys.argv[1:])
@@ -24,10 +24,10 @@ def main() -> None:
     # parse gitlab group of repositories if it exists
     group_id = args.group if args.group else None
 
-    git_url = args.giturl  # if not provided used default value https://git.mywistr.ru
+    git_url = args.giturl  # if not provided used default value https://git.mywistr.com
     headers = {'Authorization': f'token {args.token}'}  # git user token must be provided
 
-    repository_creator = RepositoryCreator(git_url=git_url, headers=headers)
+    repository_creator = RepositoryCreator(gitlab_url=git_url, headers=headers)
 
     github_token = args.githubtoken if args.githubtoken else None  # used for access to personal GitHub repositories
 

requirements.txt

@@ -1,2 +1 @@
-requests
+requests
-pyinstaller