jiracli/cli.py

@@ -96,69 +96,64 @@ def version(client):
 @click.option('--label', 'labels', multiple=True, help='Filter for issues with all the given labels')
 @click.option('--text', 'texts', multiple=True, help='Filter for issues containing all the given strings')
 @click.option('--flagged/--not-flagged', is_flag=True, default=None, help='Filter issues being flagged or not flagged')
-@click.option('--watching/--not-watching', is_flag=True, default=None, help='Filter issues I watch or do not watch')
 @click.option('--order', help='Sort by this field')
 @click.option('--asc/--desc', 'asc', help='Sort ascending/descending. Default: descending')
-@click.option('--jql', help='Provide your own JQL query string to include in the search via AND.')
+@click.option('--jql', default='', help='Provide your own JQL query to search for issues. '
+              'Setting this ignores all other query options except --project.')
 @pass_client
 @pass_config
-def issues(config, client, project, components, status, labels, texts, flagged, watching, order, asc, jql):
-    if project is None and config.has_section('filters') and config.get('filters', 'default_project'):
+def issues(config, client, project, components, status, labels, texts, flagged, order, asc, jql):
+    if not project and config.has_section('filters') and config.get('filters', 'default_project'):
         project = config['filters']['default_project']
+        project_jql = f"project = {project}"
 
     # TODO add filtering by created since
     # TODO add filtering by updated
     # TODO support pagination I guess? i.e. a limit
-    filters = []
+    if not jql:
+        filters = []
 
-    if jql:
-        filters.append(jql)
+        if texts:
+            texts_jql = ' AND '.join([f'text ~ "{text}"' for text in texts])
+            filters.append(f"( {texts_jql} )")
 
-    if texts:
-        texts_jql = ' AND '.join([f'text ~ "{text}"' for text in texts])
-        filters.append(f"( {texts_jql} )")
+        if components:
+            component_list = ', '.join([f'"{c}"' for c in components])
+            components_jql = f"component in ({component_list})"
+            filters.append(components_jql)
 
-    if components:
-        component_list = ', '.join([f'"{c}"' for c in components])
-        components_jql = f"component in ({component_list})"
-        filters.append(components_jql)
+        if status:
+            status_list = ', '.join([f'"{s}"' for s in status if not s.startswith('!')])
+            if status_list:
+                status_jql = f"status IN ({status_list})"
+                filters.append(status_jql)
+            status_list = ', '.join([f'"{s[1:]}"' for s in status if s.startswith('!')])
+            if status_list:
+                status_jql = f"status NOT IN ({status_list})"
+                filters.append(status_jql)
 
-    if status:
-        status_list = ', '.join([f'"{s}"' for s in status if not s.startswith('!')])
-        if status_list:
-            status_jql = f"status IN ({status_list})"
-            filters.append(status_jql)
-        status_list = ', '.join([f'"{s[1:]}"' for s in status if s.startswith('!')])
-        if status_list:
-            status_jql = f"status NOT IN ({status_list})"
-            filters.append(status_jql)
+        if labels:
+            labels_jql = ' AND '.join([f'labels = "{label}"' for label in labels])
+            filters.append(f"( {labels_jql} )")
 
-    if labels:
-        labels_jql = ' AND '.join([f'labels = "{label}"' for label in labels])
-        filters.append(f"( {labels_jql} )")
+        if flagged is not None:
+            if flagged:
+                flagged_jql = 'flagged IS NOT EMPTY'
+            else:
+                flagged_jql = 'flagged IS EMPTY'
+            filters.append(flagged_jql)
 
-    if flagged is not None:
-        if flagged:
-            flagged_jql = 'flagged IS NOT EMPTY'
-        else:
-            flagged_jql = 'flagged IS EMPTY'
-        filters.append(flagged_jql)
+        if project:
+            filters.append(project_jql)
 
-    if watching is not None:
-        if watching:
-            watching_jql = 'watcher = currentUser()'
-        else:
-            watching_jql = 'watcher != currentUser()'
-        filters.append(watching_jql)
+        jql = ' AND '.join(filters)
 
-    if project:
-        project_jql = f"project = {project}"
-        filters.append(project_jql)
+        if order:
+            jql += f" ORDER BY {order} {'ASC' if asc else 'DESC'}"
 
-    jql = ' AND '.join(filters)
-
-    if order:
-        jql += f" ORDER BY {order} {'ASC' if asc else 'DESC'}"
+    else:
+        if project:
+            jql = f"project = {project} AND {jql}"
 
     print(f"Searching with query: {jql}")
     issues = client.search_issues(jql)