Merge branch 'devel'

jcorporation · Mar 3, 2024 · 7799f4d · 7799f4d
2 parents 56d22e2 + c782a11
commit 7799f4d
Show file tree

Hide file tree

Showing 33 changed files with 1,385 additions and 1,313 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 https://github.com/jcorporation/myMPD/
 
+## myMPD 14.0.4 (2024-03-03)
+
+This is a small bugfix release.
+
+### Changelog
+
+- Upd: translations
+- Fix: Disable search on type for Android #1220
+- Fix: Remove newlines from state files #1232
+- Fix: Remember last state of filesystem folder #1234
+
 ***
 
 ## myMPD 14.0.3 (2024-02-15)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ cmake_policy(SET CMP0003 NEW)
 # myMPD is written in C
 # supported compilers: gcc, clang
 project(mympd
-  VERSION 14.0.3
+  VERSION 14.0.4
   LANGUAGES C
 )
 

diff --git a/contrib/man/mympd-config.1 b/contrib/man/mympd-config.1
@@ -1,6 +1,6 @@
 .\" Manpage for mympd-config.
 .\" Contact <mail@jcgames.de> to correct errors or typos.
-.TH man 1 "15 Feb 2024" "14.0.3" "mympd-config man page"
+.TH man 1 "03 Mar 2024" "14.0.4" "mympd-config man page"
 
 .SH NAME
 mympd-config \- mympd configuration tool

diff --git a/contrib/man/mympd-script.1 b/contrib/man/mympd-script.1
@@ -1,6 +1,6 @@
 .\" Manpage for mympd-script.
 .\" Contact <mail@jcgames.de> to correct errors or typos.
-.TH man 1 "15 Feb 2024" "14.0.3" "mympd-script man page"
+.TH man 1 "03 Mar 2024" "14.0.4" "mympd-script man page"
 
 .SH NAME
 mympd-script \- mympd command line tool to execute scripts

diff --git a/contrib/man/mympd.1 b/contrib/man/mympd.1
@@ -1,6 +1,6 @@
 .\" Manpage for mympd.
 .\" Contact <mail@jcgames.de> to correct errors or typos.
-.TH man 1 "15 Feb 2024" "14.0.3" "mympd man page"
+.TH man 1 "03 Mar 2024" "14.0.4" "mympd man page"
 
 .SH NAME
 myMPD \- standalone and mobile friendly web mpd client

diff --git a/contrib/packaging/alpine/APKBUILD b/contrib/packaging/alpine/APKBUILD
@@ -6,7 +6,7 @@
 # Maintainer: Juergen Mang <mail@jcgames.de>
 #
 pkgname=mympd
-pkgver=14.0.3
+pkgver=14.0.4
 pkgrel=0
 pkgdesc="myMPD is a standalone and mobile friendly web-based MPD client."
 url="https://jcorporation.github.io/myMPD/"

diff --git a/contrib/packaging/arch/PKGBUILD b/contrib/packaging/arch/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Juergen Mang <mail@jcgames.de>
 
 pkgname=mympd
-pkgver=14.0.3
+pkgver=14.0.4
 pkgrel=1
 pkgdesc="A standalone and mobile friendly web-based MPD client."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')

diff --git a/contrib/packaging/debian/changelog b/contrib/packaging/debian/changelog
@@ -1,5 +1,5 @@
-mympd (14.0.3-1) unstable; urgency=medium
+mympd (14.0.4-1) unstable; urgency=medium
 
   * Release from master
 
- -- Juergen Mang <mail@jcgames.de>  Thu, 15 Feb 2024 21:02:19 +0100
+ -- Juergen Mang <mail@jcgames.de>  Sun, 03 Mar 2024 21:03:46 +0100
diff --git a/contrib/packaging/freebsd/multimedia/mympd/Makefile b/contrib/packaging/freebsd/multimedia/mympd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	myMPD
 DISTVERSIONPREFIX= v
-DISTVERSION=	14.0.3
+DISTVERSION=	14.0.4
 CATEGORIES=	multimedia
 
 MAINTAINER=	robert.david@posteo.net

diff --git a/...too/media-sound/mympd/mympd-14.0.3.ebuild → ...too/media-sound/mympd/mympd-14.0.4.ebuild b/...too/media-sound/mympd/mympd-14.0.3.ebuild → ...too/media-sound/mympd/mympd-14.0.4.ebuild
diff --git a/contrib/packaging/openwrt/Makefile b/contrib/packaging/openwrt/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := mympd
-PKG_VERSION := 14.0.3
+PKG_VERSION := 14.0.4
 PKG_RELEASE := 1
 
 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/contrib/packaging/rpm/mympd.spec b/contrib/packaging/rpm/mympd.spec
