summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames D. Smith <smithjd15@gmail.com>2021-09-15 17:36:45 -0600
committerWilliam Wilgus <me.theuser@yahoo.com>2021-09-17 21:42:05 -0400
commitfb04b9b5ee4cc55900a3c93da16de7eeb99535e2 (patch)
treeed0228b858793cd770c9548f90b78cb8080b2c00
parentfcb9c068526cf1e565a05e6b6ccc50dc3e5ba0d5 (diff)
downloadrockbox-fb04b9b5ee4cc55900a3c93da16de7eeb99535e2.tar.gz
rockbox-fb04b9b5ee4cc55900a3c93da16de7eeb99535e2.zip
Database: Merge 'Album Artist' entry with 'Artist' entry.
-Link 'Artist' entry to canonicalartist field. -Convert all possible users of artist field to canonicalartist. -Tweak 'Same as current -> Artist' menu to also include albumartist field matches. Change-Id: I52e87cc0bd6ca50f1645447819ca55669df37354
-rw-r--r--apps/tagnavi.config84
1 files changed, 41 insertions, 43 deletions
diff --git a/apps/tagnavi.config b/apps/tagnavi.config
index 80f891dd94..254fe04092 100644
--- a/apps/tagnavi.config
+++ b/apps/tagnavi.config
@@ -12,12 +12,12 @@
12%format "fmt_title" "%s - %02d:%02d" title Lm Ls 12%format "fmt_title" "%s - %02d:%02d" title Lm Ls
13%format "fmt_alphanum_title" "%s - %02d:%02d (%s)" basename Lm Ls filename ? title == "<Untagged>" 13%format "fmt_alphanum_title" "%s - %02d:%02d (%s)" basename Lm Ls filename ? title == "<Untagged>"
14%format "fmt_alphanum_title" "%s - %02d:%02d" title Lm Ls 14%format "fmt_alphanum_title" "%s - %02d:%02d" title Lm Ls
15%format "fmt_mostplayed" "%2d|%3d %s (%s)" playcount autoscore title artist %sort = "inverse" %limit = "100" 15%format "fmt_mostplayed" "%2d|%3d %s (%s)" playcount autoscore title canonicalartist %sort = "inverse" %limit = "100"
16%format "fmt_lastplayed" "%06d%s - %s" lastplayed artist title %sort = "inverse" %limit = "99" %strip = "6" 16%format "fmt_lastplayed" "%06d%s - %s" lastplayed canonicalartist title %sort = "inverse" %limit = "99" %strip = "6"
17%format "fmt_forgotten" "%06d%s - %s" lastplayed artist title %limit = "99" %strip = "6" 17%format "fmt_forgotten" "%06d%s - %s" lastplayed canonicalartist title %limit = "99" %strip = "6"
18%format "fmt_best_tracks" "%02d. %s (%3d)" tracknum title autoscore 18%format "fmt_best_tracks" "%02d. %s (%3d)" tracknum title autoscore
19%format "fmt_score" "(%3d) %s-%s" autoscore title artist 19%format "fmt_score" "(%3d) %s-%s" autoscore title canonicalartist
20%format "fmt_rating" "(%2d) %s-%s" rating title artist %sort = "inverse" 20%format "fmt_rating" "(%2d) %s-%s" rating title canonicalartist %sort = "inverse"
21 21
22# Include our custom menu 22# Include our custom menu
23%include "/.rockbox/tagnavi_custom.config" 23%include "/.rockbox/tagnavi_custom.config"
@@ -28,33 +28,33 @@
28 28
29# Define the A to Z Artist sub menu 29# Define the A to Z Artist sub menu
30%menu_start "custom_artist" "Artist A to Z" 30%menu_start "custom_artist" "Artist A to Z"
31"Numeric" -> artist ? artist < "A" -> album -> title = "fmt_title" 31"Numeric" -> canonicalartist ? canonicalartist < "A" -> album -> title = "fmt_title"
32"A" -> artist ? artist ^ "A" -> album -> title = "fmt_title" 32"A" -> canonicalartist ? canonicalartist ^ "A" -> album -> title = "fmt_title"
33"B" -> artist ? artist ^ "B" -> album -> title = "fmt_title" 33"B" -> canonicalartist ? canonicalartist ^ "B" -> album -> title = "fmt_title"
34"C" -> artist ? artist ^ "C" -> album -> title = "fmt_title" 34"C" -> canonicalartist ? canonicalartist ^ "C" -> album -> title = "fmt_title"
35"D" -> artist ? artist ^ "D" -> album -> title = "fmt_title" 35"D" -> canonicalartist ? canonicalartist ^ "D" -> album -> title = "fmt_title"
36"E" -> artist ? artist ^ "E" -> album -> title = "fmt_title" 36"E" -> canonicalartist ? canonicalartist ^ "E" -> album -> title = "fmt_title"
37"F" -> artist ? artist ^ "F" -> album -> title = "fmt_title" 37"F" -> canonicalartist ? canonicalartist ^ "F" -> album -> title = "fmt_title"
38"G" -> artist ? artist ^ "G" -> album -> title = "fmt_title" 38"G" -> canonicalartist ? canonicalartist ^ "G" -> album -> title = "fmt_title"
39"H" -> artist ? artist ^ "H" -> album -> title = "fmt_title" 39"H" -> canonicalartist ? canonicalartist ^ "H" -> album -> title = "fmt_title"
40"I" -> artist ? artist ^ "I" -> album -> title = "fmt_title" 40"I" -> canonicalartist ? canonicalartist ^ "I" -> album -> title = "fmt_title"
41"J" -> artist ? artist ^ "J" -> album -> title = "fmt_title" 41"J" -> canonicalartist ? canonicalartist ^ "J" -> album -> title = "fmt_title"
42"K" -> artist ? artist ^ "K" -> album -> title = "fmt_title" 42"K" -> canonicalartist ? canonicalartist ^ "K" -> album -> title = "fmt_title"
43"L" -> artist ? artist ^ "L" -> album -> title = "fmt_title" 43"L" -> canonicalartist ? canonicalartist ^ "L" -> album -> title = "fmt_title"
44"M" -> artist ? artist ^ "M" -> album -> title = "fmt_title" 44"M" -> canonicalartist ? canonicalartist ^ "M" -> album -> title = "fmt_title"
45"N" -> artist ? artist ^ "N" -> album -> title = "fmt_title" 45"N" -> canonicalartist ? canonicalartist ^ "N" -> album -> title = "fmt_title"
46"O" -> artist ? artist ^ "O" -> album -> title = "fmt_title" 46"O" -> canonicalartist ? canonicalartist ^ "O" -> album -> title = "fmt_title"
47"P" -> artist ? artist ^ "P" -> album -> title = "fmt_title" 47"P" -> canonicalartist ? canonicalartist ^ "P" -> album -> title = "fmt_title"
48"Q" -> artist ? artist ^ "Q" -> album -> title = "fmt_title" 48"Q" -> canonicalartist ? canonicalartist ^ "Q" -> album -> title = "fmt_title"
49"R" -> artist ? artist ^ "R" -> album -> title = "fmt_title" 49"R" -> canonicalartist ? canonicalartist ^ "R" -> album -> title = "fmt_title"
50"S" -> artist ? artist ^ "S" -> album -> title = "fmt_title" 50"S" -> canonicalartist ? canonicalartist ^ "S" -> album -> title = "fmt_title"
51"T" -> artist ? artist ^ "T" -> album -> title = "fmt_title" 51"T" -> canonicalartist ? canonicalartist ^ "T" -> album -> title = "fmt_title"
52"U" -> artist ? artist ^ "U" -> album -> title = "fmt_title" 52"U" -> canonicalartist ? canonicalartist ^ "U" -> album -> title = "fmt_title"
53"V" -> artist ? artist ^ "V" -> album -> title = "fmt_title" 53"V" -> canonicalartist ? canonicalartist ^ "V" -> album -> title = "fmt_title"
54"W" -> artist ? artist ^ "W" -> album -> title = "fmt_title" 54"W" -> canonicalartist ? canonicalartist ^ "W" -> album -> title = "fmt_title"
55"X" -> artist ? artist ^ "X" -> album -> title = "fmt_title" 55"X" -> canonicalartist ? canonicalartist ^ "X" -> album -> title = "fmt_title"
56"Y" -> artist ? artist ^ "Y" -> album -> title = "fmt_title" 56"Y" -> canonicalartist ? canonicalartist ^ "Y" -> album -> title = "fmt_title"
57"Z" -> artist ? artist ^ "Z" -> album -> title = "fmt_title" 57"Z" -> canonicalartist ? canonicalartist ^ "Z" -> album -> title = "fmt_title"
58 58
59# ^ An empy line ends the menu 59# ^ An empy line ends the menu
60 60
@@ -130,12 +130,11 @@
130 130
131# Define the search sub menu 131# Define the search sub menu
132%menu_start "search" "Search by..." 132%menu_start "search" "Search by..."
133"Artist" -> artist ? artist ~ "" -> album -> title = "fmt_title" 133"Artist" -> canonicalartist ? canonicalartist ~ "" -> album -> title = "fmt_title"
134"Album Artist" -> albumartist ? albumartist ~ "" -> album -> title = "fmt_title"
135"Album" -> album ? album ~ "" -> title = "fmt_title" 134"Album" -> album ? album ~ "" -> title = "fmt_title"
136"Title" -> title = "fmt_title" ? title ~ "" 135"Title" -> title = "fmt_title" ? title ~ ""
137"Album by year" -> album ? year = "" -> title = "fmt_title" 136"Album by year" -> album ? year = "" -> title = "fmt_title"
138"Artist between years" -> artist ? year >= "" & year <= "" -> album -> title = "fmt_title" 137"Artist between years" -> canonicalartist ? year >= "" & year <= "" -> album -> title = "fmt_title"
139"Album between years" -> album ? year >= "" & year <= "" -> title = "fmt_title" 138"Album between years" -> album ? year >= "" & year <= "" -> title = "fmt_title"
140"Filename" -> filename ? filename ~ "" 139"Filename" -> filename ? filename ~ ""
141"Score" -> title = "fmt_score" ? autoscore > "" 140"Score" -> title = "fmt_score" ? autoscore > ""
@@ -146,7 +145,7 @@
146%menu_start "same" "Same as current" 145%menu_start "same" "Same as current"
147"Directory" -> title ? filename ^ "#directory#" 146"Directory" -> title ? filename ^ "#directory#"
148"Title" -> title = "fmt_title" ? title = "#title#" 147"Title" -> title = "fmt_title" ? title = "#title#"
149"Artist" -> album ? artist = "#artist#" -> title = "fmt_title" 148"Artist" -> album ? artist = "#artist#" | artist = "#albumartist#" | albumartist = "#artist#" | albumartist = "#albumartist#" -> title = "fmt_title"
150"Album" -> title = "fmt_title" ? album = "#album#" 149"Album" -> title = "fmt_title" ? album = "#album#"
151"Composer" -> title = "fmt_title" ? composer = "#composer#" 150"Composer" -> title = "fmt_title" ? composer = "#composer#"
152 151
@@ -154,11 +153,11 @@
154%menu_start "runtime" "Play history" 153%menu_start "runtime" "Play history"
155"Most played (Plays|Score)" -> title = "fmt_mostplayed" ? playcount > "0" 154"Most played (Plays|Score)" -> title = "fmt_mostplayed" ? playcount > "0"
156"Recently played tracks" -> title = "fmt_lastplayed" ? playcount > "0" 155"Recently played tracks" -> title = "fmt_lastplayed" ? playcount > "0"
157"Never played tracks" -> artist ? playcount == "0" -> album -> title = "fmt_title" 156"Never played tracks" -> canonicalartist ? playcount == "0" -> album -> title = "fmt_title"
158"Favourite artists" -> artist ? playcount > "3" & autoscore > "85" -> album -> title = "fmt_best_tracks" 157"Favourite artists" -> canonicalartist ? playcount > "3" & autoscore > "85" -> album -> title = "fmt_best_tracks"
159"Favourite albums" -> album ? playcount > "3" & autoscore > "85" -> title = "fmt_best_tracks" 158"Favourite albums" -> album ? playcount > "3" & autoscore > "85" -> title = "fmt_best_tracks"
160"Recent favourites" -> title = "fmt_lastplayed" ? playcount > "3" & autoscore > "85" 159"Recent favourites" -> title = "fmt_lastplayed" ? playcount > "3" & autoscore > "85"
161"New favourites" -> artist ? playcount <= "3" & autoscore > "85" -> album -> title = "fmt_best_tracks" 160"New favourites" -> canonicalartist ? playcount <= "3" & autoscore > "85" -> album -> title = "fmt_best_tracks"
162"Forgotten favourites" -> title = "fmt_forgotten" ? playcount > "3" & autoscore > "85" 161"Forgotten favourites" -> title = "fmt_forgotten" ? playcount > "3" & autoscore > "85"
163 162
164# 163#
@@ -167,13 +166,12 @@
167 166
168# Define the title of the main menu 167# Define the title of the main menu
169%menu_start "main" "Database" 168%menu_start "main" "Database"
170"Artist" -> artist -> album -> title = "fmt_title" 169"Artist" -> canonicalartist -> album -> title = "fmt_title"
171"Album Artist" -> albumartist -> album -> title = "fmt_title"
172"Album" -> album -> title = "fmt_title" 170"Album" -> album -> title = "fmt_title"
173"Genre" -> genre -> artist -> album -> title = "fmt_title" 171"Genre" -> genre -> canonicalartist -> album -> title = "fmt_title"
174"Composer" -> composer -> album -> title = "fmt_title" 172"Composer" -> composer -> album -> title = "fmt_title"
175"Track" -> title = "fmt_alphanum_title" 173"Track" -> title = "fmt_alphanum_title"
176"Year" -> year ? year > "0" -> artist -> album -> title = "fmt_title" 174"Year" -> year ? year > "0" -> canonicalartist -> album -> title = "fmt_title"
177"User Rating" -> rating -> title = "fmt_title" 175"User Rating" -> rating -> title = "fmt_title"
178"Recently Added" -> album ? entryage < "4" & commitid > "0" -> title = "fmt_title" 176"Recently Added" -> album ? entryage < "4" & commitid > "0" -> title = "fmt_title"
179"A to Z..." ==> "a2z" 177"A to Z..." ==> "a2z"