Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 19 additions & 1 deletion app/i18n/strings_de.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,25 @@
"WEB_ALBUMART_ENABLE": "Albencover herunterladen",
"WEB_ALBUMART_ENABLE_DOC": "Albumcover aus dem Internet herunterladen, sofern keine Bilddatei im Ordner vorhanden ist",
"WEB_ALBUMART_SIZE": "Größe der Albencover",
"WEB_ALBUMART_SIZE_DOC": "Größe der Albencover auswählen. Je größer die Qualität, desto länger die Downloadzeit. Sollten sich die Ladezeiten verlängern, sollte diese Einstellung auf eine niedrigere Stufe gesetzt werden."
"WEB_ALBUMART_SIZE_DOC": "Größe der Albencover auswählen. Je größer die Qualität, desto länger die Downloadzeit. Sollten sich die Ladezeiten verlängern, sollte diese Einstellung auf eine niedrigere Stufe gesetzt werden.",
"IGNORE_LEADING_ARTICLE":"Ignoriere Artikel im Interpret/Album/Genre Namen bei der Sortierung",
"ARTICLE_LIST":"Liste der zu ignorierenden Artikel",
"SPLIT_ARTISTS_BY_STARTING_LETTER":"Interpreten nach Anfangsbuchstaben",
"SPLIT_GENRES_BY_STARTING_LETTER":"Genres nach Anfangsbuchstaben",
"SPLIT_ALBUMS_BY_STARTING_LETTER":"Alben nach Anfangsbuchstaben",
"LIST_ONLY_ARTISTS_WITH_MIN_ENTRIES":"Nur Interpreten mit angegebener Anzahl Tracks anzeigen",
"LIST_ONLY_ALBUMS_WITH_MIN_ENTRIES":"Nur Alben mit angegebener Anzahl Tracks anzeigen",
"LIST_ONLY_GENRES_WITH_MIN_ENTRIES":"Nur Genres mit angegebener Anzahl Tracks anzeigen",
"SHOW_NR_OF_TRACKS":"Anzahl der gefunden Tracks im Interpret/Album/Genre Titel anzeigen",
"IGNORE_LEADING_ARTICLE_DOC":"The Beatles werden nach Buchtstabe B sortiert nicht nach T",
"ARTICLE_LIST_DOC":"Artikelliste mit Space und Komma getrennt beispielsweise: THE ,DER ,DIE ,DAS ,LE ,LA ,LES, EL ",
"SPLIT_ARTISTS_BY_STARTING_LETTER_DOC":"Interpreten werden in der Übersicht nach Anfangsbuchstaben getrennt dargestellt",
"SPLIT_GENRES_BY_STARTING_LETTER_DOC":"Genres werden in der Übersicht nach Anfangsbuchstaben getrennt dargestellt",
"SPLIT_ALBUMS_BY_STARTING_LETTER_DOC":"Alben werden in der Übersicht nach Anfangsbuchstaben getrennt dargestellt",
"LIST_ONLY_ARTISTS_WITH_MIN_ENTRIES_DOC":"Nur Interpreten in der Übersicht mit angegebener Anzahl Tracks anzeigen",
"LIST_ONLY_ALBUMS_WITH_MIN_ENTRIES_DOC":"Nur Alben in der Übersicht mit angegebener Anzahl Tracks anzeigen",
"LIST_ONLY_GENRES_WITH_MIN_ENTRIES_DOC":"Nur Genres in der Übersicht mit angegebener Anzahl Tracks anzeigen",
"SHOW_NR_OF_TRACKS_DOC":"Anzahl der gefunden Tracks im Interpret/Album/Genre Titel anzeigen"
},
"COMMON": {
"ADD_QUEUE_TEXT_1": "Füge ",
Expand Down
21 changes: 20 additions & 1 deletion app/i18n/strings_en.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,26 @@
"WEB_ALBUMART_ENABLE": "Web Album art",
"WEB_ALBUMART_ENABLE_DOC": "Enable retrieval of Album art from Web, if no image is found in the file folder",
"WEB_ALBUMART_SIZE": "Web Album art Size",
"WEB_ALBUMART_SIZE_DOC": "Choose the size of Album art downloaded from web: higher quality requires longer load times. Lower values may improve load times."
"WEB_ALBUMART_SIZE_DOC": "Choose the size of Album art downloaded from web: higher quality requires longer load times. Lower values may improve load times.",
"IGNORE_LEADING_ARTICLE":"Ignore leading article when sorting artists/albums/genres",
"ARTICLE_LIST":"List of articles to ignore",
"SPLIT_ARTISTS_BY_STARTING_LETTER":"Artists by starting letter",
"SPLIT_GENRES_BY_STARTING_LETTER":"Genres by starting letter",
"SPLIT_ALBUMS_BY_STARTING_LETTER":"Albums by starting letter",
"LIST_ONLY_ARTISTS_WITH_MIN_ENTRIES":"Show only artists with given number of tracks",
"LIST_ONLY_ALBUMS_WITH_MIN_ENTRIES":"Show only albums with given number of tracks",
"LIST_ONLY_GENRES_WITH_MIN_ENTRIES":"Show only genres with given number of tracks",
"SHOW_NR_OF_TRACKS":"Show number of found tracks in artists/albums/genres title",
"IGNORE_LEADING_ARTICLE_DOC":"The Beatles would be sorted by letter B not letter T",
"ARTICLE_LIST_DOC":"List spearated by space and comma, for example: THE ,DER ,DIE ,DAS ,LE ,LA ,LES, EL ",
"SPLIT_ARTISTS_BY_STARTING_LETTER_DOC":"Artists will be shown separated by starting letter",
"SPLIT_GENRES_BY_STARTING_LETTER_DOC":"Genres will be shown separated by starting letter",
"SPLIT_ALBUMS_BY_STARTING_LETTER_DOC":"Albums will be shown separated by starting letter",
"LIST_ONLY_ARTISTS_WITH_MIN_ENTRIES_DOC":"Show only artists who have at least given number of tracks in the library",
"LIST_ONLY_ALBUMS_WITH_MIN_ENTRIES_DOC":"Show only albums which have at least given number of tracks in the library",
"LIST_ONLY_GENRES_WITH_MIN_ENTRIES_DOC":"Show only genres which have at least given number of tracks in the library",
"SHOW_NR_OF_TRACKS_DOC":"Show number of found tracks in artist/album/genre title"

},
"COMMON": {
"ADD_QUEUE_TEXT_1": "Added ",
Expand Down
91 changes: 85 additions & 6 deletions app/plugins/miscellanea/my_music/UIConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,16 @@
"tracknumbers",
"compilation",
"artistsort",
"ffmpegenable"
"ffmpegenable",
"ignore_leading_article",
"article_list",
"split_artists_by_starting_letter",
"split_albums_by_starting_letter",
"split_genres_by_starting_letter",
"list_only_artists_with_min_entries",
"list_only_albums_with_min_entries",
"list_only_genres_with_min_entries",
"show_nr_of_tracks"
]
},
"content": [
Expand Down Expand Up @@ -133,13 +142,83 @@
]

},
{
"id": "ffmpegenable",
{
"id": "ffmpegenable",
"element": "switch",
"hidden":true,
"doc" : "TRANSLATE.PLAYBACK_OPTIONS.EXTENDED_FILE_FORMAT_SUPPORT_DOC",
"label": "TRANSLATE.PLAYBACK_OPTIONS.EXTENDED_FILE_FORMAT_SUPPORT",
"value": false
},
{
"id": "ignore_leading_article",
"element": "switch",
"doc" : "TRANSLATE.APPEARANCE.IGNORE_LEADING_ARTICLE_DOC",
"label": "TRANSLATE.APPEARANCE.IGNORE_LEADING_ARTICLE",
"value": false
},
{
"id": "article_list",
"element": "input",
"doc" : "TRANSLATE.APPEARANCE.ARTICLE_LIST_DOC",
"label": "TRANSLATE.APPEARANCE.ARTICLE_LIST",
"value": ""
},

{
"id": "split_artists_by_starting_letter",
"element": "switch",
"hidden":true,
"doc" : "TRANSLATE.PLAYBACK_OPTIONS.EXTENDED_FILE_FORMAT_SUPPORT_DOC",
"label": "TRANSLATE.PLAYBACK_OPTIONS.EXTENDED_FILE_FORMAT_SUPPORT",
"doc" : "TRANSLATE.APPEARANCE.SPLIT_ARTISTS_BY_STARTING_LETTER_DOC",
"label": "TRANSLATE.APPEARANCE.SPLIT_ARTISTS_BY_STARTING_LETTER",
"value": false
},
{
"id": "list_only_artists_with_min_entries",
"element": "input",
"doc" : "TRANSLATE.APPEARANCE.LIST_ONLY_ARTISTS_WITH_MIN_ENTRIES_DOC",
"label": "TRANSLATE.APPEARANCE.LIST_ONLY_ARTISTS_WITH_MIN_ENTRIES",
"value": ""

},

{
"id": "split_albums_by_starting_letter",
"element": "switch",
"doc" : "TRANSLATE.APPEARANCE.SPLIT_ALBUMS_BY_STARTING_LETTER_DOC",
"label": "TRANSLATE.APPEARANCE.SPLIT_ALBUMS_BY_STARTING_LETTER",
"value": false
},
{
"id": "list_only_albums_with_min_entries",
"element": "input",
"doc" : "TRANSLATE.APPEARANCE.LIST_ONLY_ALBUMS_WITH_MIN_ENTRIES_DOC",
"label": "TRANSLATE.APPEARANCE.LIST_ONLY_ALBUMS_WITH_MIN_ENTRIES",
"value": ""

},

{
"id": "split_genres_by_starting_letter",
"element": "switch",
"doc" : "TRANSLATE.APPEARANCE.SPLIT_GENRES_BY_STARTING_LETTER_DOC",
"label": "TRANSLATE.APPEARANCE.SPLIT_GENRES_BY_STARTING_LETTER",
"value": false
},
{
"id": "list_only_genres_with_min_entries",
"element": "input",
"doc" : "TRANSLATE.APPEARANCE.LIST_ONLY_GENRES_WITH_MIN_ENTRIES_DOC",
"label": "TRANSLATE.APPEARANCE.LIST_ONLY_GENRES_WITH_MIN_ENTRIES",
"value": ""

},
{
"id": "show_nr_of_tracks",
"element": "switch",
"doc" : "TRANSLATE.APPEARANCE.SHOW_NR_OF_TRACKS_DOC",
"label": "TRANSLATE.APPEARANCE.SHOW_NR_OF_TRACKS",
"value": false

}
]
},
Expand Down
30 changes: 29 additions & 1 deletion app/plugins/miscellanea/my_music/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,38 @@ ControllerMyMusic.prototype.getUIConfig = function () {
self.configManager.setUIConfigParam(uiconf, 'sections[4].content[2].value.value', false);
self.configManager.setUIConfigParam(uiconf, 'sections[4].content[2].value.label', 'artist');
}

