From ef0465beeb36ff2fb06e82ceea6137ec154f3c07 Mon Sep 17 00:00:00 2001 From: jcorporation Date: Sun, 7 Jul 2024 00:17:29 +0200 Subject: [PATCH] Feat: Use new webradio backends --- docs/references/translating_status.md | 22 +- htdocs/index.html | 77 ++++--- htdocs/js/apidoc.js | 8 +- htdocs/js/contextMenu.js | 1 + htdocs/js/globales.js | 17 +- htdocs/js/modalRadioFavoriteEdit.js | 58 ++--- htdocs/js/modalRadioWebradiodbDetail.js | 64 +++--- htdocs/js/radioFavorites.js | 2 +- htdocs/js/result.js | 1 + htdocs/js/settings.js | 3 + htdocs/js/tags.js | 7 +- htdocs/js/viewBrowseRadioFavorites.js | 41 ++-- htdocs/js/viewBrowseRadioWebradiodb.js | 284 ++---------------------- htdocs/js/views.js | 2 +- src/i18n/json/de-DE.json | 2 +- src/i18n/json/i18n.json | 18 +- src/i18n/json/phrases.json | 3 +- src/lib/validate.c | 17 +- src/lib/validate.h | 1 + src/lib/webradio.c | 16 +- src/lib/webradio.h | 4 +- src/mpd_worker/webradiodb.c | 2 +- src/mympd_api/mympd_api_handler.c | 14 +- src/mympd_api/webradio.c | 20 +- src/mympd_api/webradio.h | 2 +- 25 files changed, 249 insertions(+), 437 deletions(-) diff --git a/docs/references/translating_status.md b/docs/references/translating_status.md index 6b65aaefc..6351d1df4 100644 --- a/docs/references/translating_status.md +++ b/docs/references/translating_status.md @@ -1,14 +1,14 @@ - bg-BG: 1051 missing phrases -- es-AR: 6 missing phrases +- es-AR: 7 missing phrases - es-ES: 916 missing phrases -- es-VE: 905 missing phrases -- fi-FI: 902 missing phrases -- fr-FR: 6 missing phrases -- it-IT: 6 missing phrases -- ja-JP: 6 missing phrases -- ko-KR: 6 missing phrases -- nl-NL: 6 missing phrases -- pl-PL: 81 missing phrases +- es-VE: 904 missing phrases +- fi-FI: 901 missing phrases +- fr-FR: 7 missing phrases +- it-IT: 7 missing phrases +- ja-JP: 7 missing phrases +- ko-KR: 7 missing phrases +- nl-NL: 7 missing phrases +- pl-PL: 82 missing phrases - ru-RU: 152 missing phrases -- zh-Hans: 34 missing phrases -- zh-Hant: 81 missing phrases +- zh-Hans: 35 missing phrases +- zh-Hant: 82 missing phrases diff --git a/htdocs/index.html b/htdocs/index.html index cbe804710..19bf51e6e 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -801,10 +801,36 @@

-
- search +
+
+ + +
+
+
+ + +
@@ -823,6 +849,7 @@

+
@@ -837,29 +864,24 @@

-
- search - -
-
- -
-
-
- -
-
- -
-
- -
-
- -
-
- +
+
+ +
+ +
@@ -868,7 +890,7 @@

  - +
@@ -890,6 +912,7 @@

