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: Update filtetypes #78

Merged
merged 1 commit into from Jan 26, 2022
Merged

feat: Update filtetypes #78

merged 1 commit into from Jan 26, 2022

Conversation

ixti
Copy link
Contributor

@ixti ixti commented Jan 8, 2022

  • Reorder core filetypes as displayed by: dircolors --print-database
  • Add new core filetypes:
    • reset_to_normal
    • multi_hard_link
    • door
    • setuid
    • setgid

Closes: #39

* Reorder core filetypes as displayed by: `dircolors --print-database`
* Add new core filetypes:
  * reset_to_normal
  * multi_hard_link
  * door
  * setuid
  * setgid

See-Also: sharkdp#39
@ixti ixti mentioned this pull request Jan 8, 2022
@sharkdp
Copy link
Owner

sharkdp commented Jan 23, 2022

Thank you very much!

Did you run some (manual) tests to make sure that the output still looks the same for all themes (on old filetypes)?

@sharkdp sharkdp mentioned this pull request Jan 23, 2022
@ixti
Copy link
Contributor Author

ixti commented Jan 24, 2022

Did you run some (manual) tests to make sure that the output still looks the same for all themes (on old filetypes)?

Only for the gruvbox :D But I've created a small scripts to test, and that revealed some problems:

  • I've messed up updating some of the themes (will fix shortly)
  • core.file_with_capability seems not to work :((

UPDATE: I've used wrong theme files that lead me to believe I've messed existing themes. In fact it's all good :D

@ixti
Copy link
Contributor Author

ixti commented Jan 24, 2022

Auy

image

Iceberg-Dark

image

Jellybeans

image

Lava

image

Molokai

image

Nord

image

One-Dark

image

One-Light

image

Snazzy

image

Solorized Dark

image

Solorized Light

image

@sharkdp
Copy link
Owner

sharkdp commented Jan 24, 2022

Only for the gruvbox :D But I've created a small scripts to test

nice! We could even pipe the output of ls --color=always to a file. In this way, we could diff the output of vivid on master and vivid on this feature branch. No need for visual inspection.

@ixti
Copy link
Contributor Author

ixti commented Jan 24, 2022

@sharkdp updated the script to allow me run diffing:

for theme in \
  ayu \
  iceberg-dark \
  jellybeans \
  lava \
  molokai \
  nord \
  one-dark \
  one-light \
  snazzy \
  solarized-dark \
  solarized-light
do
  echo "*** ${theme}"

  ./test-theme ../vivid-master/config/filetypes.yml "../vivid-master/themes/${theme}.yml" > "old-${theme}"
  ./test-theme ./config/filetypes.yml "./themes/${theme}.yml" > "new-${theme}"

  diff --color "old-${theme}" "new-${theme}"

  rm -f "old-${theme}" "new-${theme}"
done

And, seems like there are some bits to fix :D

@ixti
Copy link
Contributor Author

ixti commented Jan 24, 2022

Oh. I get it now:

> vivid --database ../vivid-master/config/filetypes.yml generate ../vivid-master/themes/ayu.yml | grep -q su && echo "aye" || echo "nay" 
nay

> vivid --database config/filetypes.yml generate themes/ayu.yml | grep -q su && echo "aye" || echo "nay"      
aye

@ixti

This comment has been minimized.

@ixti
Copy link
Contributor Author

ixti commented Jan 24, 2022

Prepending generated LS_COLORS with reset all:

LS_COLORS="no=0:fi=0:rs=0:di=0:ln=0:mh=0:pi=0:so=0:do=0:bd=0:cd=0:or=0:mi=0:su=0:sg=0:ca=0:tw=0:ow=0:st=0:ex=0:${LS_COLORS}"

Shows there will be no difference in most themes. Those with difference (as per diff command) don't look different to my eye.

Copy link
Owner

@sharkdp sharkdp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you very much for looking into it again!

@sharkdp sharkdp merged commit 9fa6b56 into sharkdp:master Jan 26, 2022
@ixti ixti deleted the enhance-filetypes branch January 26, 2022 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants