Implement most icons from https://github.com/Peltoche/lsd/issues/764 #765

TruncatedDinoSour · 2022-11-04T13:01:55Z

Implement most icons from #764

TODO

Add necessary tests
Use cargo fmt
Add changelog entry
Update default config/theme in README (if applicable)
Update man page at lsd/doc/lsd.md (if applicable)

Issue: #764

Extra

PKGBUILD -- Arch Linux package manifests
*.jsonc -- JSON with comments
*.trash -- Trash info files

Unimplemented

Didn't implement these because I couldn't find a good icon
or is just downright impossible to implement

Couldn't improve icon for executables
config.* -- Configuration files
Makefile* -- Make config
.*_history -- History files for readline-like
- .gdb_history -- GDB debugger history
- .lesshst -- less history
Kconfig.* -- Specific kernel config file
Kbuild.* -- Specific kernel build file
Makefile* -- Make config
TODO* -- TODOs
- FAQ* -- FAQ
- LEGACY* -- Legacy statement
var/ -- Variable files
mnt/ -- Mounts
proc/ -- Processes
usr/ -- Universal system repository
dev/ -- Device files
boot/ -- Bootloader files
opt/ -- Optional applications
sys/ -- System files
tests/ -- Tests for code
- test/ -- Test dir
Media/ -- Media dir
rc.conf -- OpenRC config
- init.d/ -- OpenRC services
content/ -- Content dir
page/ -- Pages
resources/ -- Resources for programs
- static/ -- Static resources
completions/ -- Shell completions
target/ -- Target files
dist/ -- Destination files
- dest/ -- Destination files
.local/ -- Local files
- local/ -- Local files

- PKGBUILD -- Arch Linux package manifests Didn't implement these because I couldn't find a good icon or is just downright impossible to implement - config.\* -- Configuration files - Makefile\* -- Make config - .\*_history -- History files for readline-like - .gdb_history -- GDB debugger history - .lesshst -- `less` history - Kconfig.\* -- Specific kernel config file - Kbuild.\* -- Specific kernel build file - Makefile\* -- Make config - TODO\* -- TODOs - FAQ\* -- FAQ - LEGACY\* -- Legacy statement - var/ -- Variable files - mnt/ -- Mounts - proc/ -- Processes - usr/ -- Universal system repository - dev/ -- Device files - boot/ -- Bootloader files - opt/ -- Optional applications - sys/ -- System files - src/ -- source code - tests/ -- Tests for code - test/ -- Test dir - Media/ -- Media dir - rc.conf -- OpenRC config - init.d/ -- OpenRC services - content/ -- Content dir - page/ -- Pages - resources/ -- Resources for programs - static/ -- Static resources - completions/ -- Shell completions - target/ -- Target files - dist/ -- Destination files - dest/ -- Destination files - .local/ -- Local files - local/ -- Local files Signed-off-by: Ari Archer <[email protected]>

codecov-commenter · 2022-11-04T13:07:05Z

Codecov Report

Merging #765 (ea7c1a7) into master (c2cf835) will not change coverage.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master     #765   +/-   ##
=======================================
  Coverage   86.68%   86.68%           
=======================================
  Files          44       44           
  Lines        4332     4332           
=======================================
  Hits         3755     3755           
  Misses        577      577

Impacted Files	Coverage Δ
src/theme/icon.rs	`100.00% <100.00%> (ø)`

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Signed-off-by: Ari Archer <[email protected]>

TruncatedDinoSour · 2022-11-07T01:35:47Z

(omg you can press on the checkboxes to check the TODO items, just noticed)

meain

Thanks for the PR! Just a few nits.

PS: do sort the list at the end.

CHANGELOG.md

src/theme/icon.rs

Co-authored-by: Abin Simon <[email protected]>

TruncatedDinoSour · 2022-11-13T12:36:59Z

Thanks for the PR! Just a few nits.

PS: do sort the list at the end.

resolved the comments, I made an issue: #767
now, the sorting, I made a lot of changes, is there a way to sort them automatically ?

TruncatedDinoSour · 2022-11-13T12:49:18Z

CI is failing, but not my fault

/Users/runner/work/_temp/408d3e77-a049-4ce2-a580-fd8b0905ad74.sh: line 1: pandoc: command not found

meain · 2022-11-13T15:28:14Z

@TruncatedDinoSour , let me take care of the CI. Seems like there is a conflict. Can you rebase the changes you have on top of current master. Will need that to merge in the PR. Let me know if you need any help with rebasing. :D

TruncatedDinoSour · 2022-11-13T17:03:52Z

@TruncatedDinoSour , let me take care of the CI. Seems like there is a conflict. Can you rebase the changes you have on top of current master. Will need that to merge in the PR. Let me know if you need any help with rebasing. :D

excuse my stupidity, how do I do that LMFAO, I mean I can try to seperate CHANGELOG.md into a different PR ?

Found this brb https://stackoverflow.com/questions/7297379/how-do-you-rebase-the-current-branchs-changes-on-top-of-changes-being-merged-in

Didn't work

