Merge pull request #660 from awiouy/scw-avahi

spotify-connect-web: add avahi login

packages/addons/service/spotify-connect-web/changelog.txt

@@ -1,3 +1,6 @@
+8.0.102
+- Add passwordless/mutiuser login
+
 8.0.101
 - Use mixer card index
 - Add instructions to the addon settings

packages/addons/service/spotify-connect-web/package.mk

@@ -18,14 +18,14 @@
 
 PKG_NAME="spotify-connect-web"
 PKG_VERSION="0.0.3-alpha"
-PKG_REV="101"
+PKG_REV="102"
 PKG_ARCH="arm"
 PKG_ADDON_PROJECTS="RPi2 WeTek_Core WeTek_Play"
 PKG_LICENSE="prop."
 PKG_SITE="https://github.com/Fornoth/spotify-connect-web"
 PKG_URL="https://github.com/Fornoth/spotify-connect-web/releases/download/$PKG_VERSION/${PKG_NAME}_$PKG_VERSION.tar.gz"
 PKG_SOURCE_DIR="spotify-connect-web"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="toolchain avahi"
 PKG_PRIORITY="optional"
 PKG_SECTION="service"
 PKG_SHORTDESC="Spotify Connect Web: play Spotify through LibreELEC"
@@ -47,7 +47,11 @@ makeinstall_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+  cp -P $(get_build_dir avahi)/avahi-utils/.libs/avahi-publish \
+        $ADDON_BUILD/$PKG_ADDON_ID/bin/
+
   cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/
   rm $ADDON_BUILD/$PKG_ADDON_ID/libasound.so.2
 }

packages/addons/service/spotify-connect-web/source/bin/spotify-connect-web.start

@@ -56,18 +56,6 @@ then
   ko="ko"
 fi
 
-if [ ! "$scw_u" ]
-then
-  echo "Username not set"
-  ko="ko"
-fi
-
-if [ ! "$scw_p" ]
-then
-  echo "Password not set"
-  ko="ko"
-fi
-
 if [ ! "$scw_o" ]
 then
   echo "Playback device not set"
@@ -111,16 +99,21 @@ then
   [ "$pcm_3" ] && amixer -c "$index" cset name="PCM Playback Route" "$pcm_3"
 fi
 
+avahi-publish -s \
+TestConnect _spotify-connect._tcp 4000 VERSION=1.0 CPath=/login/_zeroconf &
+
 [ "$scw_b" == "-" ] && scw_b=""
 [ "$scw_b" ] && scw_b="-b $scw_b"
 [ "$scw_m" ] && scw_m="-m $scw_m"
+[ "$scw_p" ] && [ "$scw_u" ] && scw_p="-p $scw_p" && scw_u="-u $scw_u"
 
 cd "$ADDON_DIR"
 ./spotify-connect-web $scw_b \
+                      -c "$ADDON_HOME/credentials.json" \
                       -k "$ADDON_HOME/spotify_appkey.key" \
                       $scw_m \
                       -n "$HOSTNAME" \
                       -o "$scw_o" \
-                      -p "$scw_p" \
-                      -u "$scw_u" \
+                      $scw_p \
+                      $scw_u \
                       --mixer_device_index "$index"

packages/addons/service/spotify-connect-web/source/resources/language/English/strings.po

@@ -12,7 +12,7 @@ msgid "Spotify"
 msgstr ""
 
 msgctxt "#30102"
-msgid "Username"
+msgid "Username (optional)"
 msgstr ""
 
 msgctxt "#30103"
@@ -84,7 +84,7 @@ msgid "1. Copy your spofify_appkey.key the addon's home folder"
 msgstr ""
 
 msgctxt "#30202"
-msgid "2. Enter your Spotify username and password"
+msgid "2. Optionally enter your Spotify username and password"
 msgstr ""
 
 msgctxt "#30203"
@@ -96,11 +96,15 @@ msgid "4. Save the settings"
 msgstr ""
 
 msgctxt "#30205"
-msgid "5. Play Spotify through the addon, using a Spotify app as a remote"
+msgid "5. Check the service with the web interface at port 4000"
 msgstr ""
 
 msgctxt "#30206"
-msgid "5. Enjoy!"
+msgid "6. Play Spotify through the service, using a Spotify app as a remote"
+msgstr ""
+
+msgctxt "#30207"
+msgid "7. Enjoy!"
 msgstr ""
 
 msgctxt "#30210"

packages/addons/service/spotify-connect-web/source/resources/settings.xml

@@ -3,7 +3,8 @@
    <category   label="30100" >
       <setting label="30101" type="lsep" />
       <setting label="30102" type="text"      id="scw_u" />
-      <setting label="30103" type="text"      id="scw_p" option="hidden" />
+      <setting label="30103" type="text"      id="scw_p" option="hidden"
+         visible="!eq(-1,)" />
       <setting label="30104" type="labelenum" id="scw_b" lvalues="30105|30106|30107|30108" />
       <setting label="30109" type="lsep" />
       <setting label="30110" type="action"    action="RunScript(/storage/.kodi/addons/service.spotify-connect-web/wizard.py)" />
@@ -21,5 +22,6 @@
       <setting label="30204" type="lsep" />
       <setting label="30205" type="lsep" />
       <setting label="30206" type="lsep" />
+      <setting label="30207" type="lsep" />
    </category>
 </settings>