mirror of
https://github.com/rwinkhart/MUTN.git
synced 2026-09-05 16:47:20 -04:00
Do not trim file extensions from entries (file extensions are no longer expected)
This commit is contained in:
@@ -4,10 +4,10 @@ _path_gen() {
|
|||||||
local mutn_path="$HOME/.local/share/libmutton"
|
local mutn_path="$HOME/.local/share/libmutton"
|
||||||
local glob_status=$(shopt -p globstar)
|
local glob_status=$(shopt -p globstar)
|
||||||
[ -z "${glob_status##*u*}" ] && shopt -s globstar # if recursive globbing is disabled, enable it
|
[ -z "${glob_status##*u*}" ] && shopt -s globstar # if recursive globbing is disabled, enable it
|
||||||
local full_paths=("$mutn_path"/**/*.gpg)
|
local full_paths=("$mutn_path"/**/*)
|
||||||
$glob_status # set recursive globbing to user default
|
$glob_status # set recursive globbing to user default
|
||||||
for scan_path in "${full_paths[@]}"; do
|
for scan_path in "${full_paths[@]}"; do
|
||||||
trimmed_paths+=("${scan_path:${#mutn_path}:-4}")
|
trimmed_paths+=("${scan_path#$mutn_path}")
|
||||||
done
|
done
|
||||||
if [ "${trimmed_paths[0]}" == '/**/*' ]; then trimmed_paths[0]=help; fi
|
if [ "${trimmed_paths[0]}" == '/**/*' ]; then trimmed_paths[0]=help; fi
|
||||||
} &&
|
} &&
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
#compdef mutn
|
#compdef mutn
|
||||||
|
|
||||||
mutn_path="$HOME/.local/share/libmutton"
|
mutn_path="$HOME/.local/share/libmutton"
|
||||||
full_paths=("$mutn_path"/**/*.gpg)
|
full_paths=("$mutn_path"/**/*)
|
||||||
trimmed_paths=()
|
trimmed_paths=()
|
||||||
for scan_path in "${full_paths[@]}"; do
|
for scan_path in "${full_paths[@]}"; do
|
||||||
trimmed_paths+=("${${scan_path#$mutn_path}%????}")
|
trimmed_paths+=("${scan_path#$mutn_path}")
|
||||||
done
|
done
|
||||||
[[ -z $trimmed_paths ]] && trimmed_paths=(help)
|
[[ -z $trimmed_paths ]] && trimmed_paths=(help)
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ func main() {
|
|||||||
} else if argsCount == 1 {
|
} else if argsCount == 1 {
|
||||||
|
|
||||||
// initial entry reader shortcut
|
// initial entry reader shortcut
|
||||||
// TODO Do not use file extensions for entries! This will allow doing this check more efficiently than otherwise possible.
|
|
||||||
if strings.HasPrefix(args[0], "/") {
|
if strings.HasPrefix(args[0], "/") {
|
||||||
targetLocation := offline.EntryRoot + offline.PathSeparator + args[0][1:]
|
targetLocation := offline.EntryRoot + offline.PathSeparator + args[0][1:]
|
||||||
if isFile, _ := offline.TargetIsFile(targetLocation, true); isFile {
|
if isFile, _ := offline.TargetIsFile(targetLocation, true); isFile {
|
||||||
|
|||||||
@@ -54,9 +54,8 @@ func printFileEntry(entry string, lastSlash int, charCounter int, colorAlternato
|
|||||||
}
|
}
|
||||||
colorAlternator = -colorAlternator
|
colorAlternator = -colorAlternator
|
||||||
|
|
||||||
// trim the containing directory and file extension from the entry to determine fileEntryName
|
// trim the containing directory from the entry to determine fileEntryName
|
||||||
fileEntryName := entry[lastSlash:]
|
fileEntryName := entry[lastSlash:]
|
||||||
fileEntryName = fileEntryName[:len(fileEntryName)-4]
|
|
||||||
|
|
||||||
if charCounter == 0 { // indent first line of entries for each directory header
|
if charCounter == 0 { // indent first line of entries for each directory header
|
||||||
fmt.Print(strings.Repeat(" ", indent*2))
|
fmt.Print(strings.Repeat(" ", indent*2))
|
||||||
|
|||||||
Reference in New Issue
Block a user