ari@ari-gentoo (master) lsd % g pull
Enter passphrase for key '/home/ari/.ssh/id_ed25519':
remote: Enumerating objects: 87, done.
remote: Counting objects: 100% (87/87), done.
remote: Compressing objects: 100% (57/57), done.
remote: Total 87 (delta 46), reused 51 (delta 29), pack-reused 0
Unpacking objects: 100% (87/87), 46.53 KiB | 330.00 KiB/s, done.
From github.com:TruncatedDinosour/lsd
   d433b30..ab5b5de  master     -> origin/master
Updating d433b30..ab5b5de
Fast-forward
 .github/workflows/CICD.yml |   2 +-
 CHANGELOG.md               |  12 +++++---
 Cargo.lock                 |  69 +++++++++++++++++++++++++++++++++++++++----
 Cargo.toml                 |   2 +-
 build.rs                   |   4 +--
 src/app.rs                 |   6 ++++
 src/flags/display.rs       |  22 ++++++++++++++
 src/main.rs                |   2 +-
 src/meta/mod.rs            |  23 +++++++++++++--
 src/meta/windows_utils.rs  | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------
 src/theme/icon.rs          |  14 ++++-----
 11 files changed, 248 insertions(+), 98 deletions(-)

ari@ari-gentoo (master) lsd % g rebase master
Current branch master is up to date.

ari@ari-gentoo (master) lsd % git rebase origin/master
Current branch master is up to date.

TruncatedDinoSour · 2022-11-13T17:15:41Z

jesus crist, how do y'all afford CI, 19 checks per change, like iirc windows CI is extremely expensive, I feel bad for your wallet

meain · 2022-11-14T04:26:21Z

now, the sorting, I made a lot of changes, is there a way to sort them automatically ?

I would personally copy all the line to clipboard, sort items in clipboard using sort and then paste the sorted items back. I do this through an editor plugin, but you can do this manually.

Since you introduced a merge commit and GitHub does not seem to like it as we have only enable rebase on this repo. Could you squash all your commits into a single one and rebase one the latest master afterwards?

jesus crist, how do y'all afford CI, 19 checks per change, like iirc windows CI is extremely expensive, I feel bad for your wallet

CI is completely free for open source projects on GitHub(and a lot of other services).

TruncatedDinoSour · 2022-11-14T13:11:23Z

now, the sorting, I made a lot of changes, is there a way to sort them automatically ?

I would personally copy all the line to clipboard, sort items in clipboard using sort and then paste the sorted items back. I do this through an editor plugin, but you can do this manually.

Since you introduced a merge commit and GitHub does not seem to like it as we have only enable rebase on this repo. Could you squash all your commits into a single one and rebase one the latest master afterwards?

jesus crist, how do y'all afford CI, 19 checks per change, like iirc windows CI is extremely expensive, I feel bad for your wallet

CI is completely free for open source projects on GitHub(and a lot of other services).

I'm sorry, I have an IT competition tmrw, I'll do this tmrw when I get back home

TruncatedDinoSour · 2022-11-16T12:51:39Z

now, the sorting, I made a lot of changes, is there a way to sort them automatically ?

I would personally copy all the line to clipboard, sort items in clipboard using sort and then paste the sorted items back. I do this through an editor plugin, but you can do this manually.

Since you introduced a merge commit and GitHub does not seem to like it as we have only enable rebase on this repo. Could you squash all your commits into a single one and rebase one the latest master afterwards?

jesus crist, how do y'all afford CI, 19 checks per change, like iirc windows CI is extremely expensive, I feel bad for your wallet

CI is completely free for open source projects on GitHub(and a lot of other services).

kay now this, lemme do it

Signed-off-by: Ari Archer <[email protected]>

TruncatedDinoSour · 2022-11-16T13:07:55Z

error: could not apply dd5f83d... Added entry for adding icon for kt and kts files

I want to kms

TruncatedDinoSour · 2022-11-16T13:09:35Z

why tf are half a shitton of lines gone in that commit

TruncatedDinoSour · 2022-11-16T13:10:04Z

@meain Could you help me out ? I'm unable to squash them

zwpaper · 2022-11-17T03:49:31Z

Hi, I have done the squash and rebase for you, but I do not have the permission to push your repo.

please check https://github.com/zwpaper/lsd/tree/squash-icons, and force push to https://github.com/TruncatedDinosour/lsd master if i did it right.

zwpaper · 2022-11-17T03:49:41Z

@TruncatedDinoSour

TruncatedDinoSour · 2022-11-17T16:07:07Z

Hi, I have done the squash and rebase for you, but I do not have the permission to push your repo.

please check https://github.com/zwpaper/lsd/tree/squash-icons, and force push to https://github.com/TruncatedDinosour/lsd master if i did it right.

thank you !!!

TruncatedDinoSour · 2022-11-17T16:11:18Z

#774

TruncatedDinoSour requested review from meain and Peltoche as code owners November 4, 2022 13:01

Ari Archer and others added 8 commits November 4, 2022 15:16

Add changelog entry

