.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 17deab45e87d6e857d726a3ada88ab78e0dd8a38..b2ca7b90a717b02abea0870db2042dee4106f703 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,11 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change beforePath="$PROJECT_DIR$/.docker/config/monit/conf.d/home" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/config/monit/conf.d/home" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bin/healthcheck" beforeDir="false" afterPath="$PROJECT_DIR$/bin/healthcheck" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bin/restart-logcat" beforeDir="false" afterPath="$PROJECT_DIR$/bin/restart-logcat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/logcatb.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/spotifychecklogin.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/squeeze.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/squeeze.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1370,7 +1368,7 @@
       <workItem from="1774028822942" duration="792000" />
       <workItem from="1774430967346" duration="6359000" />
       <workItem from="1774441121722" duration="7518000" />
-      <workItem from="1774603188976" duration="5376000" />
+      <workItem from="1774603188976" duration="5658000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1715,7 +1713,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="650" />
+    <option name="localTasksCounter" value="651" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index d900db979896b59ca2496b303b14eece466ae571..d31d967c9895475d0b76856fded38c2b4a296a65 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -292,57 +292,4 @@ function getSqueezeFavorites($root = 0, $app = 'favorites', $level = 0)
 
 
     return $res;
-}
-
-function checkSpottyLogin($force = false)
-{
-    $spottybase = '/plugins/Spotty/settings/';
-    $hascredentials = httpRequest(SQUEEZEBOX_SERVER . $spottybase . 'basic.html?_dc=' . time(), 'get', [], null, 10, false);
-
-    $accounts = [
-        //SQUEEZEBOX_SPOTIFY_USERNAME => SQUEEZEBOX_SPOTIFY_PASSWORD,
-        'v12l' => 'UZfARnm9oFcoz%fZDg',
-        //'jrme75009' => 'tortuga5009',
-    ];
-
-    if ($force) {
-        $loggedIn = false;
-    } else {
-        $loggedIn = $hascredentials->getStatusCode() !== 302;
-        if ($loggedIn) {
-            $resp = $hascredentials->getBody();
-            foreach ($accounts as $user => $password) {
-                if (!stristr($resp, $user)) {
-                    $loggedIn = false;
-                    break;
-                }
-            }
-        }
-    }
-
-    if (!$loggedIn) {
-        global $squeezeboxPlayers;
-        echo 'Not logged in !<br>';
-        $player = $squeezeboxPlayers['Cuisine'];
-
-
-        foreach ($accounts as $user => $password) {
-            echo 'Log in to Spotify with username ' . $user . "\n";
-            $res = httpRequest(SQUEEZEBOX_SERVER . $spottybase . 'authentication.html', 'post', [
-                "saveSettings" => "1",
-                'useAJAX' => '0',
-                'page' => 'PLUGIN_SPOTTY',
-                'playerid' => $player,
-                'player' => $player,
-                'username' => $user,
-                'password' => $password,
-                'accountId' => ''], null, 60);
-            print_r($res->getBody());
-            echo '<br>';
-        }
-    } else {
-        echo 'Logged in :)<br>';
-        print_r($hascredentials);
-        print_r($hascredentials->getBody());
-    }
 }
\ No newline at end of file

diff --git a/scripts/spotifychecklogin.php b/scripts/spotifychecklogin.php
deleted file mode 100644 (file)
index 414af98..0000000
--- a/scripts/spotifychecklogin.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-require_once "import.php";
-checkSpottyLogin();
\ No newline at end of file

diff --git a/scripts/squeeze.php b/scripts/squeeze.php
index adb1eef9f97dd2106fbfa697cfcc802f17596eb4..3f420b41c457cc37217d4395f528387dc560ee97 100644 (file)
--- a/scripts/squeeze.php
+++ b/scripts/squeeze.php
@@ -13,11 +13,6 @@ if (isset($_GET['requests'])) {
     $requests = json_decode($_GET['requests']);
 }
 
-if (isset($_GET['type']) && $_GET['type'] == 'squeeze_spotify') {
-    checkSpottyLogin(true);
-}
-
-
 $res = [];
 foreach ($requests as $request) {
     squeezeRequest($request, $_GET['player']);