Skip to content

refactor: split utility.sh into per-verb modules in lib/ #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vitali87 merged 8 commits into from
Mar 27, 2026
+1,486 −1,495
Merged

refactor: split utility.sh into per-verb modules in lib/ #44

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c346926
refactor: split utility.sh into per-verb modules in lib/
vitali87 Mar 24, 2026
b80e79e
fix: add source error handling, add missing completions for new entities
vitali87 Mar 24, 2026
c11bb2f
fix: suppress SC1090 for dynamic source in module loader
vitali87 Mar 24, 2026
3dd1d8e
fix: move nested _get_output_file to top-level _u7_archive_output_file
vitali87 Mar 24, 2026
aa3cfa9
Merge branch 'main' into refactor/split-modules
vitali87 Mar 27, 2026
f05024e
fix: address Greptile review feedback for SC2155, jq safety, and vari…
vitali87 Mar 27, 2026
f5d886f
fix: resolve merge conflict, add mk template to split modules
vitali87 Mar 27, 2026
5a54a58
fix: add missing sh system entity to split modules
vitali87 Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
Expand Down
122 changes: 122 additions & 0 deletions lib/completions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
_u7_complete_entities() {
local verb="$1" cur="$2"
case "$verb" in
show|sh)
COMPREPLY=($(compgen -W "ip csv json line ssl files diff cpu memory disk processes port usage network git env definition functions --help" -- "$cur"))
;;
make|mk)
COMPREPLY=($(compgen -W "dir file password user copy link archive sequence --help" -- "$cur"))
;;
drop|dr)
COMPREPLY=($(compgen -W "file dir dirs files line lines column duplicates process user --help" -- "$cur"))
;;
convert|cv)
COMPREPLY=($(compgen -W "archive files image video json csv case spaces --help" -- "$cur"))
;;
move|mv)
COMPREPLY=($(compgen -W "file sync --help" -- "$cur"))
;;
set|st)
COMPREPLY=($(compgen -W "text slashes tabs perms owner --help" -- "$cur"))
;;
run|rn)
COMPREPLY=($(compgen -W "job script check terminal --help" -- "$cur"))
;;
esac
}

_u7_complete_args() {
local verb="$1" entity="$2" cur="$3"
case "$verb" in
show|sh)
case "$entity" in
ip) COMPREPLY=($(compgen -W "external internal connected" -- "$cur")) ;;
processes) COMPREPLY=($(compgen -W "running by" -- "$cur")) ;;
files) COMPREPLY=($(compgen -W "match by" -- "$cur")) ;;
usage) COMPREPLY=($(compgen -W "disk directories" -- "$cur")) ;;
git) COMPREPLY=($(compgen -W "authors branches tags log status diff remotes" -- "$cur")) ;;
env) COMPREPLY=($(compgen -W "match" -- "$cur")) ;;
*) _filedir ;;
esac
;;
make|mk)
case "$entity" in
copy|link) _filedir ;;
esac
;;
drop|dr)
case "$entity" in
dirs) COMPREPLY=($(compgen -W "if" -- "$cur")) ;;
files) COMPREPLY=($(compgen -W "but" -- "$cur")) ;;
lines) COMPREPLY=($(compgen -W "if" -- "$cur")) ;;
*) _filedir ;;
esac
;;
convert|cv)
case "$entity" in
archive|files) COMPREPLY=($(compgen -W "to" -- "$cur")) ;;
png|jpg|jpeg|gif) COMPREPLY=($(compgen -W "to" -- "$cur")) ;;
case) COMPREPLY=($(compgen -W "upper lower" -- "$cur")) ;;
spaces) COMPREPLY=($(compgen -W "to" -- "$cur")) ;;
*) _filedir ;;
esac
;;
set|st)
case "$entity" in
slashes) COMPREPLY=($(compgen -W "back forward" -- "$cur")) ;;
tabs) COMPREPLY=($(compgen -W "to" -- "$cur")) ;;
perms|owner) COMPREPLY=($(compgen -W "to" -- "$cur")) ;;
*) _filedir ;;
esac
;;
run|rn)
case "$entity" in
check) COMPREPLY=($(compgen -W "syntax" -- "$cur")) ; _filedir ;;
script) _filedir ;;
esac
Copy link
Copy Markdown