@@ -4,7 +4,7 @@
 # (c) 2018-2024 Juergen Mang <mail@jcgames.de>
 
 Name:           mympd
-Version:        14.0.3
+Version:        14.0.4
 Release:        0
 License:        GPL-3.0-or-later
 Group:          Productivity/Multimedia/Sound/Players
@@ -69,5 +69,5 @@ fi
 %license LICENSE.md
 
 %changelog
-* Thu Feb 15 2024 Juergen Mang <mail@jcgames.de> 14.0.3-0
+* Sun Mar 03 2024 Juergen Mang <mail@jcgames.de> 14.0.4-0
 - Version from master
diff --git a/docs/_includes/version b/docs/_includes/version
@@ -1 +1 @@
-14.0.3
+14.0.4
diff --git a/docs/references/translating_status.md b/docs/references/translating_status.md
@@ -1,14 +1,14 @@
 - bg-BG: 991 missing phrases
-- es-AR: 7 missing phrases
+- es-AR: fully translated
 - es-ES: 853 missing phrases
 - es-VE: 853 missing phrases
 - fi-FI: 850 missing phrases
 - fr-FR: 1 missing phrases
 - it-IT: fully translated
 - ja-JP: 12 missing phrases
-- ko-KR: 1 missing phrases
+- ko-KR: fully translated
 - nl-NL: 1 missing phrases
-- pl-PL: 1 missing phrases
+- pl-PL: fully translated
 - ru-RU: 74 missing phrases
-- zh-Hans: 1 missing phrases
-- zh-Hant: 1149 missing phrases
+- zh-Hans: fully translated
+- zh-Hant: fully translated
diff --git a/htdocs/index.html b/htdocs/index.html
@@ -201,7 +201,7 @@ <h2 id="PlaybackTitle" data-href='{"cmd": "clickTitle", "options": []}'></h2>
               <option value="!~" class="featPcre">!~</option>
               <option id="QueueCurrentSearchPriorityMatch" value=">=">&gt;=</option>
             </select>
-            <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search queue" class="form-control rounded-start-0 rounded-end" id="QueueCurrentSearchStr"/>
+            <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search queue" class="form-control rounded-start-0 rounded-end" id="QueueCurrentSearchStr"/>
           </div>
           <div class="btn-group me-2">
             <button data-title-phrase="Playback settings" type="button" class="btn btn-secondary mi" data-bs-toggle="modal" href="#modalPlayback">tune</button>
@@ -290,7 +290,7 @@ <h2 data-phrase="Action for selection" class="dropdown-header"></h2>
               <option value="!=">!=</option>
               <option value="!~">!~</option>
             </select>
-            <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search" class="form-control rounded-end" id="QueueLastPlayedSearchStr"/>
+            <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search" class="form-control rounded-end" id="QueueLastPlayedSearchStr"/>
           </div>
           <div class="btn-group me-2 featHome">
             <button data-title-phrase="Add view to homescreen" data-href='{"cmd": "addViewToHome", "options": []}' type="button" class="btn btn-secondary mi">add_to_home_screen</button>
@@ -349,7 +349,7 @@ <h2 data-phrase="Action for selection" class="dropdown-header"></h2>
                 <option value="!=">!=</option>
                 <option value="!~">!~</option>
               </select>
-              <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search" class="form-control rounded-end" id="QueueJukeboxSongSearchStr"/>
+              <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search" class="form-control rounded-end" id="QueueJukeboxSongSearchStr"/>
             </div>
             <div class="btn-group me-2">
               <button data-title-phrase="Clear jukebox queue" type="button" class="btn btn-secondary mi" data-href='{"cmd": "clearJukeboxQueue", "options": []}'>clear_all</button>
@@ -411,7 +411,7 @@ <h2 data-phrase="Action for selection" class="dropdown-header"></h2>
                 <option value="!=">!=</option>
                 <option value="!~">!~</option>
               </select>
-              <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search" class="form-control rounded-end" id="QueueJukeboxAlbumSearchStr"/>
+              <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search" class="form-control rounded-end" id="QueueJukeboxAlbumSearchStr"/>
             </div>
             <div class="btn-group me-2">
               <button data-title-phrase="Clear jukebox queue" type="button" class="btn btn-secondary mi" data-href='{"cmd": "clearJukeboxQueue", "options": []}'>clear_all</button>
@@ -460,7 +460,7 @@ <h2 data-phrase="Action for selection" class="dropdown-header"></h2>
                 <span class="mi me-2">search</span>
                 <span id="BrowsePlaylistListSearchTagsDesc"></span>
               </span>
