فهرست منبع

Redue the patch as the merge failed.

Robert Middleswarth 2 سال پیش
والد
کامیت
6a704d25b0
4فایلهای تغییر یافته به همراه25 افزوده شده و 6 حذف شده
  1. 24 5
      build/generators/generateAppList.sh
  2. BIN
      images/yt-badge-novaspirit.png
  3. BIN
      images/yt-badge-rmiddletech.png
  4. 1 1
      template/apps/samba.json

+ 24 - 5
build/generators/generateAppList.sh

@@ -92,14 +92,33 @@ while IFS='' read -u 9 -r appfile || [[ -n $appfile ]]; do
 	fi
 	fi
 
 
 	# Get Video from app info
 	# Get Video from app info
-	vid=$(echo "$appconf" | jq ".videoID")
-	if [ "$vid" != "null" ] ; then
-		vidURL=$(jq ".youtube[] | select(.ID==$vid) | .URL" "$appinfo" | tr -d '"')
-		vid="[![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)]($vidURL)"
+	if vidlist=$( echo "$appconf" | jq -e ".videoID" ) ; then
+		# If only one entry
+		if [ "$(echo "$vidlist" | wc -l )" == "1" ]; then
+			vidURL=$(jq ".youtube[] | select(.ID==$vidlist) | .URL" "$appinfo" | tr -d '"')
+			vidTitle=$(jq ".youtube[] | select(.ID==$vidlist) | .Title" "$appinfo" | tr -d '"')
+			vidCh=$(jq ".youtube[] | select(.ID==$vidlist) | .Channel" "$appinfo" | tr -d '"')
+			vid="[![$vidTitle](../build/images/yt-badge-${vidCh}.png \"$vidTitle\")]($vidURL)"
+
+		# If multiple entries
+		else
+			n_vid=$(echo "$vidlist" | jq '. | length')
+			for n in $(seq 0 $(( n_vid - 1 ))); do
+				vidd=$(echo "$vidlist" | jq ".[$n]" )
+				vidURL=$(jq ".youtube[] | select(.ID==$vidd) | .URL" "$appinfo" | tr -d '"')
+				vidTitle=$(jq ".youtube[] | select(.ID==$vidd) | .Title" "$appinfo" | tr -d '"')
+				vidCh=$(jq ".youtube[] | select(.ID==$vidd) | .Channel" "$appinfo" | tr -d '"')
+				if [ "$n" == "0" ] ; then
+					vid="[![$vidTitle](../build/images/yt-badge-${vidCh}.png \"$vidTitle\")]($vidURL)"
+				else
+					vid="$vid<br>[![$vidTitle](../build/images/yt-badge-${vidCh}.png \"$vidTitle\")]($vidURL)"
+				fi
+			done
+		fi
 	else
 	else
 		unset vid
 		unset vid
 	fi
 	fi
-	
+
 	# Building App Line
 	# Building App Line
 	line="|$oweb|$hasArm32|$hasArm64|$hasAmd64|$apptype| $odoc | $doc | $script | $vid |"
 	line="|$oweb|$hasArm32|$hasArm64|$hasAmd64|$apptype| $odoc | $doc | $script | $vid |"
 
 

BIN
images/yt-badge-novaspirit.png


BIN
images/yt-badge-rmiddletech.png


+ 1 - 1
template/apps/samba.json

@@ -57,7 +57,7 @@
 	"restart_policy": "unless-stopped",
 	"restart_policy": "unless-stopped",
 	"title": "Samba",
 	"title": "Samba",
 	"type": 1,
 	"type": 1,
-	"videoID": 17,
+	"videoID": [ 10, 17 ] ,
 	"volumes": [
 	"volumes": [
 		{
 		{
 			"bind": "/portainer/Downloads",
 			"bind": "/portainer/Downloads",