Merge branch 'public/9.1' of https://github.com/SamInPgh/slimserver into public/9.1

Author: SamInPgh

.github/actions/build/action.yaml

@@ -119,8 +119,29 @@ runs:
           exit 1;
         fi
 
+    - name: Cache s5cmd
+      uses: actions/cache@v4
+      with:
+        key: s5cmd-${{ runner.os }}
+        path: ${{ runner.temp }}/s5cmd-bin
+
+    - name: Check if s5cmd is installed
+      id: check-s5cmd
+      continue-on-error: true
+      shell: bash
+      run: |
+        PATH="${{ runner.temp }}/s5cmd-bin:$PATH"
+        if command -v s5cmd &> /dev/null; then
+          echo "s5cmd is already installed"
+          echo "installed=true" >> $GITHUB_OUTPUT
+          echo "${{ runner.temp }}/s5cmd-bin" >> $GITHUB_PATH
+        else
+          echo "s5cmd is not installed"
+          echo "installed=false" >> $GITHUB_OUTPUT
+        fi
+
     - name: Set-up s5cmd
-      if: ${{ !startsWith(inputs.build-params, 'docker') }}
+      if: ${{ !startsWith(inputs.build-params, 'docker') && steps.check-s5cmd.outputs.installed != 'true' }}
       # don't fail, as we can fall back to aws-cli
       continue-on-error: true
       uses: ./server/.github/actions/setup-s5cmd
@@ -151,21 +172,13 @@ runs:
         fi
 
         ENDPOINT_URL="https://e83bc03c881257fada7ca16c243e9298.eu.r2.cloudflarestorage.com"
-        AWS_CMD="aws --endpoint-url $ENDPOINT_URL s3"
-        S5_CMD="s5cmd --endpoint-url $ENDPOINT_URL"
-
-        # Try s5cmd first, fall back to aws cli if it fails
-        for f in publish/?yrion?usic?erver*; do
-          if command -v s5cmd 2>&1 >/dev/null; then
-            if $S5_CMD cp $f s3://downloads/$TARGET_FOLDER/; then
-              echo "Successfully uploaded $f using s5cmd"
-            else
-              echo "s5cmd upload failed for $f, falling back to aws cli"
-              $AWS_CMD cp $f s3://downloads/$TARGET_FOLDER/
-            fi
-          else
-            echo "s5cmd not available, using aws cli"
-            $AWS_CMD cp $f s3://downloads/$TARGET_FOLDER/
-          fi
+        S3_CMD="aws --endpoint-url $ENDPOINT_URL s3"
+        if command -v s5cmd 2>&1 >/dev/null; then
+          S3_CMD="s5cmd --endpoint-url $ENDPOINT_URL"
+        fi
+
+        for f in publish/?yrion?usic?erver*;
+        do
+          $S3_CMD cp $f s3://downloads/$TARGET_FOLDER/
         done
         echo "::endgroup::"

Changelog9.html

@@ -22,6 +22,7 @@ <h2><a name="v9.1.0" id="v9.1.0"></a>Version 9.1.0</h2>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1363">#1363</a> - Allow item removal even if playlist has only 1 item (@mw9)</li>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1364">#1364</a> - store/return playqueue entry context flag ("addedFromWork")</li>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1377">#1377</a> - Provide new /time/tz endpoint for Squeezeplay to fetch the local timezone (@mw9)</li>
+		<li><a href="https://github.com/LMS-Community/slimserver/pull/1383">#1383</a> - Store the calculated replay gain in the player object when beginning playback (@SamInPgh)</li>
 	</ul>
 	<br />
 

HTML/EN/settings/server/security.html

@@ -51,12 +51,10 @@
 			<input type="text" class="stdedit" name="pref_corsAllowedHosts" id="corsAllowedHosts" value="[% prefs.pref_corsAllowedHosts | html %]" size="40">
 		[% END %]
 
-		[% IF enforceInsecureHTTPS %]
-			<input type="hidden" name="pref_insecureHTTPS" value="[% prefs.pref_insecureHTTPS | html %]" />
-		[% ELSE; WRAPPER settingGroup title="SETUP_INSECURE_HTTPS" desc="SETUP_INSECURE_HTTPS_DESC" %]
+		[% WRAPPER settingGroup title="SETUP_INSECURE_HTTPS" desc="SETUP_INSECURE_HTTPS_DESC" %]
 			<input type="checkbox" name="pref_insecureHTTPS" id="insecureHTTPS" [% IF prefs.pref_insecureHTTPS %] checked="checked" [% END %] />
 			<label for="insecureHTTPS">[% "SETUP_INSECURE_HTTPS2" | string %]</label>
-		[% END; END %]
+		[% END %]
 	[% END %]
 [% PROCESS settings/footer.html %]
 

HTML/EN/update_software.html

@@ -131,7 +131,7 @@ <h4>[% "UPDATES_LATEST_CHANGES" | string("https://github.com/LMS-Community/slims
 			<dl id="changelog"></dl>
 		</div>
 
-		<dt><a href="https://github.com/LMS-Community/slimserver/commits/public/[% serverVersion %]" target="_blank">[% "MORE" | string %]</a></dt>
+		<dt><a href="https://github.com/LMS-Community/slimserver/commits/public/[% serverVersion %]" target="_blank">[% "MORE_ON_GITHUB" | string %]</a></dt>
 	[% ELSE %]
 		<h4>[% "CONTROLPANEL_NO_UPDATE_AVAILABLE" | string | html %]</h4>
 	[% END %]

Slim/Web/Pages/Home.pm

@@ -229,6 +229,9 @@ sub _updateInfoCB {
 
 		if ($params->{'newVersion'}) {
 			$json->{server} = $params->{'newVersion'};
+			if ($json->{server} =~ /"(updateinfo\.html[^"]+)"/) {
+				$json->{infoUrl} = $1;
+			}
 		}
 		if ($params->{'newPlugins'} && scalar @{$params->{'newPlugins'}}) {
 			$json->{plugins} = $params->{'newPlugins'};

Slim/Web/Settings/Server/Security.pm

@@ -61,8 +61,6 @@ sub handler {
 		}
 	}
 
-	$paramRef->{enforceInsecureHTTPS} = main::ISWINDOWS ? 1 : 0;
-
 	return $class->SUPER::handler($client, $paramRef, $pageSetup);
 }
 

strings.txt

@@ -23753,6 +23753,12 @@ UPDATES_LATEST_CHANGES
 	SV	Senaste ändringar (<a href="%s" target="_blank">alla ändringar</a>)
 	ZH_CN	最新更改 (<a href="%s" target="_blank">所有更改</a>)
 
+MORE_ON_GITHUB
+	DE	Änderungen auf Github ansehen...
+	EN	Check out changes on Github...
+	FR	Consultez les modifications sur Github...
+	NL	Bekijk wijzigingen op Github...
+
 UPDATE
 	CS	Aktualizace
 	DA	Opdatering