-              <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowsePlaylistListSearchStr"/>
+              <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowsePlaylistListSearchStr"/>
             </div>
             <div class="btn-group me-2 featSmartpls">
               <button data-title-phrase="Add smart playlist" class="btn btn-secondary dropdown-toggle mi" type="button" data-bs-toggle="dropdown">playlist_add</button>
@@ -528,7 +528,7 @@ <h2 data-phrase="Action for selection" class="dropdown-header"></h2>
                 <option value="!=">!=</option>
                 <option value="!~">!~</option>
               </select>
-              <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowsePlaylistDetailSearchStr"/>
+              <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowsePlaylistDetailSearchStr"/>
             </div>
             <div id="BrowsePlaylistDetailContentBtns">
               <div class="btn-group me-2">
@@ -628,7 +628,7 @@ <h2 data-phrase="Action for selection" class="dropdown-header"></h2>
                 <span class="mi me-2">search</span>
                 <span id="BrowseDatabaseTagSearchTagDesc"></span>
               </span>
-              <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowseDatabaseTagSearchStr"/>
+              <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowseDatabaseTagSearchStr"/>
             </div>
             <div class="btn-group me-2">
               <button class="btn btn-secondary mi" id="BrowseDatabaseTagListSortDesc" data-title-phrase="Sort">sort</button>
@@ -667,7 +667,7 @@ <h2 data-phrase="Action for selection" class="dropdown-header"></h2>
                 <option value="!=">!=</option>
                 <option value="!~">!~</option>
               </select>
-              <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowseDatabaseAlbumListSearchStr"/>
+              <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowseDatabaseAlbumListSearchStr"/>
             </div>
             <div class="btn-group me-2">
               <button id="btnDatabaseAlbumListSortDropdown" data-title-phrase="Sort by" class="btn btn-secondary dropdown-toggle mi" type="button" data-bs-toggle="dropdown">sort</button>
@@ -782,7 +782,7 @@ <h2 class="dropdown-header" data-phrase="Tags"></h2>
               <span class="mi me-2">search</span>
               <span id="BrowseFilesystemSearchTagDesc"></span>
             </span>
-            <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowseFilesystemSearchStr"/>
+            <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowseFilesystemSearchStr"/>
           </div>
           <div class="btn-group me-2" id="BrowseFilesystemAddAllSongsGrp">
             <button data-title-phrase="Append to queue" data-href='{"cmd": "addAllFromFilesystem", "options": ["append"]}' id="BrowseFilesystemAddAllSongs" class="btn btn-secondary mi">library_add</button>
@@ -848,7 +848,7 @@ <h2 data-phrase="Action for selection" class="dropdown-header"></h2>
             </div>
             <div class="input-group flex-grow-1 me-2">
               <span class="input-group-text border-secondary bg-secondary mi">search</span>
-              <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowseRadioFavoritesSearchStr"/>
+              <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowseRadioFavoritesSearchStr"/>
             </div>
             <div class="btn-group me-2 featHome">
               <button data-title-phrase="Add view to homescreen" data-href='{"cmd": "addViewToHome", "options": []}' type="button" class="btn btn-secondary mi">add_to_home_screen</button>
@@ -882,7 +882,7 @@ <h2 data-phrase="Action for selection" class="dropdown-header"></h2>
             </div>
             <div class="input-group flex-grow-1 me-2">
               <span class="input-group-text border-secondary bg-secondary mi">search</span>
-              <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowseRadioWebradiodbSearchStr"/>
+              <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowseRadioWebradiodbSearchStr"/>
             </div>
             <div class="btn-group me-2">
               <button id="BrowseRadioWebradiodbFilterBtn" data-title-phrase="Filter" class="btn btn-secondary rounded-end mi" type="button" data-bs-target="#BrowseRadioWebradiodbFilter" data-bs-toggle="collapse">filter_list_off</button>
@@ -944,7 +944,7 @@ <h2 data-phrase="Action for selection" class="dropdown-header"></h2>
             </div>
             <div class="input-group flex-grow-1 me-2">
               <span class="input-group-text border-secondary bg-secondary mi">search</span>
-              <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowseRadioRadiobrowserSearchStr"/>
+              <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search" class="form-control rounded-end" id="BrowseRadioRadiobrowserSearchStr"/>
             </div>
             <div class="btn-group me-2">
               <button id="BrowseRadioRadiobrowserFilterBtn" data-title-phrase="Filter" class="btn btn-secondary rounded-end mi" type="button" data-bs-target="#BrowseRadioRadiobrowserFilter" data-bs-toggle="collapse">filter_list_off</button>
