Merge pull request #918 from jaedb/develop

3.68
jaedb · Aug 12, 2023 · 43f1cd4 · 43f1cd4
2 parents 5ef872a + 06c33e3
commit 43f1cd4
Show file tree

Hide file tree

Showing 16 changed files with 2,714 additions and 1,711 deletions.
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -2,13 +2,13 @@
 
 if [ -z "$PULSE_COOKIE_DATA" ]
 then
-    printf '%s' "$(echo "$PULSE_COOKIE_DATA" | sed -e 's/../\\x&/g')" >"$HOME"/pulse.cookie
-    export PULSE_COOKIE="$HOME"/pulse.cookie
+    printf '%s' "$(echo $PULSE_COOKIE_DATA | sed -e 's/../\\x&/g')" >$HOME/pulse.cookie
+    export PULSE_COOKIE=$HOME/pulse.cookie
 fi
 
 if [ ${PIP_PACKAGES:+x} ]; then
     echo "-- INSTALLING PIP PACKAGES $PIP_PACKAGES --"
-    python3 -m pip install --no-cache --upgrade "$PIP_PACKAGES"
+    python3 -m pip install --no-cache --upgrade $PIP_PACKAGES
 fi
 
 exec "$@"
diff --git a/docker/snapserver/snapserver-example.conf b/docker/snapserver/snapserver-example.conf
@@ -73,7 +73,8 @@ doc_root = /usr/share/snapserver/snapweb/
 # stream URI of the PCM input stream, can be configured multiple times
 # Format: TYPE://host/path?name=NAME[&codec=CODEC][&sampleformat=SAMPLEFORMAT]
 #stream = pipe:///tmp/snapfifo?name=default
-stream = pipe:///tmp/snapfifo?name=Default&sampleformat=48000:16:2&controlscript=meta_mopidy.py
+stream = pipe:///tmp/snapfifo?name=Mopidy&sampleformat=48000:16:2&controlscript=meta_mopidy.py
+stream = librespot:///librespot?name=Spotify
 
 # Default sample format
 #sampleformat = 48000:16:2

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
     "sortablejs": "1.15.0",
     "style-loader": "3.3.1",
     "url-loader": "4.1.1",
-    "webpack": "5.73.0",
+    "webpack": "5.76.0",
     "webpack-cli": "4.10.0",
     "webpack-dev-server": "4.11.1",
     "webpack-strip": "0.1.0",

diff --git a/src/js/components/Fields/OutputControl.js b/src/js/components/Fields/OutputControl.js
@@ -8,7 +8,13 @@ import Thumbnail from '../Thumbnail';
 import LinksSentence from '../LinksSentence';
 import DropdownField from './DropdownField';
 import * as pusherActions from '../../services/pusher/actions';
-import * as snapcastActions from '../../services/snapcast/actions';
+import {
+  setGroupStream,
+  setClientMute,
+  setClientVolume,
+  setStreamingEnabled,
+  controlStream,
+} from '../../services/snapcast/actions';
 import { sortItems, indexToArray } from '../../util/arrays';
 import { titleCase } from '../../util/helpers';
 import { I18n, i18n } from '../../locale';
@@ -38,10 +44,10 @@ const Header = ({
   let onClick = null;
   switch (playbackStatus) {
     case 'playing':
-      if (canPause) onClick = () => dispatch(snapcastActions.controlStream(id, 'pause'));
+      if (canPause) onClick = () => dispatch(controlStream(id, 'pause'));
       break;
     default:
-      if (canPlay) onClick = () => dispatch(snapcastActions.controlStream(id, 'play'));
+      if (canPlay) onClick = () => dispatch(controlStream(id, 'play'));
       break;
   }
 
@@ -88,6 +94,7 @@ const Header = ({
 };
 
 const Group = ({
+  setExpanded,
   group: {
     id: groupId,
     name: groupName,
@@ -111,6 +118,7 @@ const Group = ({
           className="text"
           to={`/settings/services/snapcast/${groupId}`}
           scrollTo="#services-snapcast-groups"
+          onClick={() => setExpanded(false)}
         >
           {titleCase(groupName)}
         </Link>
@@ -121,7 +129,7 @@ const Group = ({
           options={allStreams.map((s) => ({ value: s.id, label: titleCase(s.id) }))}
           noLabel
           handleChange={
-            (value) => dispatch(snapcastActions.setGroupStream(groupId, value))
+            (value) => dispatch(setGroupStream(groupId, value))
           }
         />
       </h5>
@@ -143,14 +151,14 @@ const Group = ({
                   noTooltip
                   mute={mute}
                   onMuteChange={
-                    (value) => dispatch(snapcastActions.setClientMute(clientId, value))
+                    (value) => dispatch(setClientMute(clientId, value))
                   }
                 />
                 <VolumeControl
                   volume={volume}
                   mute={mute}
                   onVolumeChange={
-                    (value) => dispatch(snapcastActions.setClientVolume(clientId, value))
+                    (value) => dispatch(setClientVolume(clientId, value))
                   }
                 />
               </div>
@@ -162,11 +170,13 @@ const Group = ({
   );
 };
 
-const Outputs = () => {
+const Outputs = ({ setExpanded }) => {
+  const dispatch = useDispatch();
   const allGroups = indexToArray(useSelector((state) => state.snapcast.groups || {}));
   const allStreams = useSelector((state) => state.snapcast.streams || {});
   const allServers = indexToArray(useSelector((state) => state.mopidy.servers || {}));
   const groupsByStream = groupBy(allGroups, 'stream_id');
+  const { streaming_enabled } = useSelector((state) => state?.snapcast || {});
 
   return (
     <ErrorBoundary>
@@ -180,10 +190,29 @@ const Outputs = () => {
         return (
           <div className="output-control__stream" key={`stream_${id}`}>
             <Header stream={stream} />
-            {groups.map((group) => <Group group={group} key={`group_${group.id}`} />)}
+            {
+              groups.map(
+                (group) => (
+                  <Group setExpanded={setExpanded} group={group} key={`group_${group.id}`} />
+                )
+              )
+            }
           </div>
         );
       })}
+      <div className="field checkbox" style={{ paddingLeft: 12 }}>
+        <label>
+          <input
+            type="checkbox"
+            name="streaming_enabled"
+            checked={streaming_enabled}
+            onChange={() => dispatch(setStreamingEnabled(!streaming_enabled))}
+          />
+          <span className="label">
+            <I18n path="snapcast.stream_on_this_device" />
+          </span>
+        </label>
+      </div>
     </ErrorBoundary>
   );
 }
@@ -241,7 +270,7 @@ const OutputControl = ({ force_expanded }) => {
         </button>
         <div className="output-control__inner">
           {!isEmpty(commands) && <Commands commands={commands} />}
-          {snapcastEnabled && <Outputs />}
+          {snapcastEnabled && <Outputs setExpanded={setExpanded} />}
         </div>
       </span>
     );

diff --git a/src/js/components/Snapcast.js b/src/js/components/Snapcast.js
@@ -41,18 +41,6 @@ const Snapcast = (props) => {
               <I18n path="snapcast.enabled" />
             </span>
           </label>
-          <label>
-            <input
-              type="checkbox"
-              name="streaming_enabled"
-              checked={streaming_enabled}
-              disabled={!enabled}
-              onChange={() => actions.setStreamingEnabled(!streaming_enabled)}
-            />
-            <span className="label">
-              <I18n path="snapcast.streaming_enabled" />
-            </span>
-          </label>
           <label>
             <input
               type="checkbox"