mirror
/
py-gitea
kopia lustrzana https://github.com/Langenfeld/py-gitea
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

small changes/fixes. Improved Teams

pull/1/head
fkarg 2019-04-01 00:54:35 +02:00 zatwierdzone przez Langenfeld
rodzic 94427abb5c
commit 0eaae06499
1 zmienionych plików z 21 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

33
gitea/gitea.py
Wyświetl plik

@ -2,6 +2,8 @@ import json
import requests import requests
import logging import logging
logging = logging.getLogger('gitea')
class APIException(Exception): class APIException(Exception):
pass pass
@ -18,6 +20,7 @@ class Organization:
ORG_REQUEST = """/orgs/%s""" # <org> ORG_REQUEST = """/orgs/%s""" # <org>
ORG_REPOS_REQUEST = """/orgs/%s/repos""" # <org> ORG_REPOS_REQUEST = """/orgs/%s/repos""" # <org>
ORG_TEAMS_REQUEST = """/orgs/%s/teams""" # <org> ORG_TEAMS_REQUEST = """/orgs/%s/teams""" # <org>
ORG_TEAMS_CREATE = """/orgs/%s/teams""" # <org>
ORG_PATCH = """/orgs/%s""" # <org> ORG_PATCH = """/orgs/%s""" # <org>
ORG_GET_MEMBERS = """/orgs/%s/members""" # <org> ORG_GET_MEMBERS = """/orgs/%s/members""" # <org>
@ -27,7 +30,7 @@ class Organization:
self.__initialize_org(orgName, initJson) self.__initialize_org(orgName, initJson)
def get_repositories(self): def get_repositories(self):
results = self.gitea.requests_get(Organization.ORG_TEAMS_REQUEST % results = self.gitea.requests_get(Organization.ORG_REPOS_REQUEST %
self.username) self.username)
return [Repository(self.gitea, self, result["name"], return [Repository(self.gitea, self, result["name"],
initJson=result) for result in results] initJson=result) for result in results]
@ -49,7 +52,7 @@ class Organization:
if not result: if not result:
result = self.gitea.requests_get(Organization.ORG_REQUEST % result = self.gitea.requests_get(Organization.ORG_REQUEST %
orgName) orgName)
logging.info("Found Orgranization: %s" % orgName) logging.debug("Found Organization: %s" % orgName)
for i, v in result.items(): for i, v in result.items():
setattr(self, i, v) setattr(self, i, v)
except Exception: except Exception:
@ -81,7 +84,7 @@ class User:
def __initialize_user(self, userName: str, result) -> None: def __initialize_user(self, userName: str, result) -> None:
if not result: if not result:
result = self.gitea.requests_get(User.USER_REQUEST % userName) result = self.gitea.requests_get(User.USER_REQUEST % userName)
logging.info("Found User: %s" % userName) logging.debug("Found User: '%s'" % result["login"])
for i, v in result.items(): for i, v in result.items():
setattr(self, i, v) setattr(self, i, v)
@ -111,7 +114,7 @@ class Repository:
if not result: if not result:
result = self.gitea.requests_get(Repository.REPO_REQUEST % result = self.gitea.requests_get(Repository.REPO_REQUEST %
(repoOwner.username, repoName)) (repoOwner.username, repoName))
logging.info("Found Repository: %s/%s" % logging.debug("Found Repository: %s/%s" %
(repoOwner.username, repoName)) (repoOwner.username, repoName))
for i, v in result.items(): for i, v in result.items():
setattr(self, i, v) setattr(self, i, v)
@ -136,7 +139,7 @@ class Branch:
result = self.gitea.requests_get(Branch.REPO_BRANCH % result = self.gitea.requests_get(Branch.REPO_BRANCH %
(repository.owner.username, (repository.owner.username,
repository.name, name)) repository.name, name))
logging.info("Branch found: %s/%s/%s" % (repository.owner.username, logging.debug("Branch found: %s/%s/%s" % (repository.owner.username,
repository.name, name)) repository.name, name))
for i, v in result.items(): for i, v in result.items():
setattr(self, i, v) setattr(self, i, v)
@ -145,7 +148,8 @@ class Branch:
class Team: class Team:
GET_TEAM = """/orgs/%s/teams""" # GET_TEAM = """/orgs/%s/teams"""
GET_TEAM = """/teams/%s"""
def __init__(self, org: Organization, name: str, initJson: json = None): def __init__(self, org: Organization, name: str, initJson: json = None):
self.gitea = org.gitea self.gitea = org.gitea
@ -153,9 +157,13 @@ class Team:
def __initialize_team(self, org, name, result): def __initialize_team(self, org, name, result):
if not result: if not result:
# result = self.gitea.requests_get(User.USER_REQUEST % userName) for team in org.get_teams():
result = self.gitea.requests_get(Team.GET_TEAM % name) if team.name == name:
logging.info("Team found: %s/%s" % (org.username, name)) result = self.gitea.requests_get(Team.GET_TEAM % team.id)
logging.debug("Team found: %s/%s" % (org.username, name))
if not result:
logging.warning("Failed to find Team: %s/%s" %
(org.username, name))
for i, v in result.items(): for i, v in result.items():
setattr(self, i, v) setattr(self, i, v)
self.organization = org self.organization = org
@ -181,7 +189,7 @@ class Gitea():
def get_url(self, endpoint): def get_url(self, endpoint):
url = self.url + "/api/v1" + endpoint url = self.url + "/api/v1" + endpoint
logging.info(url) logging.debug('Url: %s' % url)
return url return url
def parse_result(self, result): def parse_result(self, result):
@ -379,8 +387,9 @@ class Gitea():
# u.email = email # becauso it isn't yet ... ! # u.email = email # becauso it isn't yet ... !
# return u # return u
def create_repo(self, repoOwner, repoName: str, description: str, def create_repo(self, repoOwner, repoName: str, description: str='',
private: bool, autoInit=True, gitignores=None, # private: bool=False, autoInit=True, gitignores='C#',
private: bool=False, autoInit=True, gitignores=None,
license=None, readme="Default") -> Repository: license=None, readme="Default") -> Repository:
# although this only says user in the api, this also works for # although this only says user in the api, this also works for
# organizations # organizations