Resolve merge conflict in .gitmodules

BambooFury · BambooFury · commit 25ec22321a64 · 2026-02-20T19:25:03.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,14 +63,22 @@ jobs:
 
           echo "submodule-matrix=$(cat submodules.json)" >> $GITHUB_OUTPUT
 
+      - name: Update README stats
+        run: |
+          STAT_OUTPUT=$(bash ./scripts/_stat.sh)
+
+          # Replace everything from "## Repository Manifest" to end of file
+          BEFORE=$(sed '/^## Repository Manifest$/,$d' README.md)
+          printf '%s\n%s\n' "$BEFORE" "$STAT_OUTPUT" > README.md
+
       - name: Commit Metadata
         if: github.event_name != 'pull_request' && github.event.repository.fork == false
         run: |
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
 
           # Stage the changes
-          git add metadata.json
+          git add metadata.json README.md
 
           # Commit only if there are changes
           if git commit -m "chore: Add plugin metadata"; then
diff --git a/.gitmodules b/.gitmodules
@@ -70,3 +70,15 @@
 [submodule "plugins/steam-streak"]
 	path = plugins/steam-streak
 	url = https://github.com/BambooFury/steam-streak
+[submodule "plugins/RSS-feed-in-whats-new"]
+	path = plugins/RSS-feed-in-whats-new
+	url = https://github.com/diemonic1/RSS-feed-in-whats-new
+[submodule "plugins/steam-global-launch-options"]
+	path = plugins/steam-global-launch-options
+	url = https://github.com/BlafKing/steam-global-launch-options.git
+[submodule "plugins/size-on-disk"]
+	path = plugins/size-on-disk
+	url = https://github.com/k0d13/steam-size-on-disk
+[submodule "plugins/gratitude"]
+	path = plugins/gratitude
+	url = https://github.com/BlythT/Gratitude-Millennium-Plugin
diff --git a/README.md b/README.md
@@ -44,3 +44,30 @@ This should update your plugin to the latest version. Commit the change and open
 &nbsp;
 
 In case you wish to clone plugins at their attached commits, run `git submodule update --init`.
