Skip to content

username extraction from file path cont'd #1100

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
agrahn merged 1 commit into from
Sep 17, 2026
Merged

username extraction from file path cont'd #1100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions app/src/main/java/app/passwordstore/util/settings/DirectoryStructure.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ enum class DirectoryStructure(val value: String) {
/**
* Returns the username associated with [file]
*
* tries to deduce the directory structure by comparing parent and grandparent directory names
* with the origin identifier, first using exact, then fuzzy matching
*
* without origin identifier given, current DirectoryStructure setting is used
*
* Examples:
* - * --> null (EncryptedUsername)
* - work/example.org/john@doe.org.gpg --> john@doe.org (FileBased)
Expand All @@ -49,12 +54,19 @@ enum class DirectoryStructure(val value: String) {
val grandparent = passFile.parentFile?.parentFile?.name ?: ""
val parent = passFile.parentFile?.name ?: ""
if (
Fuzzy.fuzzyMatchSimple(origin, grandparent) || Fuzzy.fuzzyMatchSimple(grandparent, origin)
)
origin.equals(passFile.nameWithoutExtension, ignoreCase = true)
) // EncryptedUsername, with no username provided
null
else if (origin.equals(parent, ignoreCase = true)) passFile.nameWithoutExtension // FileBased
else if (origin.equals(grandparent, ignoreCase = true))
passFile.parentFile?.name // DirectoryBased
else if (Fuzzy.fuzzyMatchSimple(origin, parent) || Fuzzy.fuzzyMatchSimple(parent, origin))
passFile.nameWithoutExtension // FileBased
else null // EncryptedUsername or no-match
else if (
Fuzzy.fuzzyMatchSimple(origin, grandparent) || Fuzzy.fuzzyMatchSimple(grandparent, origin)
)
passFile.parentFile?.name // DirectoryBased
else null // no-match
} else {
when (this) { // current directory structure setting as fallback for missing origin
EncryptedUsername -> null
Expand Down