74add33

Signed-off-by: Ari Archer <[email protected]>

Add JSONC icon, add things to changelog

fbf0f6c

Signed-off-by: Ari Archer <[email protected]>

Improve executable file icon(s)

e51032e

Signed-off-by: Ari Archer <[email protected]>

Add src icon

6bb939a

Signed-off-by: Ari Archer <[email protected]>

Improve jinja and jinja2 icons

86bb153

Signed-off-by: Ari Archer <[email protected]>

Add trash info file icons

287ebad

Signed-off-by: Ari Archer <[email protected]>

Fix code style

d433b30

Signed-off-by: Ari Archer <[email protected]>

Add my username to changelog :)

e939f75

meain requested changes Nov 7, 2022

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

src/theme/icon.rs Outdated Show resolved Hide resolved

src/theme/icon.rs Outdated Show resolved Hide resolved

src/theme/icon.rs Outdated Show resolved Hide resolved

src/theme/icon.rs Outdated Show resolved Hide resolved

TruncatedDinoSour and others added 2 commits November 7, 2022 14:04

Update CHANGELOG.md

4db6f6c

Co-authored-by: Abin Simon <[email protected]>

Update icon.rs

1b01ecf

TruncatedDinoSour requested review from meain and removed request for Peltoche November 12, 2022 10:53

TruncatedDinoSour added 4 commits November 13, 2022 12:25

Update icon.rs

58631f4

Update icon.rs

62a59a2

Update icon.rs

f384c1c

Update CHANGELOG.md

765cabe

TruncatedDinoSour mentioned this pull request Nov 13, 2022

Better executable file icon (#765 and #764) #767

Closed

TruncatedDinoSour added 2 commits November 13, 2022 12:38

Merge branch 'master' into master

1fac0c0

Fix config for executables

d500da6

Merge branch 'master' into master

ab5b5de

TruncatedDinoSour and others added 3 commits November 16, 2022 12:53

Sort lists

41e86e3

Reset changelog

d90946b

Signed-off-by: Ari Archer <[email protected]>

Add entries for @TruncatedDinoSour

d6f12ce

Signed-off-by: Ari Archer <[email protected]>

Merge branch 'Peltoche:master' into master

ea7c1a7

TruncatedDinoSour closed this Nov 17, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement most icons from https://github.com/Peltoche/lsd/issues/764 #765

Implement most icons from https://github.com/Peltoche/lsd/issues/764 #765

TruncatedDinoSour commented Nov 4, 2022 •

edited

Loading

codecov-commenter commented Nov 4, 2022 •

edited

Loading

TruncatedDinoSour commented Nov 7, 2022

meain left a comment

TruncatedDinoSour commented Nov 13, 2022

TruncatedDinoSour commented Nov 13, 2022

meain commented Nov 13, 2022

TruncatedDinoSour commented Nov 13, 2022 •

edited

Loading

TruncatedDinoSour commented Nov 13, 2022 •

edited

Loading

meain commented Nov 14, 2022

TruncatedDinoSour commented Nov 14, 2022

TruncatedDinoSour commented Nov 16, 2022

TruncatedDinoSour commented Nov 16, 2022

TruncatedDinoSour commented Nov 16, 2022

TruncatedDinoSour commented Nov 16, 2022

zwpaper commented Nov 17, 2022

zwpaper commented Nov 17, 2022

TruncatedDinoSour commented Nov 17, 2022

TruncatedDinoSour commented Nov 17, 2022

Implement most icons from https://github.com/Peltoche/lsd/issues/764 #765

Implement most icons from https://github.com/Peltoche/lsd/issues/764 #765

Conversation

TruncatedDinoSour commented Nov 4, 2022 • edited Loading

Implement most icons from #764

TODO

Extra

Unimplemented

codecov-commenter commented Nov 4, 2022 • edited Loading

Codecov Report

TruncatedDinoSour commented Nov 7, 2022

meain left a comment

Choose a reason for hiding this comment

TruncatedDinoSour commented Nov 13, 2022

TruncatedDinoSour commented Nov 13, 2022

meain commented Nov 13, 2022

TruncatedDinoSour commented Nov 13, 2022 • edited Loading

TruncatedDinoSour commented Nov 13, 2022 • edited Loading

meain commented Nov 14, 2022

TruncatedDinoSour commented Nov 14, 2022

TruncatedDinoSour commented Nov 16, 2022

TruncatedDinoSour commented Nov 16, 2022

TruncatedDinoSour commented Nov 16, 2022

TruncatedDinoSour commented Nov 16, 2022

zwpaper commented Nov 17, 2022

zwpaper commented Nov 17, 2022

TruncatedDinoSour commented Nov 17, 2022

TruncatedDinoSour commented Nov 17, 2022

TruncatedDinoSour commented Nov 4, 2022 •

edited

Loading

codecov-commenter commented Nov 4, 2022 •

edited

Loading

TruncatedDinoSour commented Nov 13, 2022 •

edited

Loading

TruncatedDinoSour commented Nov 13, 2022 •

edited

Loading