nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

github: don't fetch comments when iterating issues

Browse source
This commit is contained in:
Vincent A 2013-11-02 12:25:12 +01:00
commit 3f8169a672
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/github/backend.py
View file

@ -66,7 +66,14 @@ class GithubBackend(BaseBackend, ICapBugTracker):
def get_issue(self, _id): def get_issue(self, _id):
project_id, issue_number = _id.rsplit('/', 1) project_id, issue_number = _id.rsplit('/', 1)
project = self.get_project(project_id) project = self.get_project(project_id)
return self._make_issue(self.browser.get_issue(project_id, issue_number), project)
d = self.browser.get_issue(project_id, issue_number)
issue = self._make_issue(d, project)
if d['has_comments']:
self._fetch_comments(issue)
return issue
def iter_issues(self, query): def iter_issues(self, query):
if ((query.assignee, query.author, query.status, query.title) == if ((query.assignee, query.author, query.status, query.title) ==
@ -131,11 +138,14 @@ class GithubBackend(BaseBackend, ICapBugTracker):
issue.attachments = [self._make_attachment(dattach) for dattach in d['attachments']] issue.attachments = [self._make_attachment(dattach) for dattach in d['attachments']]
issue.history = []
issue.history += [self._make_comment(dcomment, project) for dcomment in d['comments']]
return issue return issue
def _fetch_comments(self, issue):
project_id, issue_number = self._extract_issue_id(issue.id)
if not issue.history:
issue.history = []
issue.history += [self._make_comment(dcomment, issue.project) for dcomment in self.browser.iter_comments(project_id, issue_number)]
def _make_attachment(self, d): def _make_attachment(self, d):
a = Attachment(d['url']) a = Attachment(d['url'])
a.url = d['url'] a.url = d['url']

7
modules/github/browser.py
View file

@ -112,10 +112,7 @@ class GithubBrowser(BaseBrowser):
d['version'] = json['milestone'] d['version'] = json['milestone']
else: else:
d['version'] = None d['version'] = None
if json['comments'] > 0: d['has_comments'] = (json['comments'] > 0)
d['comments'] = list(self.get_comments(project_id, issue_number))
else:
d['comments'] = []
d['attachments'] = list(self._extract_attachments(d['body'])) d['attachments'] = list(self._extract_attachments(d['body']))
# TODO fetch other updates? # TODO fetch other updates?
@ -125,7 +122,7 @@ class GithubBrowser(BaseBrowser):
for jmilestone in self.do_get('https://api.github.com/repos/%s/milestones' % project_id): for jmilestone in self.do_get('https://api.github.com/repos/%s/milestones' % project_id):
yield {'id': jmilestone['number'], 'name': jmilestone['title']} yield {'id': jmilestone['number'], 'name': jmilestone['title']}
def get_comments(self, project_id, issue_number): def iter_comments(self, project_id, issue_number):
json = self.do_get('https://api.github.com/repos/%s/issues/%s/comments' % (project_id, issue_number)) json = self.do_get('https://api.github.com/repos/%s/issues/%s/comments' % (project_id, issue_number))
for jcomment in json: for jcomment in json:
d = {'id': jcomment['id'], 'message': jcomment['body'], 'author': jcomment['user']['login'], 'date': parse_date(jcomment['created_at'])} d = {'id': jcomment['id'], 'message': jcomment['body'], 'author': jcomment['user']['login'], 'date': parse_date(jcomment['created_at'])}