Skip to content
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.

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

feat(completion): Add clink completion #50

Merged
merged 5 commits into from
Jul 10, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
partial implementation
  • Loading branch information
Ash258 committed Jul 10, 2020
commit 36c7996643c0dab43ee2d5320e385e85aafe6b98
2 changes: 1 addition & 1 deletion libexec/scoop-download.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Usage: scoop download <app> [options]
# Usage: scoop download <apps> [options]
# Summary: Download manifest files into cache folder.
#
# Help: All manifest files will be downloaded into cache folder.
Expand Down
6 changes: 3 additions & 3 deletions supporting/completion/Scoop-Completion.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ function script:Get-LocallyInstalledApplicationsByScoop($Filter) {
return @(Get-ChildItem $SCOOP_DIRECTORY 'apps\*' -Exclude 'scoop' -Directory -Name) -like "$Filter*"
}

function script:Get-LocallyAvaialableApplicationsByScoop($Filter) {
function script:Get-LocallyAvailableApplicationsByScoop($Filter) {
$buckets = Get-ChildItem $SCOOP_DIRECTORY 'buckets\*' -Directory

$manifests = @()
Expand Down Expand Up @@ -176,13 +176,13 @@ function script:ScoopTabExpansion($LastBlock) {
}

# Handles uninstall package names
'^(cleanup|hold|prefix|reset|uninstall|update|virustotal|unhold)\s+(?:.+\s+)?(?<package>[\w][\-.\w]*)?$' {
'^(cleanup|hold|prefix|reset|uninstall|update|unhold|virustotal)\s+(?:.+\s+)?(?<package>[\w][\-.\w]*)?$' {
return Get-LocallyInstalledApplicationsByScoop $Matches['package']
}

# Handles install package names
'^(cat|depends|download|info|install|home)\s+(?:.+\s+)?(?<package>[\w][\-.\w]*)?$' {
return Get-LocallyAvaialableApplicationsByScoop $Matches['package']
return Get-LocallyAvailableApplicationsByScoop $Matches['package']
}

# Handles cache (rm/show) cache names
Expand Down
140 changes: 137 additions & 3 deletions supporting/completion/scoop.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,150 @@ if not scoopGlobalEnvironment then
scoopGlobalEnvironment = os.getenv('programdata')..'\\Scoop'
end

-- region Helpers
local booleanParser = parser({'true', 'false'})
local architectureParser = parser({'32bit', '64bit'})
local utilityParser = parser({'native', 'aria2'})
-- region Functions
-- endregion Function

-- TODO: Implement
local function getChildItemDirectory(path)
dir = clink.find_dirs(path)
-- Remove .. and . from table of directories
table.remove(dir, 1)
table.remove(dir, 1)

return dir
end

local function getLocallyAddedBucket()
return getChildItemDirectory(scoopEnvironment..'\\buckets\\*')
end

local function selectBaseName(path)
local names = {}

for k, v in pairs(path) do
names[k] = string.match(v, '(.+)%.')
end

return names
end

local function getLocallyAvailableApplicationsByScoop()
local apps = {}
local i = 0
local buckets = scoopEnvironment .. '\\buckets\\'

for _, bucket in pairs(getLocallyAddedBucket()) do
local bucketFolder = buckets .. bucket
local nestedFolder = bucketFolder .. '\\bucket'

if clink.is_dir(nestedFolder) then
bucketFolder = nestedFolder
end

for u, app in pairs(selectBaseName(clink.find_files(bucketFolder .. '\\*.*'))) do
apps[i] = app
i = i + 1
end
end

return apps
end

local function getLocallyInstalledApplicationsByScoop()
local installed = getChildItemDirectory(scoopEnvironment .. '\\apps\\*')
local i = #installed

if scoopGlobalEnvironment then
for _, dir in pairs(getChildItemDirectory(scoopGlobalEnvironment .. '\\apps\\*')) do
installed[i] = dir
i = i + 1
end
end

return installed
end
-- endregion Functions
-- endregion Helpers

local scoopParser = parser({
'alias' .. parser({
'add',
'list' .. parser({'-v', '--verbose'}),
'rm'
}),
'cat' .. parser({getLocallyAvailableApplicationsByScoop}),
'checkup',
'cleanup' .. parser({getLocallyInstalledApplicationsByScoop},
'-g', '--global',
'-k', '--cache'
):loop(1),
'depends' .. parser({getLocallyAvailableApplicationsByScoop}),
'download' .. parser({getLocallyAvailableApplicationsByScoop},
'-a' .. architectureParser, '--arch' .. architectureParser,
'-b', '--all-architectures',
'-s', '--skip',
'-u' .. utilityParser, '--utility' .. utilityParser
):loop(1),
'export',
'hold' .. parser({getLocallyInstalledApplicationsByScoop},
'-g', '--global'
):loop(1),
'home' .. parser({getLocallyAvailableApplicationsByScoop}),
'info' .. parser({getLocallyAvailableApplicationsByScoop}),
'install' .. parser({getLocallyAvailableApplicationsByScoop},
'-a' .. architectureParser, '--arch' .. architectureParser,
'-g', '--global',
'-i', '--independent',
'-k', '--no-cache',
'-s', '--skip'
):loop(1),
'list',
'prefix' .. parser({getLocallyInstalledApplicationsByScoop}),
'reset' .. parser({getLocallyInstalledApplicationsByScoop}):loop(1),
'search',
'status',
'which'
'unhold' .. parser({getLocallyInstalledApplicationsByScoop},
'-g', '--global'
):loop(1),
'uninstall' .. parser({getLocallyInstalledApplicationsByScoop},
'-g', '--global',
'-p', '--purge'
):loop(1),
'update' .. parser({getLocallyInstalledApplicationsByScoop},
'-f', '--force',
'-g', '--global',
'-i', '--independent',
'-k', '--no-cache',
'-s', '--skip',
'-q', '--quiet'
):loop(1),
'virustotal' .. parser({getLocallyAvailableApplicationsByScoop},
'-a' .. architectureParser, '--arch' .. architectureParser,
'-s', '--scan',
'-n', '--no-depends'
):loop(1),
'which',









'bucket' ..parser({
'rm' ..parser({getLocallyAddedBucket})
}),
'cache',
'config'
})
local scoopHelpParser = parser({
'/?',
'-h', '--help',
'--version',
'help' ..parser(scoopParser:flatten_argument(1))
})

Expand Down