dodana opcja: grupy, statusu i ostatniej aktywności

main.py

@@ -7,69 +7,58 @@ from json2html import *
 # pobieranie listy projektów
 
 # testowe
-# headers = {'PRIVATE-TOKEN': 'glpat-hQFB1vBzz9rQzq8wuhcG'}
-# gl = gitlab.Gitlab(url='https://k8s-gitlab.software.geant.org', private_token='glpat-hQFB1vBzz9rQzq8wuhcG')
-# gl_user = 'https://k8s-gitlab.software.geant.org/api/v4/users'
-# gl_proj = 'https://k8s-gitlab.software.geant.org/api/v4/projects'
-# gl_license = 'repository/files/LICENSE?ref='
-# gl_branch = 'repository/branches'
-
-
-# produkcyjne
-headers = {'PRIVATE-TOKEN': 'glpat-P6orz6-t2f3n1BoVDrnr'}
-gl = gitlab.Gitlab(url='https://gitlab.geant.org', private_token='glpat-P6orz6-t2f3n1BoVDrnr')
-gl_user = 'https://gitlab.geant.org/api/v4/users'
-gl_proj = 'https://gitlab.geant.org/api/v4/projects'
+headers = {'PRIVATE-TOKEN': 'glpat-hQFB1vBzz9rQzq8wuhcG'}
+gl = gitlab.Gitlab(url='https://k8s-gitlab.software.geant.org', private_token='glpat-hQFB1vBzz9rQzq8wuhcG')
+gl_user = 'https://k8s-gitlab.software.geant.org/api/v4/users'
+gl_proj = 'https://k8s-gitlab.software.geant.org/api/v4/projects'
 gl_license = 'repository/files/LICENSE?ref='
 gl_branch = 'repository/branches'
+projects = gl.projects.list()
+# (all=True)
 
 
-def check_license_file(id_proj) -> str:
-    """main / master - domyslna nazwa repozytorium sprawdzenie obydwu
-    zwraca informacje o pliku licencji"""
-    branch = 'master'
-    b_link = gl_proj + '/' + str(id_proj) + '/' + gl_branch + '/' + branch
-    # print(b_link)
-    b_response = requests.get(b_link, headers=headers)
-    b_data = b_response.text
-    b_answer = json.loads(b_data)
-    # print(b_answer)
-    if 'name' in b_answer:
-        branch = 'master'
-    if 'message' in b_answer:
-        branch = 'main'
-    print('branch: ', branch)
-    c_link = gl_proj + '/' + str(id_proj) + '/' + gl_license + branch
-    c_response = requests.get(c_link, headers=headers)
-    c_data = c_response.text
-    c_answer = json.loads(c_data)
-    # print(c_answer)
-    if "message" in c_answer:
-        print(c_answer['message'])
-        lic = c_answer['message']
-    if "file_name" in c_answer:
-        print(c_answer['file_name'])
-        lic = c_answer['file_name']
-    return lic
-
-
-projects = gl.projects.list(all=True)
-# (all=True)
-# users = gl.users.list(all=True)
+# # produkcyjne
+# headers = {'PRIVATE-TOKEN': 'glpat-P6orz6-t2f3n1BoVDrnr'}
+# gl = gitlab.Gitlab(url='https://gitlab.geant.org', private_token='glpat-P6orz6-t2f3n1BoVDrnr')
+# gl_user = 'https://gitlab.geant.org/api/v4/users'
+# gl_proj = 'https://gitlab.geant.org/api/v4/projects'
+# gl_license = 'repository/files/LICENSE?ref='
+# gl_branch = 'repository/branches'
+# projects = gl.projects.list(all=True)
 # (all=True)
 
 j_project = {}
 j_project['projects'] = {}
 for project in projects:
     # print('Project ID: ', project.attributes['id'])
-    # print('Project Name: ', project.attributes['name'])
+    # print('Project Name: ', project.attributes['name_with_namespace'])
+    # print('branch', project.attributes['default_branch'])
+    # print('status', project.attributes['visibility'])
+    # print('aktywny', project.attributes['last_activity_at'])
+    # print('grupa', project.attributes['namespace']['name'])
+    branch = project.attributes['default_branch']
     x = project.attributes['id']
-    # print(check_license_file(x))
-    licen = check_license_file(x)
+    c_link = gl_proj + '/' + str(x) + '/' + gl_license + branch
+    c_response = requests.get(c_link, headers=headers)
+    c_data = c_response.text
+    c_answer = json.loads(c_data)
+    if "message" in c_answer:
+        print("License file: ", c_answer['message'])
+        lic = c_answer['message']
+    if "file_name" in c_answer:
+        print("License file: ", c_answer['file_name'])
+        lic = c_answer['file_name']
+    sep = 'T'
+    full_act = project.attributes['last_activity_at']
+    last_act = full_act.split(sep, 1)[0]
+    # print("ostatnia aktywnosc: ", last_act)
     tmp = {
         'project_id': project.attributes['id'],
-        'project_name': project.attributes['name'],
-        'project_license': licen
+        'project_name': project.attributes['name_with_namespace'],
+        'project_group': project.attributes['namespace']['name'],
+        'project_status': project.attributes['visibility'],
+        'project_license': lic,
+        'project_last_activity': last_act
     }
     j_project['projects'][x] = {}
     j_project['projects'][x] = tmp
@@ -104,7 +93,7 @@ for project in projects:
     print(8*"-")
 new_jproject = json.dumps(j_project, indent=4, ensure_ascii=False)
 
-print(new_jproject)
+# print(new_jproject)
 
 with open("gitlab-projects.json", "w", encoding='utf8') as outfile:
     outfile.write(new_jproject)
@@ -112,4 +101,4 @@ with open("gitlab-projects.json", "w", encoding='utf8') as outfile:
 new_jproject_html = json2html.convert(json=new_jproject)
 
 with open("gitlab-projects.html", "w", encoding='utf8') as outfile:
-    outfile.write(new_jproject_html)
+    outfile.write(new_jproject_html)
\ No newline at end of file