@@ -1004,7 +1004,7 @@ <h2 data-phrase="Action for selection" class="dropdown-header"></h2>
               <option value="!=">!=</option>
               <option value="!~" class="featPcre">!~</option>
             </select>
-            <input data-is="mympd-input-clear" data-clear-event="keyup" data-placeholder-phrase="Search" class="form-control rounded-end" id="SearchSearchStr"/>
+            <input data-is="mympd-input-clear" data-clear-event="keydown" data-placeholder-phrase="Search" class="form-control rounded-end" id="SearchSearchStr"/>
           </div>
           <div class="btn-group me-2">
             <button data-title-phrase="Append to queue" id="SearchAddAllSongsBtn" class="btn btn-secondary mi" data-href='{"cmd": "addAllFromSearch", "options": ["append"]}'>library_add</button>
@@ -2573,7 +2573,7 @@ <h5 class="modal-title"><span class="mi title-icon">home</span> <span id="modalH
                     <div class="dropdown-menu px-2 dropdownHomeIconLigature">
                       <div class="row">
                         <div class="col position-relative">
-                          <input data-is="mympd-input-clear" data-clear-event="keyup" id="modalHomeIconLigatureSearch" class="form-control" data-placeholder-phrase="Filter"/>
+                          <input data-is="mympd-input-clear" data-clear-event="keydown" id="modalHomeIconLigatureSearch" class="form-control" data-placeholder-phrase="Filter"/>
                         </div>
                         <div class="col">
                           <select id="modalHomeIconSearchCat" class="form-select"></select>

diff --git a/htdocs/js/clickActions.js b/htdocs/js/clickActions.js
@@ -208,12 +208,12 @@ function clickFilesystemPlaylist(uri, event) {
         case 'replacePlay': return replacePlayQueue('plist', [uri]);
         case 'view':
             //remember offset for current browse uri
-            browseFilesystemHistory[app.current.search] = {
+            browseFilesystemHistory[app.current.filter] = {
                 "offset": app.current.offset,
                 "scrollPos": document.body.scrollTop ? document.body.scrollTop : document.documentElement.scrollTop
             };
-            //reset filter and show playlist
-            app.current.filter = '-';
+            //reset search and show playlist
+            app.current.search = '';
             appGoto('Browse', 'Filesystem', undefined, 0, app.current.limit, uri, app.current.sort, 'plist', '', 0);
             break;
         case 'context': return showContextMenu(event);
@@ -228,11 +228,12 @@ function clickFilesystemPlaylist(uri, event) {
  */
 function clickFolder(uri) {
     //remember offset for current browse uri
-    browseFilesystemHistory[app.current.search] = {
+    browseFilesystemHistory[app.current.filter] = {
         "offset": app.current.offset,
         "scrollPos": getScrollPosY()
     };
-    //reset filter and open folder
+    //reset search and open folder
+    app.current.search = '';
     appGoto('Browse', 'Filesystem', undefined, 0, app.current.limit, uri, app.current.sort, 'dir', '', 0);
 }
 

diff --git a/htdocs/js/customElements.js b/htdocs/js/customElements.js
@@ -128,7 +128,7 @@ function setInputClear(el) {
         event.target.previousElementSibling.value = '';
         const dataClearEvent = event.target.previousElementSibling.getAttribute('data-clear-event');
         if (dataClearEvent !== null) {
-            const clearEvent = new KeyboardEvent(dataClearEvent, {key: 'Backspace'});
+            const clearEvent = new KeyboardEvent(dataClearEvent, {key: 'Enter'});
             event.target.previousElementSibling.dispatchEvent(clearEvent);
         }
     }, false);

diff --git a/htdocs/js/globales.js b/htdocs/js/globales.js
@@ -1138,6 +1138,8 @@ function setUserAgentData() {
             //Safari does not support this API
             /** @type {boolean} */
             userAgentData.isSafari = false;
+            /** @type {boolean} */
+            userAgentData.isAndroid = /Android/i.test(ua.platform);
         });
     }
     else {
@@ -1149,6 +1151,8 @@ function setUserAgentData() {
                 : /iPhone|iPad|iPod|Android|Mobile/i.test(navigator.userAgent);
         /** @type {boolean} */
         userAgentData.isSafari = /Safari/i.test(navigator.userAgent) && ! /Chrome/i.test(navigator.userAgent);
+        /** @type {boolean} */
+        userAgentData.isAndroid = /Android/i.test(navigator.userAgent);
     }
 }
 setUserAgentData();