files/initrd/opt/rr/include/functions.py

@@ -141,9 +141,8 @@ def getmodels(platforms=None):
         try:
             import re
             from bs4 import BeautifulSoup
-            #url="https://kb.synology.com/en-us/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have"
+
-            url="https://kb.synology.cn/zh-cn/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have"
+            req = session.get("https://kb.synology.com/en-us/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have", timeout=10)
-            req = session.get(url, timeout=10)
             req.encoding = "utf-8"
             bs = BeautifulSoup(req.text, "html.parser")
             p = re.compile(r"data: (.*?),$", re.MULTILINE | re.DOTALL)
@@ -161,7 +160,6 @@ def getmodels(platforms=None):
         except:
             pass
 
-    models.sort(key=lambda x: (x["arch"], x["name"]))
     print(json.dumps(models, indent=4))
 
 

files/initrd/opt/rr/menu.sh

@@ -135,16 +135,14 @@ function modelMenu() {
       FLGNEX=0
       while read M A; do
         COMPATIBLE=1
-        if [ ${RESTRICT} -eq 1 ]; then
+        DT="$(readConfigKey "platforms.${A}.dt" "${WORK_PATH}/platforms.yml")"
-          for F in $(readConfigArray "platforms.${A}.flags" "${WORK_PATH}/platforms.yml"); do
+        FLAGS="$(readConfigArray "platforms.${A}.flags" "${WORK_PATH}/platforms.yml")"
-            if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
+        for F in "${FLAGS}"; do if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
           COMPATIBLE=0
           FLGNEX=1
           break
-            fi
+        fi; done
-          done
+        [ "${DT}" = "true" ] && DT="DT" || DT=""
-        fi
-        [ "$(readConfigKey "platforms.${A}.dt" "${WORK_PATH}/platforms.yml")" = "true" ] && DT="DT" || DT=""
         [ ${COMPATIBLE} -eq 1 ] && echo "${M} \"$(printf "\Zb%-15s %-2s\Zn" "${A}" "${DT}")\" " >>"${TMP_PATH}/menu"
       done <<<$(cat "${TMP_PATH}/modellist")
       [ ${FLGNEX} -eq 1 ] && echo "f \"\Z1$(TEXT "Disable flags restriction")\Zn\"" >>"${TMP_PATH}/menu"