@greptile-apps greptile-apps bot Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 image/video/json/csv entities never matched by completion rules

The png|jpg|jpeg|gif pattern matches the entity word (the second argument after the verb), but _u7_convert uses image as the entity name for image conversion — not the file extension. So u7 cv image foo.png <tab> falls through to *) _filedir ;; and never offers to as a completion.

The same gap applies to video, json, and csv which are also real entities in lib/convert.sh but are absent from this case statement.

Suggested change
esac
archive|files|image|video|json|csv) COMPREPLY=($(compgen -W "to" -- "$cur")) ;;

The old png|jpg|jpeg|gif pattern can be removed — those are never used as the entity word.

Prompt To Fix With AI 
This is a comment left during a code review.
Path: lib/completions.sh
Line: 80

Comment:
**`image`/`video`/`json`/`csv` entities never matched by completion rules**

The `png|jpg|jpeg|gif` pattern matches the *entity* word (the second argument after the verb), but `_u7_convert` uses `image` as the entity name for image conversion — not the file extension. So `u7 cv image foo.png <tab>` falls through to `*) _filedir ;;` and never offers `to` as a completion.

The same gap applies to `video`, `json`, and `csv` which are also real entities in `lib/convert.sh` but are absent from this case statement.

```suggestion
        archive|files|image|video|json|csv) COMPREPLY=($(compgen -W "to" -- "$cur")) ;;
```

The old `png|jpg|jpeg|gif` pattern can be removed — those are never used as the entity word.

How can I resolve this? If you propose a fix, please make it concise.

;;
esac
}

_u7_completions() {
local cur prev words cword
_init_completion 2>/dev/null || {
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"
words=("${COMP_WORDS[@]}")
cword=$COMP_CWORD
}

local verbs="show sh make mk drop dr convert cv move mv set st run rn --help"
local opts="-n --dry-run"

Copy link
Copy Markdown

@greptile-apps greptile-apps bot Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 _filedir overwrites the syntax completion

_filedir replaces COMPREPLY entirely, so the syntax suggestion set on the same line is always discarded. A user typing u7 rn check <tab> will see only filenames, never syntax.

Suggested change
check) COMPREPLY=($(compgen -W "syntax" -- "$cur")) ;;

File-path completion is only needed at a deeper position (after syntax in file), and it already falls through to the *) _filedir ;; fallback there.

Prompt To Fix With AI 
This is a comment left during a code review.
Path: lib/completions.sh
Line: 96

Comment:
**`_filedir` overwrites the `syntax` completion**

`_filedir` replaces `COMPREPLY` entirely, so the `syntax` suggestion set on the same line is always discarded. A user typing `u7 rn check <tab>` will see only filenames, never `syntax`.

```suggestion
        check) COMPREPLY=($(compgen -W "syntax" -- "$cur")) ;;
```

File-path completion is only needed at a deeper position (after `syntax in file`), and it already falls through to the `*) _filedir ;;` fallback there.

How can I resolve this? If you propose a fix, please make it concise.

# Adjust for dry-run flag
local verb_idx=1
if [[ "${words[1]}" == "-n" || "${words[1]}" == "--dry-run" ]]; then
verb_idx=2
fi
local entity_idx=$((verb_idx + 1))

# Completing verb position
if [[ "$cword" -le "$verb_idx" ]]; then
if [[ "$cword" -eq 1 ]]; then
COMPREPLY=($(compgen -W "$verbs $opts" -- "$cur"))
else
COMPREPLY=($(compgen -W "$verbs" -- "$cur"))
fi
return
fi

# Completing entity position
if [[ "$cword" -eq "$entity_idx" ]]; then
_u7_complete_entities "${words[$verb_idx]}" "$cur"
return
fi

# Completing arguments
_u7_complete_args "${words[$verb_idx]}" "${words[$entity_idx]}" "$cur"
}

if [[ $- == *i* ]]; then
complete -F _u7_completions u7
fi
Loading
Loading