gitlabber 1.2.0__tar.gz → 1.2.1__tar.gz

{gitlabber-1.2.0/gitlabber.egg-info → gitlabber-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlabber
-Version: 1.2.0
+Version: 1.2.1
 Summary: A Gitlab clone/pull utility for backing up or cloning Gitlab groups
 Home-page: https://github.com/ezbz/gitlabber
 Download-URL: https://github.com/ezbz/gitlabber/archive/master.zip

gitlabber-1.2.1/gitlabber/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.2.1'

{gitlabber-1.2.0 → gitlabber-1.2.1}/gitlabber/git.py

@@ -12,33 +12,33 @@ progress = ProgressBar('* syncing projects')
 
 
 class GitAction:
-    def __init__(self, node, path, recursive=False, use_fetch=False, inline_token=False):
+    def __init__(self, node, path, recursive=False, use_fetch=False, hide_token=False):
         self.node = node
         self.path = path
         self.recursive = recursive
         self.use_fetch = use_fetch
-        self.inline_token = inline_token
+        self.hide_token = hide_token
 
-def sync_tree(root, dest, concurrency=1, disable_progress=False, recursive=False, use_fetch=False, inline_token=False):
+def sync_tree(root, dest, concurrency=1, disable_progress=False, recursive=False, use_fetch=False, hide_token=False):
     if not disable_progress:
         progress.init_progress(len(root.leaves))
-    actions = get_git_actions(root, dest, recursive, use_fetch, inline_token)
+    actions = get_git_actions(root, dest, recursive, use_fetch, hide_token)
     with concurrent.futures.ThreadPoolExecutor(max_workers=concurrency) as executor:
         executor.map(clone_or_pull_project, actions)
     elapsed = progress.finish_progress()
     log.debug("Syncing projects took [%s]", elapsed)
 
 
-def get_git_actions(root, dest, recursive, use_fetch, inline_token):
+def get_git_actions(root, dest, recursive, use_fetch, hide_token):
     actions = []
     for child in root.children:
         path = "%s%s" % (dest, child.root_path)
         if not os.path.exists(path):
             os.makedirs(path)
         if child.is_leaf:
-            actions.append(GitAction(child, path, recursive, use_fetch, inline_token))            
+            actions.append(GitAction(child, path, recursive, use_fetch, hide_token))            
         if not child.is_leaf:
-            actions.extend(get_git_actions(child, dest, recursive, use_fetch, inline_token))
+            actions.extend(get_git_actions(child, dest, recursive, use_fetch, hide_token))
     return actions
 
 
@@ -80,7 +80,7 @@ def clone_or_pull_project(action):
         if(action.recursive):
             multi_options.append('--recursive')
         if(action.use_fetch):
-            multi_options.append('--mirror')        
+            multi_options.append('--mirror')
         try:
             git.Repo.clone_from(action.node.url, action.path, multi_options=multi_options)
                 

{gitlabber-1.2.0 → gitlabber-1.2.1}/gitlabber/gitlab_tree.py

@@ -125,12 +125,20 @@ class GitlabTree:
         subgroups = group.subgroups.list(as_list=False, archived=self.archived)
         self.progress.update_progress_length(len(subgroups))
         for subgroup_def in subgroups:
-            subgroup = self.gitlab.groups.get(subgroup_def.id)
-            subgroup_id = subgroup.name if self.naming == FolderNaming.NAME else subgroup.path
-            node = self.make_node(subgroup_id, parent, url=subgroup.web_url)
-            self.progress.show_progress(node.name, 'group')
-            self.get_subgroups(subgroup, node)
-            self.get_projects(subgroup, node)
+            try:
+                subgroup = self.gitlab.groups.get(subgroup_def.id)
+                subgroup_id = subgroup.name if self.naming == FolderNaming.NAME else subgroup.path
+                node = self.make_node(subgroup_id, parent, url=subgroup.web_url)
+                self.progress.show_progress(node.name, 'group')
+                self.get_subgroups(subgroup, node)
+                self.get_projects(subgroup, node)
+            except GitlabListError as error:
+                if error.response_code == 404:
+                    log.error(f"{error.response_code} error while listing subgroup with name: {group.name} [id: {group.id}]. Check your permissions as you may not have access to it. Message: {error.error_message}")
+                    continue
+                else:
+                    raise error
+
 
 
     def load_gitlab_tree(self):

{gitlabber-1.2.0 → gitlabber-1.2.1/gitlabber.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlabber
-Version: 1.2.0
+Version: 1.2.1
 Summary: A Gitlab clone/pull utility for backing up or cloning Gitlab groups
 Home-page: https://github.com/ezbz/gitlabber
 Download-URL: https://github.com/ezbz/gitlabber/archive/master.zip

gitlabber-1.2.0/gitlabber/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.2.0'