Compare commits

...

2 Commits

Author SHA1 Message Date
~d6 a6ff7cacf3 Skip common prefixes.
When a common prefix is shared by all tracks (or folders) in a given
directory, replace it with "..." when displaying the names.

We'll only do this if the prefix is > 3 characters long, since
otherwise the ellipses aren't any shorter.
2024-08-29 21:33:31 -04:00
~d6 a41af01ae2 fix bug with sorting zero elements 2024-08-29 21:20:33 -04:00
1 changed files with 56 additions and 3 deletions

View File

@ -13,6 +13,7 @@
@selection $1 &mod $1 &track $1 &scroll $1 @selection $1 &mod $1 &track $1 &scroll $1
@path $2 &null $80 @path $2 &null $80
@lines &folders $1 &tracks $1 @lines &folders $1 &tracks $1
@prefix &folders $1 &tracks $1
@playing $1 @playing $1
@mode $1 @mode $1
@paused $1 @paused $1
@ -335,7 +336,7 @@
&w ( -- ) &w ( -- )
DUP2 <parse-line> DUP2 <parse-line>
lcap/ INC2 LDAk ?&w lcap/ INC2 LDAk ?&w
POP2 sort-folders sort-tracks POP2 <post-refresh>
( >> ) ( >> )
@<fit-window> ( -- ) @<fit-window> ( -- )
@ -387,10 +388,29 @@
POP2 INC2 INC2r !&>loop POP2 INC2 INC2r !&>loop
&done NIP2 LTH POP2r JMP2r &done NIP2 LTH POP2r JMP2r
@str-len ( a* -- len^ )
LITr 00 &loop LDAk ?{ POP2 STHr JMP2r } INCr INC2 !&loop
@str-prefix ( a* b* -- len^ )
STH2 DUP2 ,&a0 STR2 ( a* [b*] ; a0<-a )
&loop LDAk LDAkr STHr NEQk ?&done ( a1* ca^ cb^ [b1*] )
DUP2 #0000 EQU2 ?&done ( a1* ca^ cb^ [b1*] )
POP2 INC2 INC2r !&loop ( a1+1* [b1+1*] )
&done POP2 POP2r ( a1* )
LIT2 [ &a0 $2 ] SUB2 NIP JMP2r ( len^ )
@<post-refresh> ( -- )
common-folder-prefix .prefix/folders STZ
common-track-prefix .prefix/tracks STZ
sort-folders
!sort-tracks
@sort-folders ( -- ) @sort-folders ( -- )
.lines/folders LDZ ?{ JMP2r }
;mem/folders DUP2 LIT2 [ 00 -lines/folders ] LDZ #01 SUB #70 SFT2 ADD2 !sort-tracks-0 ;mem/folders DUP2 LIT2 [ 00 -lines/folders ] LDZ #01 SUB #70 SFT2 ADD2 !sort-tracks-0
@sort-tracks ( -- ) @sort-tracks ( -- )
.lines/tracks LDZ ?{ JMP2r }
;mem/tracks DUP2 LIT2 [ 00 -lines/tracks ] LDZ #01 SUB #70 SFT2 ADD2 ;mem/tracks DUP2 LIT2 [ 00 -lines/tracks ] LDZ #01 SUB #70 SFT2 ADD2
( >> ) ( >> )
@ -412,6 +432,26 @@
JMP2r JMP2r
&skip POP2 POP2 JMP2r &skip POP2 POP2 JMP2r
@min ( x^ y^ -- min^ )
LTHk JMP SWP POP JMP2r
@common-folder-prefix ( -- )
.lines/folders LDZ ?{ JMP2r }
;mem/folders DUP2 LIT2 [ 00 -lines/folders ] LDZ #70 SFT2 ADD2
!common-prefix-0
@common-track-prefix ( -- )
.lines/tracks LDZ ?{ JMP2r }
;mem/tracks DUP2 LIT2 [ 00 -lines/tracks ] LDZ #70 SFT2 ADD2
( >> )
@common-prefix-0 ( first* limit* -- )
SWP2 DUP2k str-len STH ( limit* first* first* [len^] )
,&s0 STR2 #0080 ADD2 ( limit* first+128* [len^] )
&loop GTH2k ?&ok POP2 POP2 STHr JMP2r ( len^ )
&ok DUP2 LIT2 [ &s0 $2 ] str-prefix ( limit* curr* p^ [len^] )
STHr min STH #0080 ADD2 !&loop ( last* next+128* [min-p-len2^] )
@count-lines ( -- lines ) @count-lines ( -- lines )
.lines/folders LDZ .lines/tracks LDZ ADD JMP2r .lines/folders LDZ .lines/tracks LDZ ADD JMP2r
@ -538,7 +578,7 @@
( | normal ) ( | normal )
#0008 .Screen/x DEO2 #0008 .Screen/x DEO2
#00 OVR .selection/scroll LDZ ADD #00 OVR .selection/scroll LDZ ADD
( CELLSIZE ) #70 SFT2 [ LIT2 &t $2 ] ADD2 STHr <draw-uf2> ( CELLSIZE ) #70 SFT2 [ LIT2 &t $2 ] ADD2 STHr <draw-uf2-track>
.Screen/y DEI2k #0010 ADD2 ROT DEO2 .Screen/y DEI2k #0010 ADD2 ROT DEO2
INC GTHk ?&>l INC GTHk ?&>l
POP2 JMP2r POP2 JMP2r
@ -763,7 +803,7 @@
( | normal ) ( | normal )
#0008 .Screen/x DEO2 #0008 .Screen/x DEO2
#00 OVR #00 OVR
( CELLSIZE ) #70 SFT2 [ LIT2 &t $2 ] ADD2 STHr <draw-uf2> ( CELLSIZE ) #70 SFT2 [ LIT2 &t $2 ] ADD2 STHr <draw-uf2-folder>
.Screen/y DEI2k #0010 ADD2 ROT DEO2 .Screen/y DEI2k #0010 ADD2 ROT DEO2
INC GTHk ?&>l INC GTHk ?&>l
POP2 JMP2r POP2 JMP2r
@ -779,6 +819,18 @@
STH STH
.Screen/x DEI2 OVR2 get-uf2-width #01 SFT2 SUB2 .Screen/x DEO2 .Screen/x DEI2 OVR2 get-uf2-width #01 SFT2 SUB2 .Screen/x DEO2
STHr STHr
!<draw-uf2>
@<draw-uf2-folder> ( text* color -- )
STH .prefix/folders LDZ #03 GTH ?{ STHr !<draw-uf2> }
;dict/ellipses STHkr <draw-uf2>
LIT2 [ 00 -prefix/folders ] LDZ ADD2 STHr
!<draw-uf2>
@<draw-uf2-track> ( text* color -- )
STH .prefix/tracks LDZ #03 GTH ?{ STHr !<draw-uf2> }
;dict/ellipses STHkr <draw-uf2>
LIT2 [ 00 -prefix/tracks ] LDZ ADD2 STHr
( >> ) ( >> )
@<draw-uf2> ( text* color -- ) @<draw-uf2> ( text* color -- )
@ -939,6 +991,7 @@
&pause-cmd "pause 0a $1 &pause-cmd "pause 0a $1
&no-artist "Unknown 20 "Artist $1 &no-artist "Unknown 20 "Artist $1
&no-album "Unknown 20 "Album $1 &no-album "Unknown 20 "Album $1
&ellipses "... $1
~src/assets.tal ~src/assets.tal