version download check if there are defined user

for unknown user
comment out some print

Author: Maximilian Karl

docs/changes.rst

@@ -103,4 +103,10 @@ Version 1.1.12 (July 29, 2021)
 Version 1.1.13 (July 29, 2021)
 -----------------------------------
 
-* solved error: ignore Alias if already there in Utility(define_unknown_user)
+* solved error: ignore Alias if already there in Utility(define_unknown_user)
+
+Version 1.1.14 (July 29, 2021)
+-----------------------------------
+* version download will check if there are defined user for unknown user
+* comment out some print
+* verion checks now if there are updates before downloading

github2pandas/__init__.py

@@ -1 +1 @@
-__version__ = '1.1.13'
+__version__ = '1.1.14'

github2pandas/utility.py

@@ -446,18 +446,21 @@ def extract_user_data(user, users_ids, data_root_dir):
         try:
             user_data["name"] = user.name
         except:
-            print("No User name in:")
-            print(data_root_dir)
+            # print("No User name in:")
+            # print(data_root_dir)
+            pass
         try:
             user_data["email"] = user.email
         except:
-            print("No User email in:")
-            print(data_root_dir)
+            #print("No User email in:")
+            #print(data_root_dir)
+            pass
         try:
             user_data["login"] = user.login
         except:
-            print("No User login in:")
-            print(data_root_dir)
+            # print("No User login in:")
+            # print(data_root_dir)
+            pass
         if "login" in user_data:
             if user_data["login"] == "invalid-email-address" and not "name" in user_data:
                 return None

github2pandas/version.py

@@ -265,8 +265,22 @@ def generate_version_pandas_tables(repo, data_root_dir, check_for_updates=True):
                     pd_commits.loc[pd_commits.commit_sha == row.commit_sha, 'author'] = author_id   
                     pd_commits.loc[pd_commits.commit_sha == row.commit_sha, 'committer'] = committer_id 
                     if (author_id is None) and (committer_id is None):
-                        pd_commits.loc[pd_commits.commit_sha == row.commit_sha, 'unknown_user'] = row.committer_name
-
+                        users = Utility.get_users(data_root_dir)
+                        found = False
+                        if "alias" in users:
+                            for index2, row2 in users.iterrows():
+                                if not pd.isnull(row2["alias"]) and row2["alias"] is not None:
+                                    all_alias = row2["alias"].split(';')
+                                    for alias in all_alias:
+                                        if commiter_name == alias:
+                                            pd_commits.loc[pd_commits.commit_sha == row.commit_sha, 'author'] = row2["anonym_uuid"] 
+                                            pd_commits.loc[pd_commits.commit_sha == row.commit_sha, 'committer'] = row2["anonym_uuid"]
+                                            found = True
+                                            break
+                                if found:
+                                    break
+                        if not found:
+                            pd_commits.loc[pd_commits.commit_sha == row.commit_sha, 'unknown_user'] = row.committer_name
             else:
                 commit_sha = pd_commits[pd_commits.committer_name == commiter_name].iloc[0].commit_sha 
                 author_id = Utility.extract_author_data_from_commit(repo, commit_sha, 
@@ -276,7 +290,22 @@ def generate_version_pandas_tables(repo, data_root_dir, check_for_updates=True):
                 pd_commits.loc[pd_commits.committer_name == commiter_name, 'author'] = author_id   
                 pd_commits.loc[pd_commits.committer_name == commiter_name, 'committer'] = committer_id 
                 if (author_id is None) and (committer_id is None):
-                    pd_commits.loc[pd_commits.committer_name == commiter_name, 'unknown_user'] = commiter_name 
+                    users = Utility.get_users(data_root_dir)
+                    found = False
+                    if "alias" in users:
+                        for index, row in users.iterrows():
+                            if not pd.isnull(row["alias"]) and row["alias"] is not None:
+                                all_alias = row["alias"].split(';')
+                                for alias in all_alias:
+                                    if commiter_name == alias:
+                                        pd_commits.loc[pd_commits.committer_name == commiter_name, 'author'] = row["anonym_uuid"] 
+                                        pd_commits.loc[pd_commits.committer_name == commiter_name, 'committer'] = row["anonym_uuid"]
+                                        found = True
+                                        break
+                            if found:
+                                break
+                    if not found:
+                        pd_commits.loc[pd_commits.committer_name == commiter_name, 'unknown_user'] = commiter_name 
         pd_commits.drop(['committer_name'], axis=1, inplace=True)  
 
         users = Utility.get_users(data_root_dir)