更新 getmodels 为 getmodelsbykb (25.01.16)

.github/workflows/issues.yml

@@ -209,6 +209,9 @@ jobs:
           # sudo sed -i "s/set -e/set -ex/" rr/ws/initrd/opt/rr/init.sh
           # sudo sed -i '/^alias/i\set -x' rr/ws/initrd/opt/rr/menu.sh
 
+          # For 25.01.16
+          sudo sed -i 's/ getmodels / getmodelsbykb /' rr/ws/initrd/opt/rr/menu.sh
+
           [ -n "${{ env.language }}" ] && echo "${{ env.language }}.UTF-8" | sudo tee rr/ws/mnt/p1/.locale
 
           sudo ./localbuild.sh init

VERSION

@@ -1 +1 @@
-25.1.3
+25.1.2

docs/models.json

@@ -5,7 +5,14 @@
             "7.1": "4.4.180",
             "7.2": "4.4.302"
         },
-        "models": []
+        "models": [
+            "DS1019+",
+            "DS620slim",
+            "DS218+",
+            "DS418play",
+            "DS718+",
+            "DS918+"
+        ]
     },
     "broadwell": {
         "productvers": {
@@ -13,7 +20,17 @@
             "7.1": "4.4.180",
             "7.2": "4.4.302"
         },
-        "models": []
+        "models": [
+            "FS3400",
+            "RS3618xs",
+            "DS3617xs",
+            "DS3617xsII",
+            "FS2017",
+            "RS18017xs+",
+            "RS3617RPxs",
+            "RS3617xs+",
+            "RS4017xs+"
+        ]
     },
     "broadwellnk": {
         "productvers": {
@@ -21,7 +38,19 @@
             "7.1": "4.4.180",
             "7.2": "4.4.302"
         },
-        "models": []
+        "models": [
+            "DS1621xs+",
+            "DS3622xs+",
+            "FS3600",
+            "RS1619xs+",
+            "RS3621RPxs",
+            "RS3621xs+",
+            "RS4021xs+",
+            "SA3400",
+            "SA3600",
+            "DS3018xs",
+            "FS1018"
+        ]
     },
     "broadwellnkv2": {
         "productvers": {
@@ -29,7 +58,11 @@
             "7.1": "4.4.180",
             "7.2": "4.4.302"
         },
-        "models": []
+        "models": [
+            "FS3410",
+            "SA3410",
+            "SA3610"
+        ]
     },
     "broadwellntbap": {
         "productvers": {
@@ -37,7 +70,10 @@
             "7.1": "4.4.180",
             "7.2": "4.4.302"
         },
-        "models": []
+        "models": [
+            "SA3200D",
+            "SA3400D"
+        ]
     },
     "denverton": {
         "productvers": {
@@ -45,7 +81,19 @@
             "7.1": "4.4.180",
             "7.2": "4.4.302"
         },
-        "models": []
+        "models": [
+            "DS1819+",
+            "DS2419+",
+            "DS2419+II",
+            "DVA3219",
+            "DVA3221",
+            "RS820+",
+            "RS820RP+",
+            "DS1618+",
+            "RS2418+",
+            "RS2418RP+",
+            "RS2818RP+"
+        ]
     },
     "geminilake": {
         "productvers": {
@@ -53,7 +101,16 @@
             "7.1": "4.4.180",
             "7.2": "4.4.302"
         },
-        "models": []
+        "models": [
+            "DS1520+",
+            "DS220+",
+            "DS224+",
+            "DS420+",
+            "DS423+",
+            "DS720+",
+            "DS920+",
+            "DVA1622"
+        ]
     },
     "purley": {
         "productvers": {
@@ -61,7 +118,10 @@
             "7.1": "4.4.180",
             "7.2": "4.4.302"
         },
-        "models": []
+        "models": [
+            "FS6400",
+            "HD6500"
+        ]
     },
     "r1000": {
         "productvers": {
@@ -69,7 +129,12 @@
             "7.1": "4.4.180",
             "7.2": "4.4.302"
         },
-        "models": []
+        "models": [
+            "DS1522+",
+            "DS723+",
+            "DS923+",
+            "RS422+"
+        ]
     },
     "v1000": {
         "productvers": {
@@ -77,13 +142,30 @@
             "7.1": "4.4.180",
             "7.2": "4.4.302"
         },
-        "models": []
+        "models": [
+            "DS1621+",
+            "DS1821+",
+            "DS1823xs+",
+            "DS2422+",
+            "FS2500",
+            "RS1221+",
+            "RS1221RP+",
+            "RS2421+",
+            "RS2421RP+",
+            "RS2423+",
+            "RS2423RP+",
+            "RS2821RP+",
+            "RS822+",
+            "RS822RP+"
+        ]
     },
     "epyc7002": {
         "productvers": {
             "7.1": "7.1-5.10.55",
             "7.2": "7.2-5.10.55"
         },
-        "models": []
+        "models": [
+            "SA6400"
+        ]
     }
 }

files/initrd/opt/rr/include/consts.sh

@@ -1,4 +1,4 @@
-RR_VERSION="25.1.3"
+RR_VERSION="25.1.2"
 RR_RELEASE=""
 RR_TITLE="RR v${RR_VERSION}"
 

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

@@ -113,7 +113,7 @@ def getmodels(platforms=None):
     """
     Get Syno Models.
     """
-    import re, json, requests, urllib3
+    import json, requests, urllib3
     from requests.adapters import HTTPAdapter
     from requests.packages.urllib3.util.retry import Retry  # type: ignore
 
@@ -127,23 +127,20 @@ def getmodels(platforms=None):
 
     models = []
     try:
-        url = "http://update7.synology.com/autoupdate/genRSS.php?include_beta=1"
-        #url = "https://update7.synology.com/autoupdate/genRSS.php?include_beta=1"
-
-        req = session.get(url, timeout=10, verify=False)
+        req = session.get("https://autoupdate.synology.com/os/v2", timeout=10, verify=False)
         req.encoding = "utf-8"
-        p = re.compile(r"<mUnique>(.*?)</mUnique>.*?<mLink>(.*?)</mLink>", re.MULTILINE | re.DOTALL)
+        data = json.loads(req.text)
 
-        data = p.findall(req.text)
-        for item in data:
-            if not "DSM" in item[1]:
+        for item in data["channel"]["item"]:
+            if not item["title"].startswith("DSM"):
                 continue
-            arch = item[0].split("_")[1]
-            name = item[1].split("/")[-1].split("_")[1].replace("%2B", "+")
-            if PS and arch.lower() not in PS:
-                continue
-            if not any(m["name"] == name for m in models):
-                models.append({"name": name, "arch": arch})
+            for model in item["model"]:
+                arch = model["mUnique"].split("_")[1]
+                name = model["mLink"].split("/")[-1].split("_")[1].replace("%2B", "+")
+                if PS and arch.lower() not in PS:
+                    continue
+                if not any(m["name"] == name for m in models):
+                    models.append({"name": name, "arch": arch})
 
         models.sort(key=lambda k: (k["arch"], k["name"]))
 

files/mnt/p1/RR_VERSION

@@ -1 +1 @@
-25.1.3
+25.1.2