+
@@ -2906,9 +2929,9 @@
favorite
- +
- +
diff --git a/htdocs/js/apidoc.js b/htdocs/js/apidoc.js index 7ca2a7a79..1aa0719cd 100644 --- a/htdocs/js/apidoc.js +++ b/htdocs/js/apidoc.js @@ -2186,7 +2186,9 @@ const APImethods = { "params": { "offset": APIparams.offset, "limit": APIparams.limit, - "expression": APIparams.expression + "expression": APIparams.expression, + "sort": APIparams.sort, + "sortdesc": APIparams.sortdesc } }, "MYMPD_API_WEBRADIO_FAVORITE_SAVE": { @@ -2299,7 +2301,9 @@ const APImethods = { "params": { "offset": APIparams.offset, "limit": APIparams.limit, - "expression": APIparams.expression + "expression": APIparams.expression, + "sort": APIparams.sort, + "sortdesc": APIparams.sortdesc } }, "MYMPD_API_WEBRADIODB_RADIO_GET_BY_NAME": { diff --git a/htdocs/js/contextMenu.js b/htdocs/js/contextMenu.js index c2c1c4408..c7a993133 100644 --- a/htdocs/js/contextMenu.js +++ b/htdocs/js/contextMenu.js @@ -562,6 +562,7 @@ function createMenuLists(target, contextMenuTitle, contextMenuBody) { switch(type) { case 'song': case 'stream': + case 'webradio': addMenuItemsSongActions(dataNode, contextMenuBody, uri, type, name); break; case 'dir': diff --git a/htdocs/js/globales.js b/htdocs/js/globales.js index da28722b1..a12102ca1 100644 --- a/htdocs/js/globales.js +++ b/htdocs/js/globales.js @@ -134,11 +134,6 @@ const messagesMax = 100; /** @type {boolean} */ const debugMode = document.querySelector("script").src.replace(/^.*[/]/, '') === 'combined.js' ? false : true; -/** @type {object} */ -let webradioDb = null; -/** @type {string} */ -const webradioDbPicsUri = 'https://jcorporation.github.io/webradiodb/db/pics/'; - /** @type {string} */ const scriptsUri = 'https://github.com/jcorporation/mympd-scripts/tree/main/'; /** @type {string} */ @@ -1354,9 +1349,9 @@ app.cards = { "Favorites": { "offset": 0, "limit": 100, - "filter": "", + "filter": "any", "sort": { - "tag": "", + "tag": "Name", "desc": false }, "tag": "", @@ -1366,13 +1361,7 @@ app.cards = { "Webradiodb": { "offset": 0, "limit": 100, - "filter": { - "genre": "", - "country": "", - "language": "", - "codec": "", - "bitrate": "" - }, + "filter": "any", "sort": { "tag": "Name", "desc": false diff --git a/htdocs/js/modalRadioFavoriteEdit.js b/htdocs/js/modalRadioFavoriteEdit.js index d65b47f8c..3608b73fc 100644 --- a/htdocs/js/modalRadioFavoriteEdit.js +++ b/htdocs/js/modalRadioFavoriteEdit.js @@ -26,7 +26,7 @@ function manualAddRadioFavorite() { "Genre": "", "Homepage": "", "Country": "", - "State": "", + "Region": "", "Language": "", "Codec": "", "Bitrate": "", @@ -46,13 +46,13 @@ function showEditRadioFavorite(obj) { elGetById('modalRadioFavoriteEditGenreInput').value = obj.Genre === undefined ? '' : obj.Genre; elGetById('modalRadioFavoriteEditHomepageInput').value = obj.Homepage === undefined ? '' : obj.Homepage; elGetById('modalRadioFavoriteEditCountryInput').value = obj.Country === undefined ? '' : obj.Country; - elGetById('modalRadioFavoriteEditStateInput').value = obj.State === undefined ? '' : obj.State; + elGetById('modalRadioFavoriteEditRegionInput').value = obj.Region === undefined ? '' : obj.Region; elGetById('modalRadioFavoriteEditLanguageInput').value = obj.Language === undefined ? '' : obj.Language; elGetById('modalRadioFavoriteEditCodecInput').value = obj.Codec === undefined ? '' : obj.Codec; elGetById('modalRadioFavoriteEditBitrateInput').value = obj.Bitrate === undefined ? '' : obj.Bitrate; elGetById('modalRadioFavoriteEditDescriptionInput').value = obj.Description === undefined ? '' : obj.Description; - setDataId('modalRadioFavoriteEdit', "StremUriOld", (obj.StreamUri === undefined ? '' : obj.StreamUri)); + setDataId('modalRadioFavoriteEdit', "StreamUriOld", (obj.StreamUri === undefined ? '' : obj.StreamUri)); const imageEl = elGetById('modalRadioFavoriteEditImageInput'); getImageList(imageEl, [], 'thumbs'); @@ -85,7 +85,7 @@ function saveRadioFavorite(target) { "image": elGetById('modalRadioFavoriteEditImageInput').value, "homepage": elGetById('modalRadioFavoriteEditHomepageInput').value, "country": elGetById('modalRadioFavoriteEditCountryInput').value, - "state": elGetById('modalRadioFavoriteEditStateInput').value, + "region": elGetById('modalRadioFavoriteEditRegionInput').value, "language": elGetById('modalRadioFavoriteEditLanguageInput').value, "codec": elGetById('modalRadioFavoriteEditCodecInput').value, "bitrate": Number(elGetById('modalRadioFavoriteEditBitrateInput').value), @@ -102,39 +102,21 @@ function saveRadioFavoriteCheckError(obj) { if (modalApply(obj) === true) { uiElements.modalRadioFavoriteEdit.hide(); if (app.id === 'BrowseRadioFavorites') { - getRadioFavoriteList(); + handleBrowseRadioFavorites(); } } } -/** - * Wrapper for _checkWebradioDb that fetches the webradioDB if needed - * @returns {void} - */ -//eslint-disable-next-line no-unused-vars -function checkWebradioDb() { - elGetById('webradiodbCheckState').textContent = tn('Checking...'); - btnWaitingId('modalRadioFavoriteEditCheckWebradiodbBtn', true); - if (webradioDb === null) { - //fetch webradiodb database - sendAPI("MYMPD_API_CLOUD_WEBRADIODB_COMBINED_GET", {}, function(obj) { - webradioDb = obj.result.data; - _checkWebradioDb(); - }, false); - } - else { - _checkWebradioDb(); - } -} - /** * Checks the local webradio favorite against the webradioDB entry * @returns {void} */ -function _checkWebradioDb() { +function checkWebradioDb() { const streamUri = elGetById('modalRadioFavoriteEditStreamUriInput').value; if (streamUri !== '') { + //TODO + /* const webradio = streamUriToName(streamUri) + '.m3u'; if (webradioDb.webradios[webradio] === undefined) { //not a main streamUri - check for alternate streams @@ -174,6 +156,7 @@ function _checkWebradioDb() { elGetById('webradiodbCheckState').textContent = tn('Favorite is uptodate'); } } + */ } else { elHideId('modalRadioFavoriteEditAddToWebradiodbBtn'); @@ -192,8 +175,10 @@ function _checkWebradioDb() { function compareWebradioDb() { let v1 = ''; let v2 = ''; + //TODO + /* const webradio = streamUriToName(elGetById('modalRadioFavoriteEditStreamUriInput').value) + '.m3u'; - for (const v of ['Name', 'StreamUri', 'Genre', 'Homepage', 'Image', 'Country', 'State', 'Language', 'Description', 'Codec', 'Bitrate']) { + for (const v of ['Name', 'StreamUri', 'Genre', 'Homepage', 'Image', 'Country', 'Region', 'Language', 'Description', 'Codec', 'Bitrate']) { if (v === 'Image') { v1 += basename(elGetById('modalRadioFavoriteEdit' + v + 'Input').value, false); } @@ -202,6 +187,7 @@ function compareWebradioDb() { } v2 += webradioDb.webradios[webradio][v]; } + */ return v1 === v2; } @@ -212,15 +198,13 @@ function compareWebradioDb() { //eslint-disable-next-line no-unused-vars function updateFromWebradioDb() { const webradio = streamUriToName(elGetById('modalRadioFavoriteEditStreamUriInput').value) + '.m3u'; - for (const v of ['Name', 'StreamUri', 'Genre', 'Homepage', 'Image', 'Country', 'State', 'Language', 'Description', 'Codec', 'Bitrate']) { - if (v === 'Image') { - elGetById('modalRadioFavoriteEdit' + v + 'Input').value = webradioDbPicsUri + webradioDb.webradios[webradio][v]; - } - else { - elGetById('modalRadioFavoriteEdit' + v + 'Input').value = webradioDb.webradios[webradio][v]; - } + //TODO + /* + for (const v of ['Name', 'StreamUri', 'Genre', 'Homepage', 'Image', 'Country', 'Region', 'Language', 'Description', 'Codec', 'Bitrate']) { + elGetById('modalRadioFavoriteEdit' + v + 'Input').value = webradioDb.webradios[webradio][v]; } - _checkWebradioDb(); + */ + checkWebradioDb(); } /** @@ -237,7 +221,7 @@ function addToWebradioDb() { '&homepage=' + encodeURIComponent(elGetById('modalRadioFavoriteEditHomepageInput').value) + '&image=' + encodeURIComponent(elGetById('modalRadioFavoriteEditImageInput').value) + '&country=' + encodeURIComponent(elGetById('modalRadioFavoriteEditCountryInput').value) + - '&state=' + encodeURIComponent(elGetById('modalRadioFavoriteEditStateInput').value) + + '®ion=' + encodeURIComponent(elGetById('modalRadioFavoriteEditRegionInput').value) + '&language=' + encodeURIComponent(elGetById('modalRadioFavoriteEditLanguageInput').value) + '&codec=' + encodeURIComponent(elGetById('modalRadioFavoriteEditCodecInput').value) + '&bitrate=' + encodeURIComponent(elGetById('modalRadioFavoriteEditBitrateInput').value) + @@ -260,7 +244,7 @@ function updateWebradioDb() { '&homepage=' + encodeURIComponent(elGetById('modalRadioFavoriteEditHomepageInput').value) + '&image=' + encodeURIComponent(elGetById('modalRadioFavoriteEditImageInput').value) + '&country=' + encodeURIComponent(elGetById('modalRadioFavoriteEditCountryInput').value) + - '&state=' + encodeURIComponent(elGetById('modalRadioFavoriteEditStateInput').value) + + '®ion=' + encodeURIComponent(elGetById('modalRadioFavoriteEditRegionInput').value) + '&language=' + encodeURIComponent(elGetById('modalRadioFavoriteEditLanguageInput').value) + '&codec=' + encodeURIComponent(elGetById('modalRadioFavoriteEditCodecInput').value) + '&bitrate=' + encodeURIComponent(elGetById('modalRadioFavoriteEditBitrateInput').value) + diff --git a/htdocs/js/modalRadioWebradiodbDetail.js b/htdocs/js/modalRadioWebradiodbDetail.js index a0abc1f84..16268eb4c 100644 --- a/htdocs/js/modalRadioWebradiodbDetail.js +++ b/htdocs/js/modalRadioWebradiodbDetail.js @@ -17,44 +17,52 @@ function showAddToWebradioFavorites(event) { } /** - * Shows the details of a webradioDB entry + * Fetches the details of a WebradioDB entry * @param {string} uri webradio uri * @returns {void} */ //eslint-disable-next-line no-unused-vars function showWebradiodbDetails(uri) { + sendAPI("MYMPD_API_WEBRADIODB_RADIO_GET_BY_URI", { + "uri": uri + }, parseWebradiodbDetail, true); +} + +/** + * Parses the details of a WebradioDB entry and shows the modal + * @param {object} obj Jsonrpc response + * @returns {void} + */ +function parseWebradiodbDetail(obj) { elShowId('modalWebradiodbDetailAddToFavoriteBtn'); const table = elGetById('modalWebradiodbDetailList'); const tbody = table.querySelector('tbody'); elClear(tbody); - const m3u = isStreamUri(uri) - ? streamUriToName(uri) + '.m3u' - : uri; - const result = webradioDb.webradios[m3u]; - if (result === undefined) { - tbody.appendChild(errorMsgEl({'error': {'message':'Webradio not found'}}, 1, 'table')); + + if (obj.error) { + tbody.appendChild(obj.error, 1, 'table'); } - if (result.Image !== '') { - elGetById('modalWebradiodbDetailImage').style.backgroundImage = getCssImageUri(webradioDbPicsUri + result.Image); + if (obj.result.Image !== '') { + elGetById('modalWebradiodbDetailImage').style.backgroundImage = getCssImageUri(obj.result.Image); } else { elGetById('modalWebradiodbDetailImage').style.backgroundImage = 'url("' + subdir + '/assets/coverimage-notavailable")'; } - elGetById('modalWebradiodbDetailTitle').textContent = result.Name; - setDataId('modalWebradiodbDetailTitle', 'webradio', result); + elGetById('modalWebradiodbDetailTitle').textContent = obj.result.Name; + setDataId('modalWebradiodbDetailTitle', 'webradio', obj.result); const showFields = [ 'StreamUri', 'Homepage', - 'Genre', + 'Genres', 'Country', - 'State', - 'Language', + 'Region', + 'Languages', 'Codec', 'Bitrate', 'Description' ]; for (const field of showFields) { - const value = printValue(field, result[field]); + const value = printValue(field, obj.result[field]); tbody.appendChild( elCreateNodes('tr', {}, [ elCreateTextTn('th', {}, field), @@ -62,29 +70,29 @@ function showWebradiodbDetails(uri) { ]) ); } - const alternateStreams = Object.keys(result.alternativeStreams); + const alternateStreams = Object.keys(obj.result.alternativeStreams); if (alternateStreams.length > 0) { const td = elCreateEmpty('td', {}); for (const name of alternateStreams) { const p = elCreateTextTn('p', {"class": ["pb-0"]}, 'Webradioformat', - {"codec": result.alternativeStreams[name].Codec, "bitrate": result.alternativeStreams[name].Bitrate}); + {"codec": obj.result.alternativeStreams[name].Codec, "bitrate": obj.result.alternativeStreams[name].Bitrate}); const btn = elCreateText('button', {"class": ["btn", "btn-sm", "btn-secondary", "mi", "mi-sm", "ms-2"]}, 'favorite'); p.appendChild(btn); td.appendChild(p); btn.addEventListener('click', function(event) { event.preventDefault(); showEditRadioFavorite({ - "Name": result.Name, - "StreamUri": result.alternativeStreams[name].StreamUri, - "Genre": result.Genre, - "Homepage": result.Homepage, - "Country": result.Country, - "State": result.State, - "Language": result.Languages, - "Codec": result.alternativeStreams[name].Codec, - "Bitrate": result.alternativeStreams[name].Bitrate, - "Description": result.Description, - "Image": result.Image + "Name": obj.result.Name, + "StreamUri": obj.result.alternativeStreams[name].StreamUri, + "Genre": obj.result.Genre, + "Homepage": obj.result.Homepage, + "Country": obj.result.Country, + "State": obj.result.State, + "Language": obj.result.Languages, + "Codec": obj.result.alternativeStreams[name].Codec, + "Bitrate": obj.result.alternativeStreams[name].Bitrate, + "Description": obj.result.Description, + "Image": obj.result.Image }); }, false); } diff --git a/htdocs/js/radioFavorites.js b/htdocs/js/radioFavorites.js index 30435ebd4..15cf135ba 100644 --- a/htdocs/js/radioFavorites.js +++ b/htdocs/js/radioFavorites.js @@ -39,7 +39,7 @@ function deleteRadioFavorites(filenames) { sendAPI("MYMPD_API_WEBRADIO_FAVORITE_RM", { "filenames": filenames }, function() { - getRadioFavoriteList(); + handleBrowseRadioFavorites(); }, false); } diff --git a/htdocs/js/result.js b/htdocs/js/result.js index 71f64ea33..95f61f887 100644 --- a/htdocs/js/result.js +++ b/htdocs/js/result.js @@ -28,6 +28,7 @@ function emptyMsgEl(colspan, mode) { * @param {string} mode table or grid * @returns {HTMLElement} created row */ +//eslint-disable-next-line no-unused-vars function loadingMsgEl(colspan, mode) { if (mode === 'grid') { return elCreateTextTn('div', {"class": ["col", "not-clickable", "alert", "alert-secondary"]}, 'Loading...'); diff --git a/htdocs/js/settings.js b/htdocs/js/settings.js index ada6f1f17..060243b2d 100644 --- a/htdocs/js/settings.js +++ b/htdocs/js/settings.js @@ -458,6 +458,9 @@ function parseMPDSettings() { addTagList('BrowseDatabaseAlbumListSearchTags', 'tagListAlbum'); addTagList('BrowseDatabaseAlbumListSortTagsList', 'tagListAlbum'); addTagList('BrowsePlaylistDetailSortTagsDropdown', 'tagList'); + addTagList('BrowseRadioFavoritesSearchTags', ''); + addTagList('BrowseRadioFavoritesSortTagsList', ''); + addTagList('BrowseRadioWebradiodbSearchTags', ''); addTagList('BrowseRadioWebradiodbSortTagsList', ''); addTagList('SearchSearchTags', 'tagListSearch'); addTagList('SearchSortTagsList', 'tagList'); diff --git a/htdocs/js/tags.js b/htdocs/js/tags.js index baa09ed7d..6d54ec276 100644 --- a/htdocs/js/tags.js +++ b/htdocs/js/tags.js @@ -145,8 +145,11 @@ function addTagList(elId, list) { ); } } - else if (elId === 'BrowseRadioWebradiodbSortTagsList') { - const tags = ["Bitrate", "Codec", "Country", "Description", "Genre", "Homepage", "Languages", "Name", "State"]; + else if (elId === 'BrowseRadioFavoritesSearchTags' || + elId === 'BrowseRadioWebradiodbSortTagsList' || + elId === 'BrowseRadioWebradiodbSearchTags') + { + const tags = ["Bitrate", "Codec", "Country", "Description", "Genre", "Homepage", "Languages", "Name", "Region"]; for (let i = 0, j = tags.length; i < j; i++) { stack.appendChild( elCreateTextTn('button', {"class": ["btn", "btn-secondary", "btn-sm"], "data-tag": tags[i]}, tags[i]) diff --git a/htdocs/js/viewBrowseRadioFavorites.js b/htdocs/js/viewBrowseRadioFavorites.js index ee95fca0f..336eea95b 100644 --- a/htdocs/js/viewBrowseRadioFavorites.js +++ b/htdocs/js/viewBrowseRadioFavorites.js @@ -10,8 +10,29 @@ * @returns {void} */ function handleBrowseRadioFavorites() { - handleSearchSimple('BrowseRadioFavorites'); - getRadioFavoriteList(); + handleSearchExpression('BrowseRadioFavorites'); + toggleBtnChkId('BrowseRadioFavoritesSortDesc', app.current.sort.desc); + selectTag('BrowseRadioFavoritesSortTagsList', undefined, app.current.sort.tag); + const searchMatchEl = elGetById(app.id + 'SearchMatch'); + + sendAPI("MYMPD_API_WEBRADIO_FAVORITE_SEARCH", { + "offset": app.current.offset, + "limit": app.current.limit, + "expression": app.current.search, + "sort": app.current.sort.tag, + "sortdesc": app.current.sort.desc + }, parseRadioFavoritesList, true); + + if (app.current.filter === 'Bitrate') { + elShowId(app.id + 'SearchBitrateMatch'); + searchMatchEl.value = '>='; + } + else { + if (getSelectValue(searchMatchEl) === '>=') { + searchMatchEl.value = 'contains'; + } + elHideId(app.id + 'SearchBitrateMatch'); + } } /** @@ -19,7 +40,7 @@ function handleBrowseRadioFavorites() { * @returns {void} */ function initViewBrowseRadioFavorites() { - initSearchSimple('BrowseRadioFavorites'); + initSearchExpression('BrowseRadioFavorites'); setView('BrowseRadioFavorites'); } @@ -34,18 +55,6 @@ function viewBrowseRadioFavoritesListClickHandler(event, target) { clickRadioFavorites(uri, event); } -/** - * Gets the list of webradio favorites - * @returns {void} - */ -function getRadioFavoriteList() { - sendAPI("MYMPD_API_WEBRADIO_FAVORITE_LIST", { - "offset": app.current.offset, - "limit": app.current.limit, - "searchstr": app.current.search - }, parseRadioFavoritesList, true); -} - /** * Parses the jsonrpc response from MYMPD_API_WEBRADIO_FAVORITE_LIST * @param {object} obj jsonrpc response @@ -67,7 +76,6 @@ function parseRadioFavoritesList(obj) { setData(row, 'uri', data.filename); setData(row, 'name', data.Name); setData(row, 'type', 'webradio'); - setData(row, 'image', data.Image); row.setAttribute('title', rowTitle); }); return; @@ -80,7 +88,6 @@ function parseRadioFavoritesList(obj) { setData(card, 'uri', data.filename); setData(card, 'name', data.Name); setData(card, 'type', 'webradio'); - setData(card, 'image', data.Image); card.setAttribute('title', rowTitle); }); } diff --git a/htdocs/js/viewBrowseRadioWebradiodb.js b/htdocs/js/viewBrowseRadioWebradiodb.js index 09f605441..cae439b98 100644 --- a/htdocs/js/viewBrowseRadioWebradiodb.js +++ b/htdocs/js/viewBrowseRadioWebradiodb.js @@ -10,30 +10,29 @@ * @returns {void} */ function handleBrowseRadioWebradiodb() { - setFocusId('BrowseRadioWebradiodbSearchStr'); - if (webradioDb === null) { - //fetch webradiodb database - getWebradiodb(); - return; - } + handleSearchExpression('BrowseRadioWebradiodb'); toggleBtnChkId('BrowseRadioWebradiodbSortDesc', app.current.sort.desc); selectTag('BrowseRadioWebradiodbSortTagsList', undefined, app.current.sort.tag); - - setDataId('BrowseRadioWebradiodbGenreFilter', 'value', app.current.filter['genre']); - elGetById('BrowseRadioWebradiodbGenreFilter').value = app.current.filter['genre']; - setDataId('BrowseRadioWebradiodbCountryFilter', 'value', app.current.filter['country']); - elGetById('BrowseRadioWebradiodbCountryFilter').value = app.current.filter['country']; - setDataId('BrowseRadioWebradiodbLanguageFilter', 'value', app.current.filter['language']); - elGetById('BrowseRadioWebradiodbLanguageFilter').value = app.current.filter['language']; - setDataId('BrowseRadioWebradiodbCodecFilter', 'value', app.current.filter['codec']); - elGetById('BrowseRadioWebradiodbCodecFilter').value = app.current.filter['codec']; - setDataId('BrowseRadioWebradiodbBitrateFilter', 'value', app.current.filter['bitrate']); - elGetById('BrowseRadioWebradiodbBitrateFilter').value = app.current.filter['bitrate']; - - const result = searchWebradiodb(app.current.search, app.current.filter['genre'], - app.current.filter['country'], app.current.filter['language'], app.current.filter['codec'], - app.current.filter['bitrate'], app.current.sort, app.current.offset, app.current.limit); - parseSearchWebradiodb(result); + const searchMatchEl = elGetById(app.id + 'SearchMatch'); + + sendAPI("MYMPD_API_WEBRADIODB_SEARCH", { + "offset": app.current.offset, + "limit": app.current.limit, + "expression": app.current.search, + "sort": app.current.sort.tag, + "sortdesc": app.current.sort.desc + }, parseSearchWebradiodb, true); + + if (app.current.filter === 'Bitrate') { + elShowId(app.id + 'SearchBitrateMatch'); + searchMatchEl.value = '>='; + } + else { + if (getSelectValue(searchMatchEl) === '>=') { + searchMatchEl.value = 'contains'; + } + elHideId(app.id + 'SearchBitrateMatch'); + } } /** @@ -41,47 +40,8 @@ function handleBrowseRadioWebradiodb() { * @returns {void} */ function initViewBrowseRadioWebradiodb() { - elGetById('BrowseRadioWebradiodbSearchStr').addEventListener('keydown', function(event) { - //handle Enter key on keydown for IME composing compatibility - if (event.key !== 'Enter') { - return; - } - clearSearchTimer(); - searchTimer = setTimeout(function() { - doSearchWebradiodb(); - }, searchTimerTimeout); - }, false); - - // Android does not support search on type - if (userAgentData.isAndroid === false) { - elGetById('BrowseRadioWebradiodbSearchStr').addEventListener('keyup', function(event) { - if (ignoreKeys(event) === true) { - return; - } - clearSearchTimer(); - searchTimer = setTimeout(function() { - doSearchWebradiodb(); - }, searchTimerTimeout); - }, false); - } - - elGetById('BrowseRadioWebradiodbFilter').addEventListener('shown.bs.collapse', function() { - elGetById('BrowseRadioWebradiodbFilterBtn').classList.add('active'); - setScrollViewHeight(elGetById('BrowseRadioWebradiodbList')); - }, false); - - elGetById('BrowseRadioWebradiodbFilter').addEventListener('hidden.bs.collapse', function() { - elGetById('BrowseRadioWebradiodbFilterBtn').classList.remove('active'); - setScrollViewHeight(elGetById('BrowseRadioWebradiodbList')); - }, false); - - initWebradiodbFilter('BrowseRadioWebradiodbGenreFilter', 'webradioGenres', 'Genre'); - initWebradiodbFilter('BrowseRadioWebradiodbCountryFilter', 'webradioCountries', 'Country'); - initWebradiodbFilter('BrowseRadioWebradiodbLanguageFilter', 'webradioLanguages', 'Language'); - initWebradiodbFilter('BrowseRadioWebradiodbCodecFilter', 'webradioCodecs', 'Codec'); - initWebradiodbFilter('BrowseRadioWebradiodbBitrateFilter', 'webradioBitrates', 'Bitrate'); + initSearchExpression('BrowseRadioWebradiodb'); initSortBtns('BrowseRadioWebradiodb'); - setView('BrowseRadioWebradiodb'); } @@ -106,173 +66,6 @@ function viewBrowseRadioWebradiodbListClickHandler(event, target) { } } -/** - * Initializes the webradioDB filter elements - * @param {string} id input id to initialize - * @param {string} dbField database fields - * @param {string} name name of the field - * @returns {void} - */ -function initWebradiodbFilter(id, dbField, name) { - elGetById(id).addEventListener('change', function() { - doSearchWebradiodb(); - }, false); - setDataId(id, 'cb-filter', 'filterWebradiodbFilter'); - setDataId(id, 'cb-filter-options', [id, dbField, name]); -} - -/** - * Fetches the webradioDB - * @returns {void} - */ -function getWebradiodb() { - const list = settings['view' + app.id].mode === 'table' - ? document.querySelector('#BrowseRadioWebradiodbList > tbody') - : elGetById('BrowseRadioWebradiodbList'); - elReplaceChild(list, - loadingMsgEl(settings.viewBrowseRadioWebradiodb.fields.length + 1, undefined) - ); - sendAPI("MYMPD_API_CLOUD_WEBRADIODB_COMBINED_GET", {}, function(obj) { - webradioDb = obj.result.data; - filterWebradiodbFilter('BrowseRadioWebradiodbGenreFilter', 'webradioGenres', 'Genre', ''); - filterWebradiodbFilter('BrowseRadioWebradiodbCountryFilter', 'webradioCountries', 'Country', ''); - filterWebradiodbFilter('BrowseRadioWebradiodbLanguageFilter', 'webradioLanguages', 'Language', ''); - filterWebradiodbFilter('BrowseRadioWebradiodbCodecFilter', 'webradioCodecs', 'Codec', ''); - filterWebradiodbFilter('BrowseRadioWebradiodbBitrateFilter', 'webradioBitrates', 'Bitrate', ''); - const result = searchWebradiodb(app.current.search, app.current.filter['genre'], - app.current.filter['country'], app.current.filter['language'], app.current.filter['codec'], - app.current.filter['bitrate'], app.current.sort, app.current.offset, app.current.limit); - parseSearchWebradiodb(result); - }, false); -} - -/** - * Callback function for the custom select filter for webradioDB - * @param {string} id element id - * @param {string} dbField name of the array to filter - * @param {string} placeholder placeholder value - * @param {string} searchStr search string - * @returns {void} - */ -function filterWebradiodbFilter(id, dbField, placeholder, searchStr) { - searchStr = searchStr.toLowerCase(); - const el = elGetById(id); - elClear(el.filterResult); - el.addFilterResult(tn(placeholder), ''); - let i = 0; - for (const value of webradioDb[dbField]) { - if (searchStr === '' || - value.toLowerCase().indexOf(searchStr) > -1) - { - el.addFilterResult(value, value); - i++; - } - if (i === 50) { - break; - } - } -} - -/** - * Starts the webradioDB search - * @returns {void} - */ -function doSearchWebradiodb() { - const searchstr = elGetById('BrowseRadioWebradiodbSearchStr').value; - const genre = getDataId('BrowseRadioWebradiodbGenreFilter', 'value'); - const country = getDataId('BrowseRadioWebradiodbCountryFilter', 'value'); - const language = getDataId('BrowseRadioWebradiodbLanguageFilter', 'value'); - const codec = getDataId('BrowseRadioWebradiodbCodecFilter', 'value'); - const bitrate = getDataId('BrowseRadioWebradiodbBitrateFilter', 'value'); - appGoto('Browse', 'Radio', 'Webradiodb', - 0, app.current.limit, {"genre": genre, "country": country, "language": language, "codec": codec, "bitrate": bitrate}, - app.current.sort, undefined, searchstr, 0); -} - -/** - * Searches the webradioDB - * @param {string} name webradio name - * @param {string} genre webradio genre - * @param {string} country webradio country - * @param {string} language webradio language - * @param {string} codec webradio codec - * @param {number} bitrate webradio bitrate - * @param {object} sort webradio sort - * @param {number} offset start offset - * @param {number} limit maximum number of results - * @returns {object} the search result - */ -function searchWebradiodb(name, genre, country, language, codec, bitrate, sort, offset, limit) { - name = name.toLowerCase(); - const obj = { - "result": { - "totalEntities": 0, - "returnedEntities": 0, - "data": [] - } - }; - if (webradioDb === null) { - logDebug('WebradioDb is empty'); - return obj; - } - - for (const key in webradioDb.webradios) { - if (webradioDb.webradios[key].Name.toLowerCase().indexOf(name) > -1 && - (genre === '' || webradioDb.webradios[key].Genre.includes(genre)) && - (country === '' || country === webradioDb.webradios[key].Country) && - (language === '' || webradioDb.webradios[key].Languages.includes(language)) && - (codec === '' || webradioDb.webradios[key].allCodecs.includes(codec)) && - (bitrate === 0 || bitrate <= webradioDb.webradios[key].highestBitrate) - ) { - webradioDb.webradios[key].Type = 'webradiodb'; - obj.result.data.push(webradioDb.webradios[key]); - obj.result.totalEntities++; - } - } - obj.result.data.sort(function(a, b) { - //case insensitive sorting - let lca; - let lcb; - if (typeof a === 'string') { - lca = a[sort.tag].toLowerCase(); - lcb = b[sort.tag].toLowerCase(); - } - else { - lca = a[sort.tag]; - lcb = b[sort.tag]; - } - //primary sort by defined tag - if (lca < lcb) { - return sort.desc === false ? -1 : 1; - } - if (lca > lcb) { - return sort.desc === false ? 1 : -1; - } - //secondary sort by Name - if (sort.tag !== 'Name') { - lca = a.Name.toLowerCase(); - lcb = b.Name.toLowerCase(); - if (lca < lcb) { - return sort.desc === false ? -1 : 1; - } - if (lca > lcb) { - return sort.desc === false ? 1 : -1; - } - } - //equal - return 0; - }); - if (offset > 0) { - obj.result.data.splice(0, offset - 1); - } - const last = obj.result.data.length - limit; - if (last > 0) { - obj.result.data.splice(limit, last); - } - obj.result.returnedEntities = obj.result.data.length; - return obj; -} - /** * Parses the webradioDB search result * @param {object} obj the search result @@ -280,17 +73,6 @@ function searchWebradiodb(name, genre, country, language, codec, bitrate, sort, */ function parseSearchWebradiodb(obj) { const table = elGetById('BrowseRadioWebradiodbList'); - if (app.current.filter['genre'] === '' && - app.current.filter['country'] === '' && - app.current.filter['language'] === '' && - app.current.filter['codec'] === '' && - app.current.filter['bitrate'] === '') - { - elGetById('BrowseRadioWebradiodbFilterBtn').textContent = 'filter_list_off'; - } - else { - elGetById('BrowseRadioWebradiodbFilterBtn').textContent = 'filter_list'; - } if (checkResult(obj, table, undefined) === false) { return; @@ -303,16 +85,7 @@ function parseSearchWebradiodb(obj) { updateTable(obj, app.id, function(row, data) { setData(row, 'uri', data.StreamUri); setData(row, 'name', data.Name); - setData(row, 'genre', data.Genre); - setData(row, 'image', webradioDbPicsUri + data.Image); - setData(row, 'homepage', data.Homepage); - setData(row, 'country', data.Country); - setData(row, 'state', data.State); - setData(row, 'language', data.Languages); - setData(row, 'description', data.Description); - setData(row, 'codec', data.Codec); - setData(row, 'bitrate', data.Bitrate); - setData(row, 'type', 'stream'); + setData(row, 'type', 'webradio'); row.setAttribute('title', rowTitle); }); @@ -326,16 +99,7 @@ function parseSearchWebradiodb(obj) { updateGrid(obj, app.id, function(card, data) { setData(card, 'uri', data.StreamUri); setData(card, 'name', data.Name); - setData(card, 'genre', data.Genre); - setData(card, 'image', webradioDbPicsUri + data.Image); - setData(card, 'homepage', data.Homepage); - setData(card, 'country', data.Country); - setData(card, 'state', data.State); - setData(card, 'language', data.Languages); - setData(card, 'description', data.Description); - setData(card, 'codec', data.Codec); - setData(card, 'bitrate', data.Bitrate); - setData(card, 'type', 'stream'); + setData(card, 'type', 'webradio'); card.setAttribute('title', rowTitle); }); } diff --git a/htdocs/js/views.js b/htdocs/js/views.js index 1e82e62c4..82a67d554 100644 --- a/htdocs/js/views.js +++ b/htdocs/js/views.js @@ -638,7 +638,7 @@ function setEntryData(entry, data) { data.Thumbnail = getCssImageUri('/playlistart?playlist=' + myEncodeURIComponent(data.uri)); break; case 'webradiodb': - data.Thumbnail = getCssImageUri(webradioDbPicsUri + data.Image); + data.Thumbnail = getCssImageUri(data.Image); break; // No Default } diff --git a/src/i18n/json/de-DE.json b/src/i18n/json/de-DE.json index 66ab7dc45..5eb17f41b 100644 --- a/src/i18n/json/de-DE.json +++ b/src/i18n/json/de-DE.json @@ -853,7 +853,7 @@ "Start playing failed": "Wiedergabe konnte nicht gestartet werden", "Startup": "Start", "Startup view": "Startbildschirm", - "State": "Land", + "Region": "Region", "Statistics": "Statistiken", "Stereo": "Stereo", "Sticker": "Sticker", diff --git a/src/i18n/json/i18n.json b/src/i18n/json/i18n.json index 031c490cb..338600d00 100644 --- a/src/i18n/json/i18n.json +++ b/src/i18n/json/i18n.json @@ -2,13 +2,13 @@ "default": {"desc":"Browser default", "missingPhrases": 0}, "de-DE": {"desc":"Deutsch (de-DE)", "missingPhrases": 2}, "en-US": {"desc":"English (en-US)", "missingPhrases": 0}, - "es-AR": {"desc":"Español (es-AR)", "missingPhrases": 6}, - "fr-FR": {"desc":"Français (fr-FR)", "missingPhrases": 6}, - "it-IT": {"desc":"Italiano (it-IT)", "missingPhrases": 6}, - "ja-JP": {"desc":"日本語 (ja-JP)", "missingPhrases": 6}, - "ko-KR": {"desc":"한국어 (ko-KR)", "missingPhrases": 6}, - "nl-NL": {"desc":"Nederlands (nl-NL)", "missingPhrases": 6}, - "pl-PL": {"desc":"Polish (pl-PL)", "missingPhrases": 81}, - "zh-Hans": {"desc":"简体中文 (zh-Hans)", "missingPhrases": 34}, - "zh-Hant": {"desc":"简体中文 (zh-Hant)", "missingPhrases": 81} + "es-AR": {"desc":"Español (es-AR)", "missingPhrases": 7}, + "fr-FR": {"desc":"Français (fr-FR)", "missingPhrases": 7}, + "it-IT": {"desc":"Italiano (it-IT)", "missingPhrases": 7}, + "ja-JP": {"desc":"日本語 (ja-JP)", "missingPhrases": 7}, + "ko-KR": {"desc":"한국어 (ko-KR)", "missingPhrases": 7}, + "nl-NL": {"desc":"Nederlands (nl-NL)", "missingPhrases": 7}, + "pl-PL": {"desc":"Polish (pl-PL)", "missingPhrases": 82}, + "zh-Hans": {"desc":"简体中文 (zh-Hans)", "missingPhrases": 35}, + "zh-Hant": {"desc":"简体中文 (zh-Hant)", "missingPhrases": 82} } diff --git a/src/i18n/json/phrases.json b/src/i18n/json/phrases.json index cadc9cea5..e200a1b12 100644 --- a/src/i18n/json/phrases.json +++ b/src/i18n/json/phrases.json @@ -122,7 +122,6 @@ {"term":"Can't set playback options: MPD not connected"}, {"term":"Cancel"}, {"term":"Check WebradioDB"}, -{"term":"Checking..."}, {"term":"Choose a playlist"}, {"term":"Choose a playlist or enter a new playlist name"}, {"term":"Clear"}, @@ -694,6 +693,7 @@ {"term":"Random"}, {"term":"Rating"}, {"term":"Reconnect"}, +{"term":"Region"}, {"term":"Reload"}, {"term":"Remove"}, {"term":"Remove all downwards"}, @@ -854,7 +854,6 @@ {"term":"Start playing failed"}, {"term":"Startup"}, {"term":"Startup view"}, -{"term":"State"}, {"term":"Statistics"}, {"term":"Stereo"}, {"term":"Sticker"}, diff --git a/src/lib/validate.c b/src/lib/validate.c index c738f6a2d..774bea46f 100644 --- a/src/lib/validate.c +++ b/src/lib/validate.c @@ -11,6 +11,7 @@ #include "dist/utf8/utf8.h" #include "src/lib/log.h" #include "src/lib/sticker.h" +#include "src/lib/webradio.h" #include #include @@ -340,7 +341,7 @@ bool vcb_ismpdtag_or_any(sds data) { } /** - * Checks if string is a valid sort tag + * Checks if string is a valid sort tag for mpd * @param data sds string to check * @return true on success else false */ @@ -360,6 +361,20 @@ bool vcb_ismpdsort(sds data) { return true; } +/** + * Checks if string is a valid sort tag for webradios + * @param data sds string to check + * @return true on success else false + */ +bool vcb_iswebradiosort(sds data) { + enum webradio_tag_type tag = webradio_tag_name_parse(data); + if (tag == WEBRADIO_TAG_UNKNOWN) { + MYMPD_LOG_WARN(NULL, "Unknown sort tag \"%s\"", data); + return false; + } + return true; +} + /** * Checks if string is a valid sticker sort type * @param data sds string to check diff --git a/src/lib/validate.h b/src/lib/validate.h index 14787bd22..77e1e1edb 100644 --- a/src/lib/validate.h +++ b/src/lib/validate.h @@ -34,6 +34,7 @@ bool vcb_istaglist(sds data); bool vcb_ismpdtag(sds data); bool vcb_ismpdtag_or_any(sds data); bool vcb_ismpdsort(sds data); +bool vcb_iswebradiosort(sds data); bool vcb_issearchexpression(sds data); bool vcb_isstickersort(sds data); diff --git a/src/lib/webradio.c b/src/lib/webradio.c index df09c8720..eedbe1de1 100644 --- a/src/lib/webradio.c +++ b/src/lib/webradio.c @@ -28,7 +28,7 @@ struct t_webradio_data *webradio_data_new(enum webradio_type type) { data->image = NULL; data->homepage = NULL; data->country = NULL; - data->state = NULL; + data->region = NULL; data->description = NULL; data->type = type; return data; @@ -49,7 +49,7 @@ void webradio_data_free(struct t_webradio_data *data) { FREE_SDS(data->image); FREE_SDS(data->homepage); FREE_SDS(data->country); - FREE_SDS(data->state); + FREE_SDS(data->region); FREE_SDS(data->description); // pointer data itself FREE_PTR(data); @@ -86,7 +86,7 @@ void webradio_tags_search(struct t_webradio_tags *tags) { tags->len = 0; tags->tags[tags->len++] = WEBRADIO_TAG_NAME; tags->tags[tags->len++] = WEBRADIO_TAG_COUNTRY; - tags->tags[tags->len++] = WEBRADIO_TAG_STATE; + tags->tags[tags->len++] = WEBRADIO_TAG_REGION; tags->tags[tags->len++] = WEBRADIO_TAG_DESCRIPTION; tags->tags[tags->len++] = WEBRADIO_TAG_GENRES; tags->tags[tags->len++] = WEBRADIO_TAG_LANGUAGES; @@ -97,7 +97,7 @@ static const char *webradio_tag_types_names[WEBRADIO_TAG_COUNT] = { [WEBRADIO_TAG_IMAGE] = "Image", [WEBRADIO_TAG_HOMEPAGE] = "Homepage", [WEBRADIO_TAG_COUNTRY] = "Country", - [WEBRADIO_TAG_STATE] = "State", + [WEBRADIO_TAG_REGION] = "Region", [WEBRADIO_TAG_DESCRIPTION] = "Description", [WEBRADIO_TAG_URIS] = "Uri", [WEBRADIO_TAG_BITRATE] = "Bitrate", @@ -148,8 +148,8 @@ const char *webradio_get_tag(const struct t_webradio_data *webradio, enum webrad return idx == 0 ? webradio->homepage : NULL; case WEBRADIO_TAG_COUNTRY: return idx == 0 ? webradio->country : NULL; - case WEBRADIO_TAG_STATE: - return idx == 0 ? webradio->state : NULL; + case WEBRADIO_TAG_REGION: + return idx == 0 ? webradio->region : NULL; case WEBRADIO_TAG_DESCRIPTION: return idx == 0 ? webradio->description : NULL; case WEBRADIO_TAG_URIS: @@ -277,7 +277,7 @@ bool webradios_save_to_disk(struct t_config *config, struct t_webradios *webradi mpack_write_kv(&writer, "Image", data->image); mpack_write_kv(&writer, "Homepage", data->homepage); mpack_write_kv(&writer, "Country", data->country); - mpack_write_kv(&writer, "State", data->state); + mpack_write_kv(&writer, "Region", data->region); mpack_write_kv(&writer, "Description", data->description); mpack_write_cstr(&writer, "Genres"); mpack_build_array(&writer); @@ -367,7 +367,7 @@ bool webradios_read_from_disk(struct t_config *config, struct t_webradios *webra data->image = mpackstr_sds(entry, "Image"); data->homepage = mpackstr_sds(entry, "Homepage"); data->country = mpackstr_sds(entry, "Country"); - data->state = mpackstr_sds(entry, "State"); + data->region = mpackstr_sds(entry, "Region"); data->description = mpackstr_sds(entry, "Description"); mpack_node_t genre_node = mpack_node_map_cstr(entry, "Genres"); size_t genre_len = mpack_node_array_length(genre_node); diff --git a/src/lib/webradio.h b/src/lib/webradio.h index 68c1643e6..f7b90e92a 100644 --- a/src/lib/webradio.h +++ b/src/lib/webradio.h @@ -38,7 +38,7 @@ enum webradio_tag_type { WEBRADIO_TAG_IMAGE, WEBRADIO_TAG_HOMEPAGE, WEBRADIO_TAG_COUNTRY, - WEBRADIO_TAG_STATE, + WEBRADIO_TAG_REGION, WEBRADIO_TAG_DESCRIPTION, WEBRADIO_TAG_URIS, WEBRADIO_TAG_BITRATE, @@ -61,7 +61,7 @@ struct t_webradio_data { sds image; //!< Station image sds homepage; //!< Homepage sds country; //!< Country - sds state; //!< State or region + sds region; //!< State or region sds description; //!< Short description struct t_list uris; //!< List of Uris (uri, bitrate and codec) struct t_list genres; //!< List of genres diff --git a/src/mpd_worker/webradiodb.c b/src/mpd_worker/webradiodb.c index 360558706..e81d8c64e 100644 --- a/src/mpd_worker/webradiodb.c +++ b/src/mpd_worker/webradiodb.c @@ -174,7 +174,7 @@ static struct t_webradio_data *parse_webradiodb_data(sds str) { json_get_string(str, "$.Image", 1, URI_LENGTH_MAX, &data->image, vcb_isname, &parse_error) == false || json_get_string(str, "$.Homepage", 0, URI_LENGTH_MAX, &data->homepage, vcb_isuri, &parse_error) == false || json_get_string(str, "$.Country", 0, URI_LENGTH_MAX, &data->country, vcb_isname, &parse_error) == false || - json_get_string(str, "$.State", 0, URI_LENGTH_MAX, &data->state, vcb_isname, &parse_error) == false || + json_get_string(str, "$.Region", 0, URI_LENGTH_MAX, &data->region, vcb_isname, &parse_error) == false || json_get_string(str, "$.Description", 0, URI_LENGTH_MAX, &data->description, vcb_istext, &parse_error) == false || json_get_array_string(str, "$.Genre", &data->genres, vcb_isname, 64, &parse_error) == false || json_get_array_string(str, "$.Languages", &data->languages, vcb_isname, 64, &parse_error) == false || diff --git a/src/mympd_api/mympd_api_handler.c b/src/mympd_api/mympd_api_handler.c index 2b2a7e6a5..946ae7685 100644 --- a/src/mympd_api/mympd_api_handler.c +++ b/src/mympd_api/mympd_api_handler.c @@ -1598,10 +1598,12 @@ void mympd_api_handler(struct t_mympd_state *mympd_state, struct t_partition_sta case MYMPD_API_WEBRADIODB_SEARCH: { if (json_get_uint(request->data, "$.params.offset", 0, MPD_PLAYLIST_LENGTH_MAX, &uint_buf1, &parse_error) == true && json_get_uint(request->data, "$.params.limit", MPD_RESULTS_MIN, MPD_RESULTS_MAX, &uint_buf2, &parse_error) == true && - json_get_string(request->data, "$.params.expression", 0, EXPRESSION_LEN_MAX, &sds_buf1, vcb_isname, &parse_error) == true) + json_get_string(request->data, "$.params.expression", 0, EXPRESSION_LEN_MAX, &sds_buf1, vcb_isname, &parse_error) == true && + json_get_string(request->data, "$.params.sort", 1, NAME_LEN_MAX, &sds_buf2, vcb_iswebradiosort, &parse_error) == true && + json_get_bool(request->data, "$.params.sortdesc", &bool_buf1, &parse_error) == true) { response->data = mympd_api_webradio_search(mympd_state->webradiodb, response->data, request->id, - MYMPD_API_WEBRADIODB_SEARCH, uint_buf1, uint_buf2, sds_buf1); + MYMPD_API_WEBRADIODB_SEARCH, uint_buf1, uint_buf2, sds_buf1, sds_buf2, bool_buf1); } break; } @@ -1609,10 +1611,12 @@ void mympd_api_handler(struct t_mympd_state *mympd_state, struct t_partition_sta case MYMPD_API_WEBRADIO_FAVORITE_SEARCH: { if (json_get_uint(request->data, "$.params.offset", 0, MPD_PLAYLIST_LENGTH_MAX, &uint_buf1, &parse_error) == true && json_get_uint(request->data, "$.params.limit", MPD_RESULTS_MIN, MPD_RESULTS_MAX, &uint_buf2, &parse_error) == true && - json_get_string(request->data, "$.params.searchstr", 0, NAME_LEN_MAX, &sds_buf1, vcb_isname, &parse_error) == true) + json_get_string(request->data, "$.params.expression", 0, NAME_LEN_MAX, &sds_buf1, vcb_isname, &parse_error) == true && + json_get_string(request->data, "$.params.sort", 1, NAME_LEN_MAX, &sds_buf2, vcb_iswebradiosort, &parse_error) == true && + json_get_bool(request->data, "$.params.sortdesc", &bool_buf1, &parse_error) == true) { response->data = mympd_api_webradio_search(mympd_state->webradio_favorites, response->data, request->id, - MYMPD_API_WEBRADIO_FAVORITE_SEARCH, uint_buf1, uint_buf2, sds_buf1); + MYMPD_API_WEBRADIO_FAVORITE_SEARCH, uint_buf1, uint_buf2, sds_buf1, sds_buf2, bool_buf1); } break; } @@ -1639,7 +1643,7 @@ void mympd_api_handler(struct t_mympd_state *mympd_state, struct t_partition_sta json_get_string(request->data, "$.params.codec", 0, FILEPATH_LEN_MAX, &sds_buf3, vcb_isprint, &parse_error) == true && json_get_int(request->data, "$.params.bitrate", 0, 2048, &int_buf1, &parse_error) == true && json_get_string(request->data, "$.params.description", 0, CONTENT_LEN_MAX, &webradio->description, vcb_isname, &parse_error) == true && - json_get_string(request->data, "$.params.state", 0, CONTENT_LEN_MAX, &webradio->state, vcb_isname, &parse_error) == true) + json_get_string(request->data, "$.params.region", 0, CONTENT_LEN_MAX, &webradio->region, vcb_isname, &parse_error) == true) { list_push(&webradio->uris, sds_buf1, int_buf1, sds_buf3, NULL); rc = mympd_api_webradio_favorite_save(mympd_state->webradio_favorites, webradio, sds_buf2); diff --git a/src/mympd_api/webradio.c b/src/mympd_api/webradio.c index 6564c593f..33cdebb1a 100644 --- a/src/mympd_api/webradio.c +++ b/src/mympd_api/webradio.c @@ -19,13 +19,16 @@ * @param webradio_favorites Webradio favorites struct * @param buffer already allocated sds string to append the response * @param request_id jsonrpc request id - * @param expression string to search + * @param cmd_id API ID * @param offset offset for the list * @param limit maximum entries to print + * @param expression string to search + * @param sort Sort tag + * @param sort_desc Sort descending? * @return pointer to buffer */ sds mympd_api_webradio_search(struct t_webradios *webradios, sds buffer, unsigned request_id, - enum mympd_cmd_ids cmd_id, unsigned offset, unsigned limit, sds expression) + enum mympd_cmd_ids cmd_id, unsigned offset, unsigned limit, sds expression, sds sort, bool sort_desc) { if (webradios->db == NULL) { return jsonrpc_respond_message(buffer, cmd_id, request_id, @@ -40,6 +43,9 @@ sds mympd_api_webradio_search(struct t_webradios *webradios, sds buffer, unsigne raxIterator iter; raxStart(&iter, webradios->db); raxSeek(&iter, "^", NULL, 0); + //TODO: implement sorting + (void) sort; + (void) sort_desc; buffer = jsonrpc_respond_start(buffer, cmd_id, request_id); buffer = sdscat(buffer,"\"data\":["); while (raxNext(&iter)) { @@ -49,7 +55,9 @@ sds mympd_api_webradio_search(struct t_webradios *webradios, sds buffer, unsigne if (entities_returned++) { buffer= sdscatlen(buffer, ",", 1); } + buffer = sdscatlen(buffer, "{", 1); buffer = mympd_api_webradio_print(webradio_data, buffer); + buffer = sdscatlen(buffer, "}", 1); } entities_found++; if (entities_found == real_limit) { @@ -85,7 +93,9 @@ sds mympd_api_webradio_from_uri_tojson(struct t_mympd_state *mympd_state, const sds buffer = sdsempty(); struct t_webradio_data *webradio = mympd_api_webradio_by_uri(mympd_state, uri, WEBRADIO_ALL); if (webradio != NULL) { + buffer = sdscatlen(buffer, "{", 1); buffer = mympd_api_webradio_print(webradio, buffer); + buffer = sdscatlen(buffer, "}", 1); } return buffer; } @@ -97,14 +107,13 @@ sds mympd_api_webradio_from_uri_tojson(struct t_mympd_state *mympd_state, const * @return pointer to buffer */ sds mympd_api_webradio_print(struct t_webradio_data *webradio, sds buffer) { - buffer = sdscatlen(buffer, "{", 1); buffer = tojson_sds(buffer, "Name", webradio->name, true); sds image = webradio_get_cover_uri(webradio, sdsempty()); buffer = tojson_sds(buffer, "Image", image, true); FREE_SDS(image); buffer = tojson_sds(buffer, "Homepage", webradio->homepage, true); buffer = tojson_sds(buffer, "Country", webradio->country, true); - buffer = tojson_sds(buffer, "State", webradio->state, true); + buffer = tojson_sds(buffer, "Region", webradio->region, true); buffer = tojson_sds(buffer, "Description", webradio->description, true); struct t_list_node *current = webradio->uris.head; buffer = tojson_sds(buffer, "StreamUri", current->key, true); @@ -133,7 +142,6 @@ sds mympd_api_webradio_print(struct t_webradio_data *webradio, sds buffer) { buffer = list_to_json_array(buffer, &webradio->languages); buffer = sdscatlen(buffer, ",", 1); buffer = tojson_char(buffer, "Type", webradio_type_name(webradio->type), false); - buffer = sdscatlen(buffer, "}", 1); return buffer; } @@ -157,7 +165,6 @@ sds mympd_api_webradio_radio_get_by_name(struct t_webradios *webradios, sds buff } struct t_webradio_data *webradio = (struct t_webradio_data *)data; buffer = jsonrpc_respond_start(buffer, cmd_id, request_id); - buffer = sdscat(buffer, "\"data\":"); buffer = mympd_api_webradio_print(webradio, buffer); buffer = jsonrpc_end(buffer); return buffer; @@ -183,7 +190,6 @@ sds mympd_api_webradio_radio_get_by_uri(struct t_webradios *webradios, sds buffe } struct t_webradio_data *webradio = (struct t_webradio_data *)data; buffer = jsonrpc_respond_start(buffer, cmd_id, request_id); - buffer = sdscat(buffer, "\"data\":"); buffer = mympd_api_webradio_print(webradio, buffer); buffer = jsonrpc_end(buffer); return buffer; diff --git a/src/mympd_api/webradio.h b/src/mympd_api/webradio.h index 3957f438a..116f6903b 100644 --- a/src/mympd_api/webradio.h +++ b/src/mympd_api/webradio.h @@ -12,7 +12,7 @@ #include "src/lib/mympd_state.h" sds mympd_api_webradio_search(struct t_webradios *webradios, sds buffer, unsigned request_id, - enum mympd_cmd_ids cmd_id, unsigned offset, unsigned limit, sds expression); + enum mympd_cmd_ids cmd_id, unsigned offset, unsigned limit, sds expression, sds sort, bool sort_desc); sds mympd_api_webradio_radio_get_by_name(struct t_webradios *webradios, sds buffer, unsigned request_id, sds name); sds mympd_api_webradio_radio_get_by_uri(struct t_webradios *webradios, sds buffer, unsigned request_id, sds uri); sds mympd_api_webradio_from_uri_tojson(struct t_mympd_state *mympd_state, const char *uri);