feat: allow simple tag list and add tag completion

Author: lervag

completion/_apy

@@ -74,15 +74,15 @@ _apy() {
   case "$words[1]" in
     add)
       opts=( \
-        '(-t --tags)'{-t,--tags}'[Specify tags]:tags:' \
+        '(-t --tags)'{-t,--tags}'[Specify tags]:tags:_apy_tags' \
         '(-m --model)'{-m,--model}'[Specify model]:model:_apy_models' \
         '(-d --deck)'{-d,--deck}'[Specify deck]:deck:' \
         $opts_help \
         );;
     add-single)
       opts=( \
         '(-s --preset)'{-s,--preset}'[Specify a preset]:preset:' \
-        '(-t --tags)'{-t,--tags}'[Specify tags]:tags:' \
+        '(-t --tags)'{-t,--tags}'[Specify tags]:tags:_apy_tags' \
         '(-m --model)'{-m,--model}'[Specify model]:model:_apy_models' \
         '(-d --deck)'{-d,--deck}'[Specify deck]:deck:' \
         '::Fields' \
@@ -91,7 +91,7 @@ _apy() {
     add-from-file|update-from-file)
       opts=( \
         '::Markdown input file:_files -g "*.md"' \
-        '(-t --tags)'{-t,--tags}'[Specify tags]:tags:' \
+        '(-t --tags)'{-t,--tags}'[Specify tags]:tags:_apy_tags' \
         '(-d --deck)'{-d,--deck}'[Specify deck]:deck:' \
         '(-u --update-file)'{-u,--update-file}'[Update original file with note IDs]' \
         $opts_help \
@@ -159,7 +159,7 @@ _apy() {
     tag)
       opts=( \
         '(-a --add-tags)'{-a,--add-tags}'[Add specified tags]:tags:' \
-        '(-r --remove-tags)'{-r,--remove-tags}'[Remove specified tags]:tags:' \
+        '(-r --remove-tags)'{-r,--remove-tags}'[Remove specified tags]:tags:_apy_tags' \
         $opts_help \
         '::Query' \
         );;
@@ -188,4 +188,38 @@ _apy_models() {
   _describe 'model' models
 }
 
+_apy_tags() {
+  local cache_dir="${XDG_CACHE_HOME:-/tmp/cache}/apy"
+  local cache_file="$cache_dir/apy_tags"
+
+  local -a tags
+
+  [[ -d $cache_dir ]] || mkdir -p $cache_dir
+  if [[ -f $cache_file && $(($(date +%s) - $(date -r $cache_file +%s))) -lt 300 ]]
+  then
+    tags=(${(f)"$(<$cache_file)"})
+  else
+    tags=(${(f)"$(apy tag -s 2>/dev/null)"})
+    print -l $tags > $cache_file
+  fi
+
+  local current_input="${words[CURRENT]}"
+  local current_tag="${current_input##*,}"
+  local prefix="${current_input%,*}"
+
+  local -a used_tags_array=(${(s:,:)prefix})
+  local -a available_tags
+  for tag in $tags; do
+    if [[ ! " ${used_tags_array[@]} " =~ " ${tag} " ]]; then
+      available_tags+=($tag)
+    fi
+  done
+
+  if [[ $current_input == *","* ]]; then
+    compadd -P "${prefix}," -a available_tags
+  else
+    _describe 'tags' available_tags
+  fi
+}
+
 _apy "$@"

src/apyanki/anki.py

@@ -328,26 +328,29 @@ def rename_model(self, old_model_name: str, new_model_name: str) -> None:
         _ = self.col.models.update_dict(model)
         self.modified = True
 
-    def list_tags(self, sort_by_count: bool = False) -> None:
+    def list_tags(self, sort_by_count: bool = False, simple: bool = False) -> None:
         """List all tags"""
-        table = Table(show_edge=False, box=None, header_style="bold white")
-        table.add_column("tag", style="cyan")
-        table.add_column("notes", style="magenta", justify="right")
-
         if sort_by_count:
-
             def sorter(x: tuple[str, int]) -> str | int:
                 return x[1]
         else:
-
             def sorter(x: tuple[str, int]) -> str | int:
                 return x[0]
 
         tags = [(t, len(self.col.find_notes(f"tag:{t}"))) for t in self.col.tags.all()]
-        for tag, n in sorted(tags, key=sorter):
-            table.add_row(tag, str(n))
 
-        console.print(table)
+        if simple:
+            for t, _ in tags:
+                console.print(t)
+        else:
+            table = Table(show_edge=False, box=None, header_style="bold white")
+            table.add_column("tag", style="cyan")
+            table.add_column("notes", style="magenta", justify="right")
+
+            for tag, n in sorted(tags, key=sorter):
+                table.add_row(tag, str(n))
+
+            console.print(table)
 
     def change_tags(self, query: str, tags: str, add: bool = True) -> None:
         """Add/Remove tags from notes that match query"""

src/apyanki/cli.py

@@ -642,6 +642,9 @@ def sync() -> None:
 @click.option(
     "-c", "--sort-by-count", is_flag=True, help="When listing tags, sort by note count"
 )
+@click.option(
+    "-s", "--simple", is_flag=True, help="Only list available tags"
+)
 @click.option(
     "-p",
     "--purge",
@@ -652,6 +655,7 @@ def tag(
     query: str,
     add_tags: str | None,
     remove_tags: str | None,
+    simple: bool,
     sort_by_count: bool,
     purge: bool,
 ) -> None:
@@ -704,7 +708,7 @@ def tag(
         if (add_tags is None or add_tags == "") and (
             remove_tags is None or remove_tags == ""
         ):
-            a.list_tags(sort_by_count)
+            a.list_tags(sort_by_count, simple)
             return
 
         n_notes = len(list(a.find_notes(query)))