From 86c4f5eed5943128accc425ff5b0c3bb3dcd289b Mon Sep 17 00:00:00 2001
From: Lon Hohberger <lon@metamorphism.com>
Date: Thu, 31 Oct 2024 09:30:46 -0400
Subject: [PATCH 1/2] Allow pruning issue lists by field/regex pair

---
 jirate/jira_cli.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/jirate/jira_cli.py b/jirate/jira_cli.py
index 599262e..efea2a2 100644
--- a/jirate/jira_cli.py
+++ b/jirate/jira_cli.py
@@ -244,6 +244,20 @@ def search_jira(args):
         else:
             ret = args.project.search(search_query)
 
+    # JIRA's text search borders on useless.
+    # Prune any issues from output where the regex does not
+    # match supplied field
+    stripped = []
+    if args.prune_regex:
+        field = args.prune_regex[0]
+        regex = args.prune_regex[1]
+
+        for issue in ret:
+            val = issue.field(field)
+            if val and re.search(regex, val):
+                stripped.append(issue)
+        ret = stripped
+
     if not ret:
         return (127, False)
     if print_issues(ret, args):
@@ -1206,6 +1220,7 @@ def create_parser():
     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('--prune-regex', nargs=2, help='Prune results by checking named field against regular expression, removing any that do not match')
     cmd.add_argument('-q', '--quiet', default=False, help='Only print issue IDs', action='store_true')
     cmd.add_argument('text', nargs='*', help='Search text')
 

From 3a3ed9dca20c82c72bc6be2f539a8e7e689c758e Mon Sep 17 00:00:00 2001
From: Lon Hohberger <lon@metamorphism.com>
Date: Thu, 31 Oct 2024 11:10:36 -0400
Subject: [PATCH 2/2] jira: Allow CLI override for field definition by pasting
 inline JSON

---
 jirate/jira_cli.py | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/jirate/jira_cli.py b/jirate/jira_cli.py
index efea2a2..8c2ce4c 100644
--- a/jirate/jira_cli.py
+++ b/jirate/jira_cli.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
 import copy
+import json
 import os
 import re
 import sys
@@ -1147,7 +1148,7 @@ def component_list(args):
     return (0, False)
 
 
-def get_jira_project(project=None, config=None, config_file=None):
+def get_jira_project(project=None, config=None, config_file=None, **kwargs):
     # project: Project key
     # config: dict / pre-read JSON data
     if not config:
@@ -1191,6 +1192,30 @@ def get_jira_project(project=None, config=None, config_file=None):
 
     if 'custom_fields' in jconfig:
         proj.custom_fields = copy.deepcopy(jconfig['custom_fields'])
+    else:
+        proj.custom_fields = []
+
+    # CLI field parsing definition
+    field_info = None
+    if 'field' in kwargs and kwargs['field']:
+        field_name = kwargs['field'][0]
+        field_info = json.loads(kwargs['field'][1])
+        field_id = proj.field_to_id(field_name)
+        found = False
+        for cf in proj.custom_fields:
+            if cf['id'] == field_id:
+                found = True
+                for key in field_info:
+                    # TODO update custom field call in jboard?
+                    cf[key] = field_info[key]
+                break
+        if not found:
+            # No config present: Create a field definition on the fly
+            field_info['id'] = field_id
+            field_info['name'] = proj.field_to_human(field_id)
+            proj.custom_fields.append(field_info)
+
+    if proj.custom_fields:
         apply_field_renderers(proj.custom_fields)
     else:
         apply_field_renderers()
@@ -1203,6 +1228,7 @@ def create_parser():
 
     parser.add_argument('-p', '--project', help='Use this JIRA project instead of default', default=None, type=str.upper)
     parser.add_argument('-f', '--format', help='Use this format for issue list output', default='default', choices=['default', 'csv'], type=str.lower)
+    parser.add_argument('--x-format-field', nargs=2, help='Experimental: apply field formatting from the CLI (field, json)', default=None)
 
     cmd = parser.command('whoami', help='Display current user information', handler=user_info)
 
@@ -1355,8 +1381,12 @@ def main():
     args = update_args(sys.argv)
     ns = parser.parse_args(args=args[1:])
 
+    field = None
+    if ns.x_format_field:
+        field = ns.x_format_field
+
     try:
-        project = get_jira_project(ns.project)
+        project = get_jira_project(ns.project, field=field)
     except KeyError:
         sys.exit(1)
     except FileNotFoundError: