Skip to content

Commit 4a071c3

Browse files
author
Maximilian Karl
committed
version download check if there are defined user
for unknown user comment out some print
1 parent 3d729c9 commit 4a071c3

File tree

4 files changed

+49
-11
lines changed

4 files changed

+49
-11
lines changed

docs/changes.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,10 @@ Version 1.1.12 (July 29, 2021)
103103
Version 1.1.13 (July 29, 2021)
104104
-----------------------------------
105105

106-
* solved error: ignore Alias if already there in Utility(define_unknown_user)
106+
* solved error: ignore Alias if already there in Utility(define_unknown_user)
107+
108+
Version 1.1.14 (July 29, 2021)
109+
-----------------------------------
110+
* version download will check if there are defined user for unknown user
111+
* comment out some print
112+
* verion checks now if there are updates before downloading

github2pandas/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.1.13'
1+
__version__ = '1.1.14'

github2pandas/utility.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -446,18 +446,21 @@ def extract_user_data(user, users_ids, data_root_dir):
446446
try:
447447
user_data["name"] = user.name
448448
except:
449-
print("No User name in:")
450-
print(data_root_dir)
449+
# print("No User name in:")
450+
# print(data_root_dir)
451+
pass
451452
try:
452453
user_data["email"] = user.email
453454
except:
454-
print("No User email in:")
455-
print(data_root_dir)
455+
#print("No User email in:")
456+
#print(data_root_dir)
457+
pass
456458
try:
457459
user_data["login"] = user.login
458460
except:
459-
print("No User login in:")
460-
print(data_root_dir)
461+
# print("No User login in:")
462+
# print(data_root_dir)
463+
pass
461464
if "login" in user_data:
462465
if user_data["login"] == "invalid-email-address" and not "name" in user_data:
463466
return None

github2pandas/version.py

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,22 @@ def generate_version_pandas_tables(repo, data_root_dir, check_for_updates=True):
265265
pd_commits.loc[pd_commits.commit_sha == row.commit_sha, 'author'] = author_id
266266
pd_commits.loc[pd_commits.commit_sha == row.commit_sha, 'committer'] = committer_id
267267
if (author_id is None) and (committer_id is None):
268-
pd_commits.loc[pd_commits.commit_sha == row.commit_sha, 'unknown_user'] = row.committer_name
269-
268+
users = Utility.get_users(data_root_dir)
269+
found = False
270+
if "alias" in users:
271+
for index2, row2 in users.iterrows():
272+
if not pd.isnull(row2["alias"]) and row2["alias"] is not None:
273+
all_alias = row2["alias"].split(';')
274+
for alias in all_alias:
275+
if commiter_name == alias:
276+
pd_commits.loc[pd_commits.commit_sha == row.commit_sha, 'author'] = row2["anonym_uuid"]
277+
pd_commits.loc[pd_commits.commit_sha == row.commit_sha, 'committer'] = row2["anonym_uuid"]
278+
found = True
279+
break
280+
if found:
281+
break
282+
if not found:
283+
pd_commits.loc[pd_commits.commit_sha == row.commit_sha, 'unknown_user'] = row.committer_name
270284
else:
271285
commit_sha = pd_commits[pd_commits.committer_name == commiter_name].iloc[0].commit_sha
272286
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):
276290
pd_commits.loc[pd_commits.committer_name == commiter_name, 'author'] = author_id
277291
pd_commits.loc[pd_commits.committer_name == commiter_name, 'committer'] = committer_id
278292
if (author_id is None) and (committer_id is None):
279-
pd_commits.loc[pd_commits.committer_name == commiter_name, 'unknown_user'] = commiter_name
293+
users = Utility.get_users(data_root_dir)
294+
found = False
295+
if "alias" in users:
296+
for index, row in users.iterrows():
297+
if not pd.isnull(row["alias"]) and row["alias"] is not None:
298+
all_alias = row["alias"].split(';')
299+
for alias in all_alias:
300+
if commiter_name == alias:
301+
pd_commits.loc[pd_commits.committer_name == commiter_name, 'author'] = row["anonym_uuid"]
302+
pd_commits.loc[pd_commits.committer_name == commiter_name, 'committer'] = row["anonym_uuid"]
303+
found = True
304+
break
305+
if found:
306+
break
307+
if not found:
308+
pd_commits.loc[pd_commits.committer_name == commiter_name, 'unknown_user'] = commiter_name
280309
pd_commits.drop(['committer_name'], axis=1, inplace=True)
281310

282311
users = Utility.get_users(data_root_dir)

0 commit comments

Comments
 (0)