From 82f1163caef6a3480af9255f933b78599096744e Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Wed, 27 Nov 2024 22:03:28 +0800
Subject: [PATCH 1/3] Some disks will be blocked in special scenarios

---
 syno_hdd_db.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/syno_hdd_db.sh b/syno_hdd_db.sh
index a24bd81..91df9f7 100644
--- a/syno_hdd_db.sh
+++ b/syno_hdd_db.sh
@@ -897,7 +897,7 @@ fixdrivemodel(){
 get_size_gb(){ 
     # $1 is /sys/block/sata1 or /sys/block/nvme0n1 etc
     local disk_size_gb
-    disk_size_gb=$(synodisk --info /dev/"$(basename -- "$1")" | grep 'Total capacity' | awk '{print int($4 * 1.073741824)}')
+    disk_size_gb=$(synodisk --info /dev/"$(basename -- "$1")" 2>/dev/null | grep 'Total capacity' | awk '{print int($4 * 1.073741824)}')
     echo "$disk_size_gb"
 }
 
@@ -932,15 +932,16 @@ getdriveinfo(){
 
         # Get drive GB size
         size_gb=$(get_size_gb "$1")
-
-        if [[ $hdmodel ]] && [[ $fwrev ]]; then
-            if /usr/syno/bin/synodisk --enum -t cache | grep -q /dev/"$(basename -- "$1")"; then
-                # Is SATA M.2 SSD
-                nvmelist+=("${hdmodel},${fwrev},${size_gb}")
-            else
-                hdlist+=("${hdmodel},${fwrev},${size_gb}")
-            fi
-            drivelist+=("${hdmodel}")
+        if [ -n "$size_gb" ]; then
+            if [[ $hdmodel ]] && [[ $fwrev ]]; then
+                if /usr/syno/bin/synodisk --enum -t cache | grep -q /dev/"$(basename -- "$1")"; then
+                    # Is SATA M.2 SSD
+                    nvmelist+=("${hdmodel},${fwrev},${size_gb}")
+                else
+                    hdlist+=("${hdmodel},${fwrev},${size_gb}")
+                fi
+                drivelist+=("${hdmodel}")
+	    fi
         fi
     fi
 }

From 9924a4d4c2857983d61a4312461bc483353ab8f3 Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Thu, 28 Nov 2024 05:35:32 +1100
Subject: [PATCH 2/3] Update CHANGES.txt

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index ca73297..17f7110 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+v3.5.104
+- Some disks will be blocked in special scenarios. PR #387
+
 v3.5.103
 - Bug fix getting size of large drives. Issue #368
   - Run the script once with the --restore option to undue the previous changes then run the script as normal.

From a595132fa175c48c9fe45d56e4d5a890565d970b Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Thu, 28 Nov 2024 05:36:02 +1100
Subject: [PATCH 3/3] Update syno_hdd_db.sh

---
 syno_hdd_db.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syno_hdd_db.sh b/syno_hdd_db.sh
index 91df9f7..e1af1ef 100644
--- a/syno_hdd_db.sh
+++ b/syno_hdd_db.sh
@@ -29,7 +29,7 @@
 # /var/packages/StorageManager/target/ui/storage_panel.js
 
 
-scriptver="v3.5.103"
+scriptver="v3.5.104"
 script=Synology_HDD_db
 repo="007revad/Synology_HDD_db"
 scriptname=syno_hdd_db
@@ -941,7 +941,7 @@ getdriveinfo(){
                     hdlist+=("${hdmodel},${fwrev},${size_gb}")
                 fi
                 drivelist+=("${hdmodel}")
-	    fi
+            fi
         fi
     fi
 }