Upgrade sidebar search #614

BhagatHarsh · 2025-02-12T14:10:19Z

Addresses: Search Bar Support in Side Bar #573
Code improvements in handing sidebar movements
Code improvements in rendering and operations related to pinned and disk divider in sidebar directories
Improved render and used pre-rendered strings for efficiency

netlify · 2025-02-12T14:10:41Z

✅ Deploy Preview for superfile canceled.

Name	Link
🔨 Latest commit	`9879842`
🔍 Latest deploy log	https://app.netlify.com/sites/superfile/deploys/67b6e9eca10a8c0008ce118f

lazysegtree · 2025-02-14T13:52:51Z

@BhagatHarsh We have fuzzy search implemented in file panel search. It would be inconsistent if sidebar search is not fuzzy search
For example mts and ments both should be able to find Documents

lazysegtree · 2025-02-14T13:54:18Z

Also make sure to rebase your branch against main . Some new commits have went in recently.
And make sure to have code formatted as per go fmt Thats why, the go build check is failing

Just run go fmt ./... in project root, and go will fix the code formatting.

src/internal/get_data.go

lazysegtree · 2025-02-14T14:22:53Z

@BhagatHarsh It would be great to keep the same sidebar grouping also on search results

Sample changes

func getFilteredDirectories(query string) []directory {
	directories := []directory{}

	directories = append(directories, 
		getFilteredDirectoriesFromSource(query, getWellKnownDirectories())...)
	directories = append(directories, directory{
		// Just make sure no one owns the hard drive or directory named this path
		location: "Pinned+-*/=?",
	})
	directories = append(directories, 
		getFilteredDirectoriesFromSource(query, getPinnedDirectories())...)
	directories = append(directories, directory{
		// Just make sure no one owns the hard drive or directory named this path
		location: "Disks+-*/=?",
	})
	directories = append(directories, 
		getFilteredDirectoriesFromSource(query, getExternalMediaFolders())...)
	return directories
	

}
func getFilteredDirectoriesFromSource(query string, source []directory) []directory {
	query = strings.ToLower(query)
	if query == "" {
		return source
	}

	var filteredDirectories []directory
	for _, dir := range source {
		if strings.Contains(strings.ToLower(dir.name), query) {
			filteredDirectories = append(filteredDirectories, dir)
		}
	}
	return filteredDirectories
}

src/internal/get_data.go

lazysegtree · 2025-02-14T17:18:30Z

@BhagatHarsh maybe dont spend time on fixing any comments for now. Let me send a patch.

BhagatHarsh · 2025-02-16T05:57:25Z

Some issues identified in testing

Rename feature after search does not work
If a sidebar search leads to a directory in which the cursor was not present then trying to directly go to that directory crashes the app.
after search the cursor may disappear (need to rerender from top)
when during the search no results are found, then we must display [None]

… directories are there

…ename

lazysegtree · 2025-02-17T13:38:20Z

src/internal/handle_panel_movement.go

