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.

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

Fix .git folder exclusion and file counter #7

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Fix .git folder exclusion and file counter #7

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c191dd4
Add icons to custom file tree
jteijema Dec 22, 2022
287c2f7
Add figures to print
jteijema Dec 22, 2022
8f7928f
Add arguments to main
jteijema Dec 22, 2022
0e7ce5b
Add icons to output
jteijema Dec 22, 2022
1582f18
Add serial data
jteijema Dec 22, 2022
7a6ed9c
Add folder icon to output
jteijema Dec 22, 2022
39d4f30
Change up colors
jteijema Dec 22, 2022
7aa9cc7
Update tree.py
jteijema Dec 22, 2022
84942f8
Make icons conditional
jteijema Dec 22, 2022
4ca7782
Add single directory detection in output text
jteijema Dec 22, 2022
70c80da
Merge branch 'J535D165:main' into main
jteijema Jan 12, 2023
7d4247d
Fix issue with excluded folders
jteijema Jan 12, 2023
47fdaeb
Change else to simple return
jteijema Jan 12, 2023
850c2b0
Happy lint maybe
jteijema Mar 30, 2023
adbb5af
Update for flake8-import-order
jteijema Mar 30, 2023
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
20 changes: 11 additions & 9 deletions scitree/tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,24 @@
import seedir as sd

from scitree.styling import DATA_COLOR
from scitree.styling import README_COLOR
from scitree.styling import SCRIPT_COLOR
from scitree.styling import FIGURE_COLOR
from scitree.styling import SERIAL_COLOR
from scitree.styling import DATA_ICON
from scitree.styling import README_ICON
from scitree.styling import SCRIPT_ICON
from scitree.styling import FIGURE_COLOR
from scitree.styling import FIGURE_ICON
from scitree.styling import FOLDER_ICON
from scitree.styling import README_COLOR
from scitree.styling import README_ICON
from scitree.styling import SCRIPT_COLOR
from scitree.styling import SCRIPT_ICON
from scitree.styling import SERIAL_COLOR
from scitree.styling import SERIAL_ICON

from scitree.styling import natsort_scitree_style


def _file_count(d, n_files=0, n_folders=0, mask=None, exclude_folders=[]):

for f in Path(d).iterdir():

if mask is None or not mask(str(f)):
if mask is None or mask(str(f)):
if f.is_file():
n_files += 1
else:
Expand All @@ -47,7 +46,7 @@ def scitree(
formatter=natsort_scitree_style,
gitignore=True,
first="files",
exclude_folders=[".git"],
exclude_folders=[],
icons=False,
**kwargs
):
Expand All @@ -56,6 +55,9 @@ def scitree(
gi_matcher = gitignorefile.parse(Path(p, ".gitignore"))

def gi_mask(x):
for f in exclude_folders:
if x == str(Path(p).absolute()) + "\\" + f:
return False
return not gi_matcher(x)

else:
Expand Down