refactor(search): Improve search output and ratelimit handling #3446

r15ch13 · 2019-05-09T18:09:59Z

Now displays the description (local bucket only).
Use Invoke-RestMethod
Show messages if GitHub rate limit is reached
Handle rate limit on currently running query (using X-RateLimit-Remaining returned by GitHub, PowerShell 6 only)
Improved binary search (now shows all matches, architectures was ignored)

Related #3853

libexec/scoop-search.ps1

r15ch13 · 2019-06-01T16:45:24Z

The shortcut searching was inspired by ScoopInstaller/Extras#2227 because @ssfjhh couldn't find Process Explorer. The exe is called procexp.exe and it can only be found by the shortcut name.

I also improved the output to be more readable:

libexec/scoop-search.ps1

Ash258 · 2019-10-19T20:24:42Z

libexec/scoop-search.ps1

-
-    $results = $names | Where-Object { !(test-path $(Find-BucketDirectory $_)) } | ForEach-Object {
-        @{"bucket" = $_; "results" = (search_remote $_ $query)}
+    $results = known_buckets | Where-Object { !(test-path $(Find-BucketDirectory $_)) } | ForEach-Object {


No need for subshell

Suggested change

$results = known_buckets | Where-Object { !(test-path $(Find-BucketDirectory $_)) } | ForEach-Object {

$results = known_buckets | Where-Object { !(Test-Path (Find-BucketDirectory $_)) } | ForEach-Object {

libexec/scoop-search.ps1

Co-Authored-By: Jakub Čábera <cabera.jakub@gmail.com>

Ash258 · 2019-10-29T08:14:51Z

libexec/scoop-search.ps1

+param(
+    [Parameter(Mandatory = $true)]
+    $Query,
+    [Switch] $Remote


Missing documentation for this parameter.

Why is this parameter needed? I would expect that if this is specified ONLY remotes are searched. But locals are searched all the time.

Query is now mandatory. Change documentation for help command, reflecting this change.

Ash258 · 2019-10-29T08:15:50Z

libexec/scoop-search.ps1

+Write-Host 'Searching in local buckets ...'
+$local_results = @()
+
+foreach ($bucket in (Get-LocalBucket) {


Missing bracket

Suggested change

foreach ($bucket in (Get-LocalBucket) {

foreach ($bucket in (Get-LocalBucket)) {

Ash258

Bottom = before
Up = after

Maybe it could be handled same as binary $exe -> $name

Edit:

Same process as for binaries

Ash258 · 2019-10-29T09:02:59Z

libexec/scoop-search.ps1

+
+        foreach ($shortcut in $app.shortcuts) {
+            if($shortcut -is [Array] -and $shortcut.length -ge 2) {
+                $name = $shortcut[1]


Suggested change

$name = $shortcut[1]

$executable = $shortcut[0]

$name = $shortcut[1]

Ash258 · 2019-10-29T09:03:19Z

libexec/scoop-search.ps1

+        foreach ($shortcut in $app.shortcuts) {
+            if($shortcut -is [Array] -and $shortcut.length -ge 2) {
+                $name = $shortcut[1]
+                if($name -match $query) {


Suggested change

if($name -match $query) {

if ($name -match $query -or $executable -match $query) {

Ash258 · 2019-10-29T09:13:14Z

libexec/scoop-search.ps1

+foreach ($bucket in (Get-LocalBucket) {
+    $result = search_bucket $bucket $query
+    if(!$result) {
+        return


I suspect you do not want to break on first bucket, which do not have results

Suggested change

return

continue

Ash258 · 2019-10-29T09:17:38Z

Would be possible to move functions into lib\search.ps1 instead of keeping it inside lib-exec?

Ash258 · 2019-10-29T10:14:00Z

I think more user-friendly it would be to follow getopt way for parameters.

Now you will get this:

You could go rather with optional query param and then manual check if -not $query { error ; break } or with getopt approach

'getopt', 'manifest', 'install', 'versions', 'config' | ForEach-Object {
    . "$PSScriptRoot\..\lib\$_.ps1"
}

$Remote = $false
$opt, $Query, $err = getopt $args 'r' 'remote'

if (-not $Query) { error 'QUERY IS NEEDED'; exit 1 }
if ($opt.r -or $opt.remote) { $Remote = $true }

Ash258 · 2019-10-29T13:01:34Z

libexec/scoop-search.ps1

+    try {
+        $query = New-Object Regex $query, 'IgnoreCase'
+    } catch {
+        abort "Invalid regular expression: $($_.exception.innerexception.message)"
    }


I would move this outside function. When it will be standalone inside scoop-search.ps1 you will save abort call and can handle failsafe scenario better.

Then the query, which is passing into search_bucket function could be Regex object

Also you do not need to create regex for each bucket. This regex is same for all buckets

- ScoopInstaller#3446, #27

rashil2000 · 2022-06-19T12:50:00Z

Superceded by #4997

refactor(search): Improve search output and ratelimit handling

89c93d6

r15ch13 force-pushed the feature/improve-search branch from 9ddd828 to 89c93d6 Compare May 9, 2019 18:13

Ash258 suggested changes May 9, 2019

View reviewed changes

libexec/scoop-search.ps1 Outdated Show resolved Hide resolved

libexec/scoop-search.ps1 Outdated Show resolved Hide resolved

libexec/scoop-search.ps1 Outdated Show resolved Hide resolved

r15ch13 added 6 commits May 9, 2019 21:11

refactor(search): Fix output for remote buckets

d598a70

refactor(search): Use rate limit threshold of 1

0f55c0b

refactor(search): handle HttpResponseException as ratelimit

eff34f0

refactor(search): Also search in shortcut names

cb2d1f1

refactor(search): Add -Remote switch to force searching in known buckets

0c0dd3f

refactor(search): Improve output

6817f6b

kidonng mentioned this pull request Jul 14, 2019

TODO kidonng/scoop-docs#2

Open

8 tasks

linsui mentioned this pull request Sep 22, 2019

Use scoop to discover software #3658

Closed

Ash258 suggested changes Oct 19, 2019

View reviewed changes

r15ch13 and others added 9 commits October 20, 2019 13:57

Update libexec/scoop-search.ps1

9d45803

Co-Authored-By: Jakub Čábera <cabera.jakub@gmail.com>

Update libexec/scoop-search.ps1

e021382

Co-Authored-By: Jakub Čábera <cabera.jakub@gmail.com>

Update libexec/scoop-search.ps1

0a87edb

Co-Authored-By: Jakub Čábera <cabera.jakub@gmail.com>

Update libexec/scoop-search.ps1

3811d0b

Co-Authored-By: Jakub Čábera <cabera.jakub@gmail.com>

Update libexec/scoop-search.ps1

dfb3f6d

Co-Authored-By: Jakub Čábera <cabera.jakub@gmail.com>

Update libexec/scoop-search.ps1

8a00b5e

Co-Authored-By: Jakub Čábera <cabera.jakub@gmail.com>

Update libexec/scoop-search.ps1

62206c8

Co-Authored-By: Jakub Čábera <cabera.jakub@gmail.com>

Update libexec/scoop-search.ps1

fe057b2

Co-Authored-By: Jakub Čábera <cabera.jakub@gmail.com>

Update libexec/scoop-search.ps1

7f2a8db

Co-Authored-By: Jakub Čábera <cabera.jakub@gmail.com>

Ash258 reviewed Oct 29, 2019

View reviewed changes

Ash258 suggested changes Oct 29, 2019

View reviewed changes

Ash258 reviewed Oct 29, 2019

View reviewed changes

r15ch13 mentioned this pull request Dec 6, 2019

[Discussion] State of repository and some thoughts on changes #2609

Closed

Ash258 mentioned this pull request Jan 19, 2020

iconsextract: Add version 1.47 ScoopInstaller/Extras#3508

Closed

Ash258 mentioned this pull request Jun 11, 2020

Backports tracker Ash258/Scoop-Core#27

Open

21 tasks

Ash258 added a commit to Ash258/Scoop-Core that referenced this pull request Oct 3, 2020

refactor(search): Output, limiting improvements

d19857a

- ScoopInstaller#3446, #27

Ash258 mentioned this pull request Oct 3, 2020

refactor(search): Output, limiting improvements Ash258/Scoop-Core#67

Merged

2 tasks

Ash258 mentioned this pull request Dec 15, 2020

scoop-search: added ability to search in the manifest description #4200

Closed

Base automatically changed from develop to master November 22, 2021 14:40

rashil2000 mentioned this pull request Jun 19, 2022

refactor(scoop-search): Output PSObject, use API token #4997

Merged

5 tasks

rashil2000 closed this Jun 19, 2022

rashil2000 deleted the feature/improve-search branch June 24, 2022 18:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(search): Improve search output and ratelimit handling #3446

refactor(search): Improve search output and ratelimit handling #3446

r15ch13 commented May 9, 2019 •

edited by rashil2000

Loading

r15ch13 commented Jun 1, 2019

Ash258 Oct 19, 2019

Ash258 Oct 29, 2019 •

edited

Loading

Ash258 Oct 29, 2019

Ash258 Oct 29, 2019

Ash258 left a comment •

edited

Loading

Ash258 Oct 29, 2019

Ash258 Oct 29, 2019

Ash258 Oct 29, 2019 •

edited

Loading

Ash258 commented Oct 29, 2019

Ash258 commented Oct 29, 2019

Ash258 Oct 29, 2019 •

edited

Loading

Ash258 Oct 29, 2019

rashil2000 commented Jun 19, 2022

	$results = known_buckets \| Where-Object { !(test-path $(Find-BucketDirectory $_)) } \| ForEach-Object {
	$results = known_buckets \| Where-Object { !(Test-Path (Find-BucketDirectory $_)) } \| ForEach-Object {

	foreach ($bucket in (Get-LocalBucket) {
	foreach ($bucket in (Get-LocalBucket)) {

	$name = $shortcut[1]
	$executable = $shortcut[0]
	$name = $shortcut[1]

	if($name -match $query) {
	if ($name -match $query -or $executable -match $query) {

refactor(search): Improve search output and ratelimit handling #3446

refactor(search): Improve search output and ratelimit handling #3446

Conversation

r15ch13 commented May 9, 2019 • edited by rashil2000 Loading

r15ch13 commented Jun 1, 2019

Ash258 Oct 19, 2019

Choose a reason for hiding this comment

Ash258 Oct 29, 2019 • edited Loading

Choose a reason for hiding this comment

Ash258 Oct 29, 2019

Choose a reason for hiding this comment

Ash258 Oct 29, 2019

Choose a reason for hiding this comment

Ash258 left a comment • edited Loading

Choose a reason for hiding this comment

Ash258 Oct 29, 2019

Choose a reason for hiding this comment

Ash258 Oct 29, 2019

Choose a reason for hiding this comment

Ash258 Oct 29, 2019 • edited Loading

Choose a reason for hiding this comment

Ash258 commented Oct 29, 2019

Ash258 commented Oct 29, 2019

Ash258 Oct 29, 2019 • edited Loading

Choose a reason for hiding this comment

Ash258 Oct 29, 2019

Choose a reason for hiding this comment

rashil2000 commented Jun 19, 2022

r15ch13 commented May 9, 2019 •

edited by rashil2000

Loading

Ash258 Oct 29, 2019 •

edited

Loading

Ash258 left a comment •

edited

Loading

Ash258 Oct 29, 2019 •

edited

Loading

Ash258 Oct 29, 2019 •

edited

Loading