Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
catfish
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
18
Issues
18
List
Boards
Labels
Service Desk
Milestones
Custom Issue Tracker
Custom Issue Tracker
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Apps
catfish
Commits
cac84de5
Commit
cac84de5
authored
Dec 14, 2019
by
Filip Brygidyn
Committed by
Sean Davis
Dec 19, 2019
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Walk Method: Improve link traversal skipping
Signed-off-by:
Sean Davis
<
smd.seandavis@gmail.com
>
parent
3941aca5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
catfish/CatfishSearchEngine.py
catfish/CatfishSearchEngine.py
+7
-2
No files found.
catfish/CatfishSearchEngine.py
View file @
cac84de5
...
...
@@ -296,7 +296,7 @@ class CatfishSearchMethod_Walk(CatfishSearchMethod):
"""Initialize the 'walk' Search Method."""
CatfishSearchMethod
.
__init__
(
self
,
"walk"
)
def
get_dir_list
(
self
,
root
,
dirs
,
xdg_list
,
exclude_list
):
def
get_dir_list
(
self
,
root
,
dirs
,
xdg_list
,
exclude_list
,
processed_links
):
dirs
=
sorted
(
dirs
,
key
=
lambda
s
:
s
.
lower
())
# Prioritize: XDG, Visible (Linked), Dotfile (Linked)
...
...
@@ -316,6 +316,11 @@ class CatfishSearchMethod_Walk(CatfishSearchMethod):
xdgdirs
.
append
(
path
)
continue
islink
=
os
.
path
.
islink
(
path
)
if
islink
:
realpath
=
os
.
path
.
realpath
(
path
)
if
realpath
in
processed_links
:
continue
processed_links
.
append
(
realpath
)
if
os
.
path
.
basename
(
path
).
startswith
(
"."
):
if
islink
:
dotlinks
.
append
(
path
)
...
...
@@ -378,7 +383,7 @@ class CatfishSearchMethod_Walk(CatfishSearchMethod):
processed_links
.
append
(
realpath
)
# Prioritize and drop excluded paths
dirs
[:]
=
self
.
get_dir_list
(
root
,
dirs
,
xdgdirlist
,
exclude
)
dirs
[:]
=
self
.
get_dir_list
(
root
,
dirs
,
xdgdirlist
,
exclude
,
processed_links
)
paths
=
dirs
+
files
paths
.
sort
()
...
...
Administrator
@root
mentioned in commit
fdb9376d
·
Jan 16, 2020
mentioned in commit
fdb9376d
mentioned in commit fdb9376dc63a3433814810adbf581af0d78813f6
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment