Skip to content

Commit

Permalink
Merge pull request #66 from lhh/misc_fix
Browse files Browse the repository at this point in the history
Misc fix
  • Loading branch information
lhh authored Oct 11, 2024
2 parents c229494 + 0d66fd2 commit b8f4a26
Showing 1 changed file with 20 additions and 5 deletions.
25 changes: 20 additions & 5 deletions jirate/jira_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ def print_issues_by_field(issue_list, args=None):
row.pop(column)

render_matrix(output)
return True


def print_issues_by_state(issue_list, args=None):
Expand All @@ -155,12 +156,22 @@ def print_issues_by_state(issue_list, args=None):
print_labels(issue.raw, prefix='')
print(issue.raw['fields']['summary'])
print()
return True


def print_keys(issue_list):
for issue in issue_list:
print(issue.key)
return False


def print_issues(issue_list, args=None):
if not args:
return print_issues_by_state(issue_list, args)

if hasattr(args, 'quiet') and args.quiet:
return print_keys(issue_list)

if hasattr(args, 'fields') and args.fields is not None:
return print_issues_by_field(issue_list, args)

Expand Down Expand Up @@ -235,8 +246,8 @@ def search_jira(args):

if not ret:
return (127, False)
print_issues(ret, args)
hbar_over(str(len(ret)) + ' result(s)')
if print_issues(ret, args):
hbar_over(str(len(ret)) + ' result(s)')
return (0, False)


Expand Down Expand Up @@ -969,9 +980,10 @@ def print_issue(project, issue_obj, verbose=False, no_comments=False, no_format=
if 'subtasks' in issue and len(issue['subtasks']):
print_subtasks(issue, project.jira.server_url)

if issue['issuetype']['name'] == 'Epic':
ret = project.search_issues('"Epic Link" = "' + issue_obj.raw['key'] + '"')
_print_issue_list('Issues in Epic', ret, project.jira.server_url)
for megalith in ('Epic', 'Feature'):
if issue['issuetype']['name'] == megalith:
ret = project.search_issues(f'"{megalith} Link" = "' + issue_obj.raw['key'] + '"')
_print_issue_list(f'Issues in {megalith}', ret, project.jira.server_url)

if no_comments:
return
Expand Down Expand Up @@ -1180,13 +1192,16 @@ def create_parser():
cmd.add_argument('-u', '--user', help='Display only issues assigned to the specific user.')
cmd.add_argument('-l', '--labels', action='store_true', help='Display issue labels.')
cmd.add_argument('-f', '--fields', help='Display these fields in a table.')
cmd.add_argument('-q', '--quiet', default=False, help='Only print issue IDs', action='store_true')

cmd.add_argument('status', nargs='?', default=None, help='Restrict to issues in this state')

cmd = parser.command('search', help='Search issue(s)/user(s) with matching text', handler=search_jira)
cmd.add_argument('-u', '--user', help='Search for user(s) (max)')
cmd.add_argument('-n', '--named-search', help='Perform preconfigured named search for issues')
cmd.add_argument('-r', '--raw', action='store_true', help='Perform raw JQL query')
cmd.add_argument('-f', '--fields', help='Display these fields in a table.')
cmd.add_argument('-q', '--quiet', default=False, help='Only print issue IDs', action='store_true')
cmd.add_argument('text', nargs='*', help='Search text')

cmd = parser.command('cat', help='Print issue(s)', handler=cat)
Expand Down

0 comments on commit b8f4a26

Please sign in to comment.