+## Repository Manifest
+
+The following table describes the remaining deprecated Python plugins that need to be ported to Lua.
+Python is no longer officially supported by Millennium and will be removed entirely in a future update.
+
+**Total**: 27
+ * **Lua**: 12
+ * **Python**: 15
+
+
+| Lua | Python |
+|-----|--------|
+| RSS-feed-in-whats-new | augmented-steam |
+| achievement-groups | csstats-extension |
+| adamraichu.auto-accept-custom-launch-args | cswatch-plugin |
+| aerothemesteam | extendium |
+| dotastats | fullscreen-notifications-fix |
+| dwmx | leetify-extension (in-progress) |
+| gratitude | millennium-faceit-stats |
+| hltb-millennium-plugin | non-steam-playtimes |
+| size-on-disk | steam-browser-history |
+| steam-change-window-params | steam-collections-plus (in-progress) |
+| steam-global-launch-options | steam-easygrid (in-progress) |
+| valve-internal-enabler | steam-librarian (in-progress) |
+|  | steam-logo-pos (in-progress) |
+|  | steam-taskbar-progress (in-progress) |
+|  | steamdb |
diff --git a/metadata.json b/metadata.json
@@ -1,7 +1,11 @@
 [
+  {
+    "id": "3dc714a7c1b13331bd0b9d13da3677f6e8ed6a64",
+    "commitId": "42f6e2c939f6938989cc4b6bdd4c4abc7c7acfeb"
+  },
   {
     "id": "13f2dcc363c8afc41a42ba5df62aef06db1cc600",
-    "commitId": "ee2ac73abd3a114463ae1c48db8667b5cfe5da7f"
+    "commitId": "fddae04611d982ad2d2bed3b0edee6ffd152d077"
   },
   {
     "id": "23c7ecc10605f2134e748cf3592bee0b29da1a4b",
@@ -20,9 +24,13 @@
     "commitId": "d91370711bc373a72eff3009cc99aab9dc7c0695"
   },
   {
-    "id": "1992f2149a7927ba3eae1177a9cb6b40a65c5cd2",
+    "id": "c0f9737e4a5b1b466e103a7d5d5ee3b4493e5685",
     "commitId": "4301c426562988553bb6486d29c7acc6e1999b78"
   },
+  {
+    "id": "f73f8fd41cdda33a5dbfd5ef37a0801f044a24b0",
+    "commitId": "5cc7295cc7e359b7b0c1c27913236f0da989c95a"
+  },
   {
     "id": "b4c58634419beab7b23cae6eee2d4bef45b454b3",
     "commitId": "28c1a17f533d0ae5e98745616e859548912898e0"
@@ -35,9 +43,13 @@
     "id": "84b2f76a6f1a5ef88a73145ee8805c1d499121ad",
     "commitId": "503e9d8952dcaa35f7fb00be7451b3ae345fb2e4"
   },
+  {
+    "id": "a0f319c49e93d7bba258b5ed96c858bdb57d8ad2",
+    "commitId": "1c38dca58fa3d36cd0d382376ed9afb3295430d0"
+  },
   {
     "id": "f685622bace6c63a70a24265f72fabd32aa497b5",
-    "commitId": "119eef40f0bfc1c51dbaf4243f6624371efda754"
+    "commitId": "ff9a2916b928c155eac261e34e39a76d34fa9cf0"
   },
   {
     "id": "ee88f1c520050f2f1320357fe535aa4045d9038e",
@@ -51,6 +63,10 @@
     "id": "02bed50d10a8b1e58fb8bba608fe6a120a3a0dca",
     "commitId": "64bd49606c461c239029b27b9761edc2ec713200"
   },
+  {
+    "id": "e73371b61eef68019413475b7642ecc37e53bbbd",
+    "commitId": "e73371b61eef68019413475b7642ecc37e53bbbd"
+  },
   {
     "id": "aca2451aea1d2bc5e5df9a2b8bb3d1b6a8f3fa8b",
     "commitId": "74b136aaa98a1548fefce9a0b76202bf99cca689"
@@ -67,6 +83,10 @@
     "id": "2519c8a9fc979627a214a78ad642ae5d5723216f",
     "commitId": "2df2108b77507cac83d423155f32a40578394971"
   },
+  {
+    "id": "ade101371bfd58fb3de4c28d7f60b343325cc19d",
+    "commitId": "0043e8ccf244739c18023be80a48509b6c8afade"
+  },
   {
     "id": "266c815057f2fae7249dafe9f80e10d27e89806e",
     "commitId": "dc6b0e0af484a371c7612b3c093d93a6287d063f"
diff --git a/plugins/RSS-feed-in-whats-new b/plugins/RSS-feed-in-whats-new
@@ -0,0 +1 @@
+Subproject commit 42f6e2c939f6938989cc4b6bdd4c4abc7c7acfeb
diff --git a/plugins/achievement-groups b/plugins/achievement-groups
@@ -1 +1 @@
-Subproject commit ee2ac73abd3a114463ae1c48db8667b5cfe5da7f
+Subproject commit fddae04611d982ad2d2bed3b0edee6ffd152d077
diff --git a/plugins/dotastats b/plugins/dotastats
@@ -1 +1 @@
-Subproject commit aa986ce0c72c731ec25903926f799fda5ff8a54e
+Subproject commit 5cc7295cc7e359b7b0c1c27913236f0da989c95a
diff --git a/plugins/gratitude b/plugins/gratitude
@@ -0,0 +1 @@
+Subproject commit 1c38dca58fa3d36cd0d382376ed9afb3295430d0
diff --git a/plugins/hltb-millennium-plugin b/plugins/hltb-millennium-plugin
@@ -1 +1 @@
-Subproject commit 119eef40f0bfc1c51dbaf4243f6624371efda754
+Subproject commit ff9a2916b928c155eac261e34e39a76d34fa9cf0
diff --git a/plugins/size-on-disk b/plugins/size-on-disk
@@ -0,0 +1 @@
+Subproject commit e73371b61eef68019413475b7642ecc37e53bbbd
diff --git a/plugins/steam-global-launch-options b/plugins/steam-global-launch-options
@@ -0,0 +1 @@
+Subproject commit 0043e8ccf244739c18023be80a48509b6c8afade
diff --git a/scripts/_gen_metadata.sh b/scripts/_gen_metadata.sh
@@ -1,19 +1,21 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/build/get-plugin-id.sh"
 
 parse_plugin() {
     local plugins_dir=$1
     local submodule=$2
     local submodule_path="$plugins_dir/$submodule"
+
     local plugin_name commit_id
-    
-    plugin_name=$(git -C "$submodule_path" rev-list --max-parents=0 HEAD 2>/dev/null | tr -d '\n')
+    plugin_name=$(get_plugin_id "$submodule_path")
     commit_id=$(git -C "$submodule_path" rev-parse HEAD 2>/dev/null | tr -d '\n')
 
     echo "{\"id\": \"$plugin_name\", \"commitId\": \"$commit_id\"}"
 }
 
 plugins_dir="$(pwd)/plugins"
-plugin_ids=()
 
 if [[ -d "$plugins_dir" ]]; then
     while IFS= read -r submodule; do
diff --git a/scripts/_stat.sh b/scripts/_stat.sh
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+PYTHON_PLUGINS=()
+LUA_PLUGINS=()
+
+while IFS= read -r line; do
+    submodule_path=$(echo "$line" | awk '{print $2}')
+
+    if [[ -z "$submodule_path" ]]; then
+        continue
+    fi
+
+    plugin_json="$submodule_path/plugin.json"
+    plugin_name=$(basename "$submodule_path")
+
+    if [[ -f "$plugin_json" ]]; then
+        backend_type=$(jq -r '.backendType // "undefined"' "$plugin_json" 2>/dev/null)
+        use_backend=$(jq -r 'if has("useBackend") then .useBackend else true end' "$plugin_json" 2>/dev/null)
+
+        if [[ "$use_backend" == "false" || "$backend_type" == "lua" ]]; then
+            LUA_PLUGINS+=("$plugin_name")
+        else
+            PYTHON_PLUGINS+=("$plugin_name")
+        fi
+    else
+        echo "Warning: No plugin.json found in $submodule_path"
+    fi
+done < <(git submodule status)
+
+# Check open PRs for Python plugins being ported to Lua
+declare -A IN_PROGRESS_PLUGINS
+
+if command -v curl &>/dev/null; then
+    pr_data=$(curl -sf "https://api.github.com/repos/SteamClientHomebrew/PluginDatabase/pulls?state=open&per_page=100" 2>/dev/null)
+
+    if [[ -n "$pr_data" ]]; then
+        # Only consider PRs with [lua-port] in the title
+        lua_port_prs=$(echo "$pr_data" | jq -r '.[] | select(.title | ascii_downcase | contains("[lua-port]")) | .number' 2>/dev/null)
+
+        for pr_number in $lua_port_prs; do
+            files_data=$(curl -sf "https://api.github.com/repos/SteamClientHomebrew/PluginDatabase/pulls/${pr_number}/files" 2>/dev/null)
+
+            if [[ -n "$files_data" ]]; then
+                changed_plugins=$(echo "$files_data" | jq -r '.[].filename' 2>/dev/null | grep '^plugins/' | sed 's|^plugins/||' | cut -d'/' -f1 | sort -u)
+
+                for changed_plugin in $changed_plugins; do
+                    for py_plugin in "${PYTHON_PLUGINS[@]}"; do
+                        if [[ "$changed_plugin" == "$py_plugin" ]]; then
+                            IN_PROGRESS_PLUGINS["$py_plugin"]=1
+                        fi
+                    done
+                done
+            fi
+        done
+    fi
+fi
+
+TOTAL_PLUGINS=$(( ${#LUA_PLUGINS[@]} + ${#PYTHON_PLUGINS[@]} ))
+
+echo "## Repository Manifest"
+echo ""
+
+# Determine the max rows needed
+max_rows=${#LUA_PLUGINS[@]}
+if (( ${#PYTHON_PLUGINS[@]} > max_rows )); then
+    max_rows=${#PYTHON_PLUGINS[@]}
+fi
+
+echo "The following table describes the remaining deprecated Python plugins that need to be ported to Lua."
+echo "Python is no longer officially supported by Millennium and will be removed entirely in a future update."
+
+echo ""
+echo "**Total**: ${TOTAL_PLUGINS}"
+echo " * **Lua**: ${#LUA_PLUGINS[@]}"
+echo " * **Python**: ${#PYTHON_PLUGINS[@]}"
+echo ""
+echo ""
+
+echo "| Lua | Python |"
+echo "|-----|--------|"
+
+for (( i=0; i<max_rows; i++ )); do
+    if (( i < ${#LUA_PLUGINS[@]} )); then
+        lua_num="$(( i + 1 ))"
+        lua_name="${LUA_PLUGINS[$i]}"
+    else
+        lua_num=""
+        lua_name=""
+    fi
+
+    if (( i < ${#PYTHON_PLUGINS[@]} )); then
+        py_num="$(( i + 1 ))"
+        py_name="${PYTHON_PLUGINS[$i]}"
+        if [[ -n "${IN_PROGRESS_PLUGINS[$py_name]+x}" ]]; then
+            py_name="$py_name (in-progress)"
+        fi
+    else
+        py_num=""
+        py_name=""
+    fi
+
+    echo "| $lua_name | $py_name |"
+done
diff --git a/scripts/build/get-plugin-id.sh b/scripts/build/get-plugin-id.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Get a stable plugin ID from git history.
+# Uses the first commit hash not authored by the template bot.
+# Falls back to the root commit if all commits are from the bot.
+#
+# Usage:
+#   source get-plugin-id.sh
+#   id=$(get_plugin_id)              # current directory
+#   id=$(get_plugin_id /path/to/repo) # specific repo
+
+get_plugin_id() {
+    local repo_path="${1:-.}"
+    local plugin_id
+
+    plugin_id=$(git -C "$repo_path" log --format='%H %ae' --reverse 2>/dev/null \
+        | grep -Fv -e '81448108+shdwmtr@users.noreply.github.com' -e 'millennium[bot]@noreply.steambrew.app' \
+        | head -1 | cut -d' ' -f1 | tr -d '\n')
+
+    # Fallback to root commit if all commits are from the template bot
+    [[ -z "$plugin_id" ]] && plugin_id=$(git -C "$repo_path" rev-list --max-parents=0 HEAD 2>/dev/null | tr -d '\n')
+
+    echo "$plugin_id"
+}
diff --git a/scripts/build/prepare-dist.sh b/scripts/build/prepare-dist.sh
@@ -21,11 +21,11 @@ done
 log_message() {
   local level="$1"
   local message="$2"
-  
+
   if [ "$SILENT" = true ] && [[ "$level" = "warning" || "$level" = "notice" ]]; then
     level="debug"
   fi
-  
+
   echo "::$level::$message"
 }
 
@@ -39,7 +39,7 @@ cp "PLUGIN.md" dist/README.md 2>/dev/null || cp "README.md" dist/README.md 2>/de
 BACKEND_DIR=$(jq -r '.backend' plugin.json)
 if [ "$BACKEND_DIR" != "null" ]; then
   cp -r "$BACKEND_DIR" ./dist/"$BACKEND_DIR"
-else 
+else
   cp -r "backend" ./dist/backend 2>/dev/null || log_message "warning" "backend directory not found, skipping."
 fi
 
@@ -56,7 +56,9 @@ else
 fi
 
 log_message "notice" "Computing plugin metadata..."
-echo "{\"commit\": \"$(git rev-parse HEAD)\", \"id\": \"$(git rev-list --max-parents=0 HEAD)\"}" > dist/metadata.json
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/get-plugin-id.sh"
+echo "{\"commit\": \"$(git rev-parse HEAD)\", \"id\": \"$(get_plugin_id)\"}" > dist/metadata.json
 
 PLUGIN_NAME=$(jq -r '.name' plugin.json) || { log_message "error" "name not found in plugin.json"; exit 1; }
 echo "PLUGIN_NAME=$PLUGIN_NAME" >> $GITHUB_ENV
