Merge pull request #2926 from joolswills/stats_fixes

Stats fixes

Author: joolswills

scriptmodules/admin/stats.sh

@@ -33,6 +33,10 @@ function build_stats() {
     local dest="$__tmpdir/stats"
     mkUserDir "$dest"
 
+    # ignore platform flags to get info for all packages
+    __ignore_flags=1
+    rp_registerAllModules
+
     echo "$(_get_package_data_stats)" > "$dest/packages.csv"
     echo "$(_get_commit_data_stats)" > "$dest/commit.csv"
 

scriptmodules/packages.sh

@@ -10,15 +10,6 @@
 #
 
 declare -A __mod_id_to_idx
-__mod_idx=()
-__mod_id=()
-__mod_type=()
-__mod_desc=()
-__mod_help=()
-__mod_licence=()
-__mod_section=()
-__mod_flags=()
-
 declare -A __sections
 __sections[core]="core"
 __sections[main]="main"
@@ -393,12 +384,14 @@ function rp_registerModule() {
     local flag
     local valid=1
 
-    for flag in "${flags[@]}"; do
-        if [[ "$flag" =~ ^\!(.+) ]] && isPlatform "${BASH_REMATCH[1]}"; then
-            valid=0
-            break
-        fi
-    done
+    if [[ "$__ignore_flags" -ne 1 ]]; then
+        for flag in "${flags[@]}"; do
+            if [[ "$flag" =~ ^\!(.+) ]] && isPlatform "${BASH_REMATCH[1]}"; then
+                valid=0
+                break
+            fi
+        done
+    fi
 
     if [[ "$valid" -eq 1 ]]; then
         __mod_idx+=("$module_idx")
@@ -425,6 +418,15 @@ function rp_registerModuleDir() {
 }
 
 function rp_registerAllModules() {
+    __mod_idx=()
+    __mod_id=()
+    __mod_type=()
+    __mod_desc=()
+    __mod_help=()
+    __mod_licence=()
+    __mod_section=()
+    __mod_flags=()
+
     rp_registerModuleDir 100 "emulators"
     rp_registerModuleDir 200 "libretrocores"
     rp_registerModuleDir 300 "ports"

scriptmodules/supplementary/resetromdirs.sh

@@ -10,7 +10,7 @@
 #
 
 rp_module_id="resetromdirs"
-rp_module_desc="Reset ownership/permissions of $romdir"
+rp_module_desc="Reset ownership/permissions of RetroPie/roms directory"
 rp_module_section="config"
 
 function gui_resetromdirs() {