var ffmpeg = self.getAdditionalConf('music_service', 'mpd', 'ffmpegenable', false);
self.configManager.setUIConfigParam(uiconf, 'sections[4].content[3].value', ffmpeg);

var c;
c = self.getAdditionalConf('music_service', 'mpd', 'ignore_leading_article', false);
self.configManager.setUIConfigParam(uiconf, 'sections[4].content[4].value', c);
c = self.getAdditionalConf('music_service', 'mpd', 'article_list', 'THE ,DER ,DIE ,DAS ,LE ,LA ,LES ');
self.configManager.setUIConfigParam(uiconf, 'sections[4].content[5].value', c);

c = self.getAdditionalConf('music_service', 'mpd', 'split_artists_by_starting_letter', false);
self.configManager.setUIConfigParam(uiconf, 'sections[4].content[6].value', c);
c = self.getAdditionalConf('music_service', 'mpd', 'list_only_artists_with_min_entries', '-1');
self.configManager.setUIConfigParam(uiconf, 'sections[4].content[7].value', c);

c = self.getAdditionalConf('music_service', 'mpd', 'split_albums_by_starting_letter', false);
self.configManager.setUIConfigParam(uiconf, 'sections[4].content[8].value', c);
c = self.getAdditionalConf('music_service', 'mpd', 'list_only_albums_with_min_entries', '-1');
self.configManager.setUIConfigParam(uiconf, 'sections[4].content[9].value', c);

c = self.getAdditionalConf('music_service', 'mpd', 'split_genres_by_starting_letter', false);
self.configManager.setUIConfigParam(uiconf, 'sections[4].content[10].value', c);
c = self.getAdditionalConf('music_service', 'mpd', 'list_only_genres_with_min_entries', '-1');
self.configManager.setUIConfigParam(uiconf, 'sections[4].content[11].value', c);

c = self.getAdditionalConf('music_service', 'mpd', 'show_nr_of_tracks', false);
self.configManager.setUIConfigParam(uiconf, 'sections[4].content[12].value', c);






try {
var disabledSources = self.getDisabledSources();
var browseSources = self.commandRouter.volumioGetBrowseSources();
Expand Down
Loading