@@ -404,135 +410,91 @@ func (m *model) itemSelectDown(wheel bool) {

 // ======================================== Sidebar controller ========================================

-// Yorukot: P.S God bless me, this sidebar controller code is really ugly...


@yorukot Please check the current code. I have improved it now.

Yes it's really great!!

lazysegtree · 2025-02-17T13:39:11Z

src/internal/handle_panel_movement.go

+	// Otherwise dividers are sometimes skipped in render in case of
+	// large pinned directories
+	s.updateRenderIndex(mainPanelHeight)
+	if s.directories[s.cursor].isDivider() {


Since s.noActualDir() is not true. There definitely are non-Divider normar directories, and code will never get stuck in infinite loop

lazysegtree · 2025-02-17T13:40:44Z

src/internal/internal_consts.go

+package internal
+
+// These are effectively consts
+var pinnedDividerDir = directory{


We have used a sentinel value, and we will use it everywhere instead of using "Pinned+-*/=?" string constant everywhere

anaypurohit0907 · 2025-02-17T14:18:26Z

src/internal/get_data.go

-		location: "Disks+-*/=?",
-	})
-	directories = append(directories, getExternalMediaFolders()...)
+func formDirctorySlice(homeDirectories []directory, pinnedDirectories []directory, diskDirectories []directory) []directory {


is this checking that no one owns the hard drive or directory ?

No, but why do we need that?

im assuming the original comment is talking about directories belonging to other users or os's , we dont want to display them as a normal directory, theyll need to be specifically displayed as not owned by current user.

@lazysegtree your thoughts?

Let me check this today. I have been wanting to test and understand the disk's part of sidebar, but my mac has no disks. I will try to set something up

@anaypurohit0907 external directories are displayed seperately.
Although we dont do any specific ownership check, we just utilize disk.Partitions from github.com/shirou/gopsutil/disk package, and get disk partitions. Additional partitions other then the current partitions of superfile are listed in disks section. Since they are displayed under disk's, we dont need to explicitly tell that "not owned by current user"

src/internal/handle_panel_movement.go

yorukot · 2025-02-19T12:48:07Z

Overall I think it's very good,Thanks for you guys! but I think the search bar should be hidden when not in use.

Of course, if you think this improvement is not good, please tell me, I am willing to discuss!

cc: @BhagatHarsh @lazysegtree

BhagatHarsh · 2025-02-19T13:34:57Z

Overall I think it's very good,Thanks for you guys! but I think the search bar should be hidden when not in use.

But then how will the user know that this feature exists?

This reverts commit defbf4b.

yorukot

Sorry my bad :/ I updated to the wrong branch.

…ebar

lazysegtree

Looks good now. I think we are okay to merge

BhagatHarsh and others added 4 commits February 11, 2025 20:45

feat: functional search added to side bar

4d89a63

refactor

01ebf87

fix: scroll index going out of bounds

b16e95d

Merge branch 'yorukot:main' into upgrade_sidebar_search

1543aec

refactor

1459e51

BhagatHarsh marked this pull request as draft February 13, 2025 04:51

BhagatHarsh added 3 commits February 14, 2025 18:29

more understanding & refactor

7c44439

bug fix

6e1103f

Update handle_panel_movement.go

2820347

BhagatHarsh marked this pull request as ready for review February 14, 2025 13:24

lazysegtree reviewed Feb 14, 2025

View reviewed changes

src/internal/get_data.go Outdated Show resolved Hide resolved

This comment was marked as outdated.

Sign in to view

lazysegtree requested changes Feb 14, 2025

View reviewed changes

src/internal/get_data.go Outdated Show resolved Hide resolved

BhagatHarsh and others added 3 commits February 14, 2025 21:03

feat: fuzzy search & navigation fixes

82d6e9c

chore: formatting

292f4aa

Merge branch 'main' into upgrade_sidebar_search

b6b890e

BhagatHarsh requested a review from lazysegtree February 14, 2025 15:35

This comment was marked as outdated.

Sign in to view

lazysegtree requested changes Feb 14, 2025

View reviewed changes

BhagatHarsh and others added 5 commits February 15, 2025 10:15

fix: remove comments

729f3a2

fix: Fix sidbarUp

391f482

fix: Removed extra newline causing panel breaking

1481ebf

fix: sideBarDown

7a01aa0

fix: Use divider consts and fix get Directory functions

eeeebaf

lazysegtree added 3 commits February 16, 2025 11:07

fix: sideBar render

7bde80f

fix: Formatted with gofmt

94ac1f9

fix: Remove unnecessary sort in fzf search, refractor fzf

c69b2c4

BhagatHarsh force-pushed the upgrade_sidebar_search branch from eb49be9 to c69b2c4 Compare February 16, 2025 05:37

lazysegtree and others added 4 commits February 16, 2025 17:52

fix: sidebar cursor reset, cursor rendering, handle edge case when no…

eefc52c

… directories are there

chore: formatting

eb3962b

fix: sidebar dirctory and cursor state management, prevent panic on r…

e41428d

…ename

fix: disk divider not rendering in case of lot of pinned dirs

6bc2257

lazysegtree force-pushed the upgrade_sidebar_search branch from 459188b to 6bc2257 Compare February 17, 2025 13:33

lazysegtree previously approved these changes Feb 17, 2025

View reviewed changes

lazysegtree reviewed Feb 17, 2025

View reviewed changes

lazysegtree requested a review from yorukot February 17, 2025 14:04

anaypurohit0907 reviewed Feb 17, 2025

View reviewed changes

src/internal/handle_panel_movement.go Show resolved Hide resolved

feat: Make sidebar search hide when not focused

775ec0e

yorukot previously approved these changes Feb 19, 2025

View reviewed changes

yorukot added 2 commits February 19, 2025 21:41

feat: Change all outPutLog to slog.Error or slog.Info

defbf4b

Revert "feat: Change all outPutLog to slog.Error or slog.Info"

9bbb36c

This reverts commit defbf4b.

yorukot reviewed Feb 19, 2025

View reviewed changes

feat: Make sidebar automatically hide when not in use and unfocus sid…

9879842

…ebar

BhagatHarsh dismissed stale reviews from yorukot and lazysegtree via 9879842 February 20, 2025 09:43

lazysegtree approved these changes Feb 20, 2025

View reviewed changes

yorukot merged commit 0cd46c4 into yorukot:main Feb 20, 2025
6 checks passed

BhagatHarsh deleted the upgrade_sidebar_search branch February 22, 2025 03:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade sidebar search #614

Upgrade sidebar search #614

BhagatHarsh commented Feb 12, 2025 •

edited by lazysegtree

Loading

netlify bot commented Feb 12, 2025 •

edited

Loading

lazysegtree commented Feb 14, 2025

lazysegtree commented Feb 14, 2025 •

edited

Loading

lazysegtree commented Feb 14, 2025 •

edited

Loading

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

lazysegtree commented Feb 14, 2025

BhagatHarsh commented Feb 16, 2025 •

edited by lazysegtree

Loading

lazysegtree Feb 17, 2025

yorukot Feb 19, 2025

lazysegtree Feb 17, 2025 •

edited

Loading

lazysegtree Feb 17, 2025

anaypurohit0907 Feb 17, 2025

BhagatHarsh Feb 19, 2025

anaypurohit0907 Feb 19, 2025

lazysegtree Feb 19, 2025

lazysegtree Feb 20, 2025

yorukot commented Feb 19, 2025

BhagatHarsh commented Feb 19, 2025

yorukot left a comment

lazysegtree left a comment

		@@ -404,135 +410,91 @@ func (m *model) itemSelectDown(wheel bool) {

		// ======================================== Sidebar controller ========================================

		// Yorukot: P.S God bless me, this sidebar controller code is really ugly...

Upgrade sidebar search #614

Upgrade sidebar search #614

Conversation

BhagatHarsh commented Feb 12, 2025 • edited by lazysegtree Loading

netlify bot commented Feb 12, 2025 • edited Loading

✅ Deploy Preview for superfile canceled.

lazysegtree commented Feb 14, 2025

lazysegtree commented Feb 14, 2025 • edited Loading

lazysegtree commented Feb 14, 2025 • edited Loading

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

lazysegtree commented Feb 14, 2025

BhagatHarsh commented Feb 16, 2025 • edited by lazysegtree Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lazysegtree Feb 17, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yorukot commented Feb 19, 2025

BhagatHarsh commented Feb 19, 2025

yorukot left a comment

Choose a reason for hiding this comment

lazysegtree left a comment

Choose a reason for hiding this comment

BhagatHarsh commented Feb 12, 2025 •

edited by lazysegtree

Loading

netlify bot commented Feb 12, 2025 •

edited

Loading

lazysegtree commented Feb 14, 2025 •

edited

Loading

lazysegtree commented Feb 14, 2025 •

edited

Loading

BhagatHarsh commented Feb 16, 2025 •

edited by lazysegtree

Loading

lazysegtree Feb 17, 2025